diff --git a/rollup.config.js b/rollup.config.js
index 4087e78..8237695 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -25,6 +25,7 @@ export default [
       {
         dir: "dist",
         format: "es",
+        inlineDynamicImports: true,
       },
     ],
     plugins: [
diff --git a/src/ui-editor/schema/individual.ts b/src/ui-editor/schema/individual.ts
index 648951b..81309a9 100644
--- a/src/ui-editor/schema/individual.ts
+++ b/src/ui-editor/schema/individual.ts
@@ -8,18 +8,7 @@ const mainSchema = {
     {
       name: "color_value",
       label: "Color Value",
-      selector: {
-        select: {
-          options: [
-            { value: "true", label: "True" },
-            { value: "false", label: "False" },
-            { value: "solar", label: "Solar" },
-            { value: "grid", label: "Grid" },
-            { value: "battery", label: "Battery" },
-          ],
-          custom_value: true,
-        },
-      },
+      selector: { boolean: {} },
     },
     {
       name: "color_icon",
@@ -29,7 +18,7 @@ const mainSchema = {
     {
       name: "unit_of_measurement",
       label: "Unit of Measurement",
-      selector: { string: {} },
+      selector: { text: {} },
     },
     {
       name: "display_zero",