@bigbinary/neeto-themes-frontend 2.1.0 → 2.1.2

package/dist/{index.cjs.js → cjs/NeetoThemesBuilder.js}

@@ -1,7 +1,5 @@
 'use strict';
 
-Object.defineProperty(exports, '__esModule', { value: true });
-
 var shallow = require('zustand/shallow');
 var react = require('react');
 var i18next = require('i18next');
@@ -10,12 +8,10 @@ var reactUtils = require('@bigbinary/neeto-commons-frontend/react-utils');
 var Spinner = require('@bigbinary/neetoui/Spinner');
 var reactQuery = require('@tanstack/react-query');
 var axios = require('axios');
-var ramda = require('ramda');
-var zustand = require('zustand');
-var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
-var _regeneratorRuntime = require('@babel/runtime/regenerator');
-var Toastr = require('@bigbinary/neetoui/Toastr');
+var utils = require('../index-09d44807.js');
+var useThemeUtils = require('../useThemeUtils-148b9f27.js');
 var _slicedToArray = require('@babel/runtime/helpers/slicedToArray');
+var classNames = require('classnames');
 var Alert = require('@bigbinary/neetoui/Alert');
 var reactI18next = require('react-i18next');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
@@ -26,16 +22,20 @@ var Popover = require('@bigbinary/neetoui/Popover');
 var Typography = require('@bigbinary/neetoui/Typography');
 var Form = require('@bigbinary/neetoui/formik/Form');
 var yup = require('yup');
+var Editor = require('@monaco-editor/react');
 var formik = require('formik');
 var jsxRuntime = require('react/jsx-runtime');
+var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
+var _regeneratorRuntime = require('@babel/runtime/regenerator');
 var neetoImageUploaderFrontend = require('@bigbinary/neeto-image-uploader-frontend');
-var utils = require('@bigbinary/neeto-commons-frontend/utils');
+var utils$1 = require('@bigbinary/neeto-commons-frontend/utils');
+var Toastr = require('@bigbinary/neetoui/Toastr');
+var ramda = require('ramda');
 var Select = require('@bigbinary/neetoui/Select');
 var CenterAlign = require('@bigbinary/neeto-icons/CenterAlign');
 var LeftAlign = require('@bigbinary/neeto-icons/LeftAlign');
 var ColorPicker = require('@bigbinary/neetoui/ColorPicker');
 var antd = require('antd');
-var classnames = require('classnames');
 var HelpPopover = require('@bigbinary/neeto-molecules/HelpPopover');
 var Switch = require('@bigbinary/neetoui/Switch');
 var Input = require('@bigbinary/neetoui/formik/Input');
@@ -43,6 +43,7 @@ var Search = require('@bigbinary/neeto-molecules/Search');
 var MoreDropdown = require('@bigbinary/neeto-molecules/MoreDropdown');
 var LeftArrow = require('@bigbinary/neeto-icons/LeftArrow');
 var Plus = require('@bigbinary/neeto-icons/Plus');
+require('zustand');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -66,10 +67,8 @@ function _interopNamespace(e) {
 
 var Spinner__default = /*#__PURE__*/_interopDefaultLegacy(Spinner);
 var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
-var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
-var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
-var Toastr__default = /*#__PURE__*/_interopDefaultLegacy(Toastr);
 var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
+var classNames__default = /*#__PURE__*/_interopDefaultLegacy(classNames);
 var Alert__default = /*#__PURE__*/_interopDefaultLegacy(Alert);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
 var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
@@ -79,11 +78,14 @@ var Popover__default = /*#__PURE__*/_interopDefaultLegacy(Popover);
 var Typography__default = /*#__PURE__*/_interopDefaultLegacy(Typography);
 var Form__default = /*#__PURE__*/_interopDefaultLegacy(Form);
 var yup__namespace = /*#__PURE__*/_interopNamespace(yup);
+var Editor__default = /*#__PURE__*/_interopDefaultLegacy(Editor);
+var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator);
+var _regeneratorRuntime__default = /*#__PURE__*/_interopDefaultLegacy(_regeneratorRuntime);
+var Toastr__default = /*#__PURE__*/_interopDefaultLegacy(Toastr);
 var Select__default = /*#__PURE__*/_interopDefaultLegacy(Select);
 var CenterAlign__default = /*#__PURE__*/_interopDefaultLegacy(CenterAlign);
 var LeftAlign__default = /*#__PURE__*/_interopDefaultLegacy(LeftAlign);
 var ColorPicker__default = /*#__PURE__*/_interopDefaultLegacy(ColorPicker);
-var classnames__default = /*#__PURE__*/_interopDefaultLegacy(classnames);
 var HelpPopover__default = /*#__PURE__*/_interopDefaultLegacy(HelpPopover);
 var Switch__default = /*#__PURE__*/_interopDefaultLegacy(Switch);
 var Input__default = /*#__PURE__*/_interopDefaultLegacy(Input);
@@ -92,26 +94,16 @@ var MoreDropdown__default = /*#__PURE__*/_interopDefaultLegacy(MoreDropdown);
 var LeftArrow__default = /*#__PURE__*/_interopDefaultLegacy(LeftArrow);
 var Plus__default = /*#__PURE__*/_interopDefaultLegacy(Plus);
 
-var BASE_URL = "neeto_themes_engine";
-var WHITE = "255, 255, 255";
-var BLACK = "0, 0, 0";
-
 var show$1 = function show(entityId) {
-  return axios__default["default"].get("".concat(BASE_URL, "/api/v1/entities/").concat(entityId));
+  return axios__default["default"].get("".concat(utils.BASE_URL, "/api/v1/entities/").concat(entityId));
 };
 var entitiesApi = {
   show: show$1
 };
 
-var QUERY_KEYS = {
-  THEMES_LIST: "themes-list",
-  THEME_DETAILS: "theme-details",
-  SCHEMA_DETAILS: "schema-details"
-};
-
 var useShowThemeEntity = function useShowThemeEntity(entityId) {
   return reactQuery.useQuery({
-    queryKey: [QUERY_KEYS.THEME_ENTITY_DETAILS, entityId],
+    queryKey: [useThemeUtils.QUERY_KEYS.THEME_ENTITY_DETAILS, entityId],
     queryFn: function queryFn() {
       return entitiesApi.show(entityId);
     },
@@ -119,246 +111,44 @@ var useShowThemeEntity = function useShowThemeEntity(entityId) {
   });
 };
 
-/** @type {import("neetocommons/react-utils").ZustandStoreHook} */
-var useConfigStore = zustand.create(reactUtils.withImmutableActions(function (set) {
-  return {
-    themePropertiesSchema: [],
-    entityType: "",
-    entityId: "",
-    variableNamesMap: {},
-    defaultThemeName: "Plain blue",
-    isFetchingSchema: true,
-    isTemplateThemesEnabled: false,
-    setConfigState: set
-  };
-}));
-
-/** @type {import("neetocommons/react-utils").ZustandStoreHook} */
-var useThemeStore = zustand.create(reactUtils.withImmutableActions(function (set) {
-  return {
-    currentTheme: {},
-    isCurrentThemeLoading: true,
-    previewingTheme: {},
-    setThemeState: set
-  };
-}));
-
-var getImageFromUrl = function getImageFromUrl(source) {
-  var image = new Image();
-  image.crossOrigin = "anonymous";
-  image.src = source;
-  return new Promise(function (resolve) {
-    image.onload = function () {
-      resolve(image);
-    };
-  });
-};
-var getDominantColorFromUrl = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator__default["default"]( /*#__PURE__*/_regeneratorRuntime__default["default"].mark(function _callee(imageUrl) {
-    var image, context, c;
-    return _regeneratorRuntime__default["default"].wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.prev = 0;
-          _context.next = 3;
-          return getImageFromUrl(imageUrl);
-        case 3:
-          image = _context.sent;
-          context = document.createElement("canvas").getContext("2d");
-          context === null || context === void 0 || context.drawImage(image, 0, 0, 1, 1);
-          c = context === null || context === void 0 ? void 0 : context.getImageData(0, 0, 1, 1).data;
-          if (!c) {
-            _context.next = 9;
-            break;
-          }
-          return _context.abrupt("return", "#".concat(((1 << 24) + (c[0] << 16) + (c[1] << 8) + c[2]).toString(16).slice(1)));
-        case 9:
-          return _context.abrupt("return", null);
-        case 12:
-          _context.prev = 12;
-          _context.t0 = _context["catch"](0);
-          Toastr__default["default"].error(_context.t0);
-          return _context.abrupt("return", null);
-        case 16:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[0, 12]]);
-  }));
-  return function getDominantColorFromUrl(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-var scrollElementIntoView = function scrollElementIntoView(elementId) {
-  var elementToScroll = document.getElementById(elementId);
-  elementToScroll === null || elementToScroll === void 0 || elementToScroll.scrollIntoView({
-    behavior: "smooth"
-  });
-};
-var isFunction = function isFunction(obj) {
-  return typeof obj === "function";
-};
-var hexToRgba = function hexToRgba(hex) {
-  var result = /^#?(?:([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})?|([a-f\d]{2})([a-f\d]{2})([a-f\d]{2}))$/i.exec(hex);
-  if (!result) return null;
-  var r = parseInt(result[1] || result[5], 16);
-  var g = parseInt(result[2] || result[6], 16);
-  var b = parseInt(result[3] || result[7], 16);
-  var a = result[4] ? Math.round(parseInt(result[4], 16) / 2.55) / 100 : undefined;
-  return "".concat(r, ", ").concat(g, ", ").concat(b).concat(a !== undefined ? ", ".concat(a) : "");
-};
-
-var root = document.querySelector(":root");
-var setVariable = function setVariable(name, value, variableNamesMap) {
-  var variableName = variableNamesMap[name];
-  if (!variableName) return;
-  root.style.setProperty(variableName, value);
-};
-var isPropertyIndependent = function isPropertyIndependent(key, theme, schema) {
-  var property = neetoCist.findBy({
-    key: key
-  }, schema);
-  if (neetoCist.isNotPresent(property)) return false;
-  var conditionalKey = property === null || property === void 0 ? void 0 : property.dependsOn;
-  if (neetoCist.isNotPresent(conditionalKey)) return true;
-  var dependentPropertySchema = neetoCist.findBy({
-    key: conditionalKey
-  }, schema);
-  var dependentProperty = neetoCist.findBy({
-    key: conditionalKey
-  }, theme.properties);
-  if (dependentPropertySchema.kind === "image") {
-    var _theme$snakeToCamelCa;
-    return neetoCist.isPresent((_theme$snakeToCamelCa = theme[neetoCist.snakeToCamelCase(conditionalKey)]) === null || _theme$snakeToCamelCa === void 0 ? void 0 : _theme$snakeToCamelCa.url);
-  } else if (dependentPropertySchema.kind === "boolean") {
-    return (dependentProperty === null || dependentProperty === void 0 ? void 0 : dependentProperty.value) !== "false";
-  }
-  return neetoCist.isPresent(dependentProperty === null || dependentProperty === void 0 ? void 0 : dependentProperty.value);
-};
-var setTheme = function setTheme(theme, variableNamesMap, themeConfig) {
-  if (neetoCist.isNotPresent(theme === null || theme === void 0 ? void 0 : theme.properties)) return;
-  theme.properties.forEach(function (property) {
-    var attribute = neetoCist.snakeToCamelCase(property.key);
-    if (!isPropertyIndependent(property.key, theme, themeConfig)) {
-      setVariable(attribute, "", variableNamesMap);
-      return;
-    }
-    if (property.kind === "color") {
-      setVariable(attribute, hexToRgba(property.value), variableNamesMap);
-    } else if (property.kind === "overlay_opacity") {
-      var overlayOpacity = Number(property.value);
-      setVariable(neetoCist.snakeToCamelCase("".concat(property.key, "_overlay_opacity")), Math.abs(overlayOpacity / 100), variableNamesMap);
-      setVariable(neetoCist.snakeToCamelCase("".concat(property.key, "_overlay_color")), overlayOpacity < 0 ? BLACK : WHITE, variableNamesMap);
-    } else if (property.kind === "radius") {
-      setVariable(attribute, "".concat(property.value, "px"), variableNamesMap);
-    } else {
-      setVariable(attribute, property.value, variableNamesMap);
-    }
-  });
-  neetoCist.filterBy({
-    kind: "image"
-  }, themeConfig).forEach(function (_ref) {
-    var _theme$attribute;
-    var key = _ref.key;
-    var attribute = neetoCist.snakeToCamelCase(key);
-    setVariable(attribute, "url(".concat((_theme$attribute = theme[attribute]) === null || _theme$attribute === void 0 ? void 0 : _theme$attribute.url, ")"), variableNamesMap);
-  });
-};
-
-var list$1 = function list() {
-  return axios__default["default"].get("".concat(BASE_URL, "/api/v1/schema"));
-};
-var schemasApi = {
-  list: list$1
-};
-
-var useListSchema = function useListSchema() {
-  return reactQuery.useQuery({
-    queryKey: [QUERY_KEYS.SCHEMA_DETAILS],
-    queryFn: schemasApi.list
-  });
-};
+var e=[],t=[];function n(n,r){if(n&&"undefined"!=typeof document){var a,s=!0===r.prepend?"prepend":"append",d=!0===r.singleTag,i="string"==typeof r.container?document.querySelector(r.container):document.getElementsByTagName("head")[0];if(d){var u=e.indexOf(i);-1===u&&(u=e.push(i)-1,t[u]={}),a=t[u]&&t[u][s]?t[u][s]:t[u][s]=c();}else a=c();65279===n.charCodeAt(0)&&(n=n.substring(1)),a.styleSheet?a.styleSheet.cssText+=n:a.appendChild(document.createTextNode(n));}function c(){var e=document.createElement("style");if(e.setAttribute("type","text/css"),r.attributes)for(var t=Object.keys(r.attributes),n=0;n<t.length;n++)e.setAttribute(t[n],r.attributes[t[n]]);var a="prepend"===s?"afterbegin":"beforeend";return i.insertAdjacentElement(a,e),e}}
 
-var useThemeUtils = function useThemeUtils() {
-  var setConfigState = useConfigStore(ramda.prop("setConfigState"));
-  var _useThemeStore = useThemeStore(function (store) {
-      return {
-        previewingTheme: store["previewingTheme"],
-        currentTheme: store["currentTheme"]
-      };
-    }, shallow.shallow),
-    previewingTheme = _useThemeStore.previewingTheme,
-    currentTheme = _useThemeStore.currentTheme;
-  var _useListSchema = useListSchema(),
-    isFetchingSchema = _useListSchema.isLoading,
-    data = _useListSchema.data;
-  var _ref = data || {},
-    _ref$schema = _ref.schema,
-    themePropertiesSchema = _ref$schema === void 0 ? [] : _ref$schema,
-    _ref$variableNamesMap = _ref.variableNamesMap,
-    variableNamesMap = _ref$variableNamesMap === void 0 ? {} : _ref$variableNamesMap;
-  react.useEffect(function () {
-    if (data) {
-      setConfigState({
-        themePropertiesSchema: data === null || data === void 0 ? void 0 : data.schema,
-        variableNamesMap: data === null || data === void 0 ? void 0 : data.variableNamesMap,
-        defaultThemeName: data === null || data === void 0 ? void 0 : data.defaultThemeName
-      });
-    }
-  }, [data]);
-  react.useEffect(function () {
-    return setConfigState({
-      isFetchingSchema: isFetchingSchema
-    });
-  }, [isFetchingSchema]);
-  var setVariable$1 = function setVariable$1(name, value) {
-    return setVariable(name, value, variableNamesMap);
-  };
-  var setTheme$1 = function setTheme$1(theme) {
-    return setTheme(theme, variableNamesMap, themePropertiesSchema);
-  };
-  return {
-    setTheme: setTheme$1,
-    setVariable: setVariable$1,
-    previewingTheme: previewingTheme,
-    currentTheme: currentTheme,
-    isFetchingSchema: isFetchingSchema
-  };
-};
+var css = ".neeto-themes__wrapper{display:flex;width:100%}.neeto-themes__wrapper .neeto-themes-sidebar{background-color:rgb(var(--neeto-ui-white));height:calc(100vh - 64px);width:280px}@media (min-width:1024px){.neeto-themes__wrapper .neeto-themes-sidebar{width:320px}}@media (min-width:1280px){.neeto-themes__wrapper .neeto-themes-sidebar{width:340px}.neeto-themes__wrapper .neeto-themes-sidebar--expanded{max-width:50%;width:520px}}.neeto-themes__wrapper .neeto-themes-sidebar .neeto-themes-sidebar__header{padding-bottom:8px;padding-top:16px}.neeto-themes__wrapper .neeto-themes-sidebar .neeto-themes-sidebar__scroll{display:flex;flex-direction:column;height:calc(100vh - 120px);overflow-y:auto}.neeto-themes__wrapper .neeto-themes-sidebar .neeto-themes-sidebar__scroll .neeto-ui-colorpicker__target .neeto-ui-colorpicker-target__code{display:none}.neeto-themes__wrapper .neeto-themes-sidebar .neeto-ui-colorpicker__target-size--medium{--neeto-ui-colorpicker-target-padding:6px}.neeto-themes__wrapper .neeto-themes-sidebar .neeto-ui-colorpicker__target-size--medium .neeto-ui-colorpicker-target__color{border-radius:0!important;height:20px;width:20px}.neeto-themes__wrapper .css-editor-height__expanded{height:calc(100vh - 300px)}.neeto-themes__wrapper .css-editor-height__regular{height:384px}.neeto-themes__wrapper .neeto-themes-preview__wrapper{flex-grow:1;height:calc(100vh - 64px);position:relative}.neeto-themes-theme-thumbnail--preview-active{border-color:rgb(var(--neeto-ui-gray-600))!important;outline:1px solid rgb(var(--neeto-ui-gray-600))!important}.neeto-themes-theme-thumbnail--active{border-color:rgb(var(--neeto-ui-primary-500))!important;outline:2px solid rgb(var(--neeto-ui-primary-500))!important}.neeto-themes-theme-thumbnail--highlight-active{border-color:rgb(var(--neeto-ui-gray-400))!important;outline:2px solid rgb(var(--neeto-ui-gray-400))!important}.neeto-themes-theme-thumbnail__apply-btn{--neeto-ui-btn-padding-x:12px;--neeto-ui-btn-border-radius:100px}.neeto-themes-theme-thumbnail__apply-btn:disabled,.neeto-themes-theme-thumbnail__apply-btn[disabled]{opacity:1!important}.neeto-themes-sidebar__custom-css-editor-header{background-color:#1e1e1e;border-top-left-radius:var(--neeto-ui-rounded-lg);border-top-right-radius:var(--neeto-ui-rounded-lg)}.neeto-themes-sidebar .monaco-editor,.neeto-themes-sidebar .overflow-guard{border-bottom-left-radius:var(--neeto-ui-rounded-lg);border-bottom-right-radius:var(--neeto-ui-rounded-lg)}.neeto-themes-sidebar__custom-css-wrapper .neeto-themes-nano-section{border-bottom:0!important}\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFwcC9qYXZhc2NyaXB0L3N0eWxlc2hlZXRzL2NvbXBvbmVudHMvdGhlbWVzLnNjc3MiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBRUEsdUJBRUUsWUFBQSxDQURBLFVBQUYsQ0FHRSw2Q0FHRSwyQ0FBQSxDQURBLHlCQUFBLENBREEsV0FDSixDQUdJLDBCQUxGLDZDQU1JLFdBQUosQ0FDRixDQUNJLDBCQVJGLDZDQVNJLFdBRUosQ0FBSSx1REFFRSxhQUFBLENBREEsV0FHTixDQUNGLENBQ0ksMkVBRUUsa0JBQUEsQ0FEQSxnQkFFTixDQUVJLDJFQUdFLFlBQUEsQ0FDQSxxQkFBQSxDQUhBLDBCQUFBLENBQ0EsZUFFTixDQUdRLDRJQUNFLFlBRFYsQ0FLSSx3RkFDRSx5Q0FITixDQUlNLDRIQUdFLHlCQUFBLENBRkEsV0FBQSxDQUNBLFVBRFIsQ0FPRSxvREFDRSwwQkFMSixDQVFFLG1EQUNFLFlBTkosQ0FTRSxzREFHRSxXQUFBLENBREEseUJBQUEsQ0FEQSxpQkFMSixDQVdBLDhDQUNFLG9EQUFBLENBQ0EseURBUkYsQ0FXQSxzQ0FDRSx1REFBQSxDQUNBLDREQVJGLENBV0EsZ0RBQ0Usb0RBQUEsQ0FDQSx5REFSRixDQVdBLHlDQUNFLDZCQUFBLENBQ0Esa0NBUkYsQ0FTRSxxR0FFRSxtQkFSSixDQVlBLGdEQUNFLHdCQUFBLENBQ0EsaURBQUEsQ0FDQSxrREFURixDQWFFLDJFQUVFLG9EQUFBLENBQ0EscURBVkosQ0FlRSxxRUFDRSx5QkFaSiIsInNvdXJjZXNDb250ZW50IjpbIkBpbXBvcnQgXCIuLi9hYnN0cmFjdHMvdmFyaWFibGVzXCI7XG5cbi5uZWV0by10aGVtZXNfX3dyYXBwZXIge1xuICB3aWR0aDogMTAwJTtcbiAgZGlzcGxheTogZmxleDtcblxuICAubmVldG8tdGhlbWVzLXNpZGViYXIge1xuICAgIHdpZHRoOiAkdGhlbWVzLXNpZGViYXItd2lkdGgtc207XG4gICAgaGVpZ2h0OiBjYWxjKDEwMHZoIC0gI3skYnVpbGRlci1oZWFkZXItaGVpZ2h0fSk7XG4gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKHZhcigtLW5lZXRvLXVpLXdoaXRlKSk7XG5cbiAgICBAc2NyZWVuIGxnIHtcbiAgICAgIHdpZHRoOiAkdGhlbWVzLXNpZGViYXItd2lkdGgtbGc7XG4gICAgfVxuICAgIEBzY3JlZW4geGwge1xuICAgICAgd2lkdGg6ICR0aGVtZXMtc2lkZWJhci13aWR0aC14bDtcblxuICAgICAgJi0tZXhwYW5kZWQge1xuICAgICAgICB3aWR0aDogJHRoZW1lcy1zaWRlYmFyLWV4cGFuZGVkO1xuICAgICAgICBtYXgtd2lkdGg6IDUwJTtcbiAgICAgIH1cbiAgICB9XG5cbiAgICAubmVldG8tdGhlbWVzLXNpZGViYXJfX2hlYWRlciB7XG4gICAgICBwYWRkaW5nLXRvcDogMTZweDtcbiAgICAgIHBhZGRpbmctYm90dG9tOiA4cHg7XG4gICAgfVxuXG4gICAgLm5lZXRvLXRoZW1lcy1zaWRlYmFyX19zY3JvbGwge1xuICAgICAgaGVpZ2h0OiBjYWxjKDEwMHZoIC0gMTIwcHgpO1xuICAgICAgb3ZlcmZsb3cteTogYXV0bztcbiAgICAgIGRpc3BsYXk6IGZsZXg7XG4gICAgICBmbGV4LWRpcmVjdGlvbjogY29sdW1uO1xuXG4gICAgICAubmVldG8tdWktY29sb3JwaWNrZXJfX3RhcmdldCB7XG4gICAgICAgIC5uZWV0by11aS1jb2xvcnBpY2tlci10YXJnZXRfX2NvZGUge1xuICAgICAgICAgIGRpc3BsYXk6IG5vbmU7XG4gICAgICAgIH1cbiAgICAgIH1cbiAgICB9XG4gICAgLm5lZXRvLXVpLWNvbG9ycGlja2VyX190YXJnZXQtc2l6ZS0tbWVkaXVtIHtcbiAgICAgIC0tbmVldG8tdWktY29sb3JwaWNrZXItdGFyZ2V0LXBhZGRpbmc6IDZweDtcbiAgICAgIC5uZWV0by11aS1jb2xvcnBpY2tlci10YXJnZXRfX2NvbG9yIHtcbiAgICAgICAgaGVpZ2h0OiAyMHB4O1xuICAgICAgICB3aWR0aDogMjBweDtcbiAgICAgICAgYm9yZGVyLXJhZGl1czogMCAhaW1wb3J0YW50O1xuICAgICAgfVxuICAgIH1cbiAgfVxuXG4gIC5jc3MtZWRpdG9yLWhlaWdodF9fZXhwYW5kZWQge1xuICAgIGhlaWdodDogY2FsYygxMDB2aCAtIDMwMHB4KTtcbiAgfVxuXG4gIC5jc3MtZWRpdG9yLWhlaWdodF9fcmVndWxhciB7XG4gICAgaGVpZ2h0OiAzODRweDtcbiAgfVxuXG4gIC5uZWV0by10aGVtZXMtcHJldmlld19fd3JhcHBlciB7XG4gICAgcG9zaXRpb246IHJlbGF0aXZlO1xuICAgIGhlaWdodDogY2FsYygxMDB2aCAtICN7JGJ1aWxkZXItaGVhZGVyLWhlaWdodH0pO1xuICAgIGZsZXgtZ3JvdzogMTtcbiAgfVxufVxuXG4ubmVldG8tdGhlbWVzLXRoZW1lLXRodW1ibmFpbC0tcHJldmlldy1hY3RpdmUge1xuICBib3JkZXItY29sb3I6IHJnYih2YXIoLS1uZWV0by11aS1ncmF5LTYwMCkpICFpbXBvcnRhbnQ7XG4gIG91dGxpbmU6IDFweCBzb2xpZCByZ2IodmFyKC0tbmVldG8tdWktZ3JheS02MDApKSAhaW1wb3J0YW50O1xufVxuXG4ubmVldG8tdGhlbWVzLXRoZW1lLXRodW1ibmFpbC0tYWN0aXZlIHtcbiAgYm9yZGVyLWNvbG9yOiByZ2IodmFyKC0tbmVldG8tdWktcHJpbWFyeS01MDApKSAhaW1wb3J0YW50O1xuICBvdXRsaW5lOiAycHggc29saWQgcmdiKHZhcigtLW5lZXRvLXVpLXByaW1hcnktNTAwKSkgIWltcG9ydGFudDtcbn1cblxuLm5lZXRvLXRoZW1lcy10aGVtZS10aHVtYm5haWwtLWhpZ2hsaWdodC1hY3RpdmUge1xuICBib3JkZXItY29sb3I6IHJnYih2YXIoLS1uZWV0by11aS1ncmF5LTQwMCkpICFpbXBvcnRhbnQ7XG4gIG91dGxpbmU6IDJweCBzb2xpZCByZ2IodmFyKC0tbmVldG8tdWktZ3JheS00MDApKSAhaW1wb3J0YW50O1xufVxuXG4ubmVldG8tdGhlbWVzLXRoZW1lLXRodW1ibmFpbF9fYXBwbHktYnRuIHtcbiAgLS1uZWV0by11aS1idG4tcGFkZGluZy14OiAxMnB4O1xuICAtLW5lZXRvLXVpLWJ0bi1ib3JkZXItcmFkaXVzOiAxMDBweDtcbiAgJjpkaXNhYmxlZCxcbiAgJltkaXNhYmxlZF0ge1xuICAgIG9wYWNpdHk6IDEgIWltcG9ydGFudDtcbiAgfVxufVxuXG4ubmVldG8tdGhlbWVzLXNpZGViYXJfX2N1c3RvbS1jc3MtZWRpdG9yLWhlYWRlciB7XG4gIGJhY2tncm91bmQtY29sb3I6ICMxZTFlMWU7XG4gIGJvcmRlci10b3AtbGVmdC1yYWRpdXM6IHZhcigtLW5lZXRvLXVpLXJvdW5kZWQtbGcpO1xuICBib3JkZXItdG9wLXJpZ2h0LXJhZGl1czogdmFyKC0tbmVldG8tdWktcm91bmRlZC1sZyk7XG59XG5cbi5uZWV0by10aGVtZXMtc2lkZWJhciB7XG4gIC5vdmVyZmxvdy1ndWFyZCxcbiAgLm1vbmFjby1lZGl0b3Ige1xuICAgIGJvcmRlci1ib3R0b20tbGVmdC1yYWRpdXM6IHZhcigtLW5lZXRvLXVpLXJvdW5kZWQtbGcpO1xuICAgIGJvcmRlci1ib3R0b20tcmlnaHQtcmFkaXVzOiB2YXIoLS1uZWV0by11aS1yb3VuZGVkLWxnKTtcbiAgfVxufVxuXG4ubmVldG8tdGhlbWVzLXNpZGViYXJfX2N1c3RvbS1jc3Mtd3JhcHBlciB7XG4gIC5uZWV0by10aGVtZXMtbmFuby1zZWN0aW9uIHtcbiAgICBib3JkZXItYm90dG9tOiAwICFpbXBvcnRhbnQ7XG4gIH1cbn1cbiJdfQ== */";
+n(css,{});
 
 var _excluded$1 = ["themeId"];
 var list = function list(entityId) {
-  return axios__default["default"].get("".concat(BASE_URL, "/api/v1/themes"), {
+  return axios__default["default"].get("".concat(utils.BASE_URL, "/api/v1/themes"), {
     params: {
       entity_id: entityId
     }
   });
 };
 var show = function show(id) {
-  return axios__default["default"].get("".concat(BASE_URL, "/api/v1/themes/").concat(id));
+  return axios__default["default"].get("".concat(utils.BASE_URL, "/api/v1/themes/").concat(id));
 };
 var create = function create(payload) {
-  return axios__default["default"].post("".concat(BASE_URL, "/api/v1/themes"), {
+  return axios__default["default"].post("".concat(utils.BASE_URL, "/api/v1/themes"), {
     theme: payload
   });
 };
 var update = function update(_ref) {
   var id = _ref.id,
     payload = _ref.payload;
-  return axios__default["default"].put("".concat(BASE_URL, "/api/v1/themes/").concat(id), {
+  return axios__default["default"].put("".concat(utils.BASE_URL, "/api/v1/themes/").concat(id), {
     theme: payload
   });
 };
 var destroy = function destroy(id) {
-  return axios__default["default"]["delete"]("".concat(BASE_URL, "/api/v1/themes/").concat(id));
+  return axios__default["default"]["delete"]("".concat(utils.BASE_URL, "/api/v1/themes/").concat(id));
 };
 var clone = function clone(id) {
-  return axios__default["default"].post("".concat(BASE_URL, "/api/v1/themes/").concat(id, "/clone"));
+  return axios__default["default"].post("".concat(utils.BASE_URL, "/api/v1/themes/").concat(id, "/clone"));
 };
 var apply = function apply(_ref2) {
   var themeId = _ref2.themeId,
     payload = _objectWithoutProperties__default["default"](_ref2, _excluded$1);
-  return axios__default["default"].post("".concat(BASE_URL, "/api/v1/themes/").concat(themeId, "/apply"), {
+  return axios__default["default"].post("".concat(utils.BASE_URL, "/api/v1/themes/").concat(themeId, "/apply"), {
     entity: payload
   });
 };
@@ -373,13 +163,13 @@ var themesApi = {
 };
 
 var useListThemes = function useListThemes(entityId) {
-  var _useConfigStore = useConfigStore(function (store) {
+  var _useConfigStore = useThemeUtils.useConfigStore(function (store) {
       return {
         isTemplateThemesEnabled: store["isTemplateThemesEnabled"]
       };
     }, shallow.shallow),
     isTemplateThemesEnabled = _useConfigStore.isTemplateThemesEnabled;
-  var queryKey = isTemplateThemesEnabled ? [QUERY_KEYS.THEMES_LIST, entityId] : [QUERY_KEYS.THEMES_LIST];
+  var queryKey = isTemplateThemesEnabled ? [useThemeUtils.QUERY_KEYS.THEMES_LIST, entityId] : [useThemeUtils.QUERY_KEYS.THEMES_LIST];
   return reactQuery.useQuery({
     queryKey: queryKey,
     queryFn: function queryFn() {
@@ -389,7 +179,7 @@ var useListThemes = function useListThemes(entityId) {
 };
 var useCreateTheme = function useCreateTheme() {
   return reactUtils.useMutationWithInvalidation(themesApi.create, {
-    keysToInvalidate: [QUERY_KEYS.THEMES_LIST]
+    keysToInvalidate: [useThemeUtils.QUERY_KEYS.THEMES_LIST]
   });
 };
 var useUpdateTheme = function useUpdateTheme(themeId) {
@@ -399,23 +189,23 @@ var useUpdateTheme = function useUpdateTheme(themeId) {
       payload: payload
     });
   }, {
-    keysToInvalidate: [[QUERY_KEYS.THEMES_LIST], [QUERY_KEYS.THEME_ENTITY_DETAILS], [QUERY_KEYS.THEME_DETAILS, themeId]]
+    keysToInvalidate: [[useThemeUtils.QUERY_KEYS.THEMES_LIST], [useThemeUtils.QUERY_KEYS.THEME_ENTITY_DETAILS], [useThemeUtils.QUERY_KEYS.THEME_DETAILS, themeId]]
   });
 };
 var useDeleteTheme = function useDeleteTheme() {
   return reactUtils.useMutationWithInvalidation(themesApi.destroy, {
-    keysToInvalidate: [[QUERY_KEYS.THEMES_LIST], [QUERY_KEYS.THEME_ENTITY_DETAILS]]
+    keysToInvalidate: [[useThemeUtils.QUERY_KEYS.THEMES_LIST], [useThemeUtils.QUERY_KEYS.THEME_ENTITY_DETAILS]]
   });
 };
 var useCloneTheme = function useCloneTheme() {
   return reactUtils.useMutationWithInvalidation(themesApi.clone, {
-    keysToInvalidate: [QUERY_KEYS.THEMES_LIST]
+    keysToInvalidate: [useThemeUtils.QUERY_KEYS.THEMES_LIST]
   });
 };
 var useApplyTheme = function useApplyTheme(_ref) {
   var onSuccess = _ref.onSuccess;
   return reactUtils.useMutationWithInvalidation(themesApi.apply, {
-    keysToInvalidate: [[QUERY_KEYS.THEMES_LIST], [QUERY_KEYS.THEME_ENTITY_DETAILS]],
+    keysToInvalidate: [[useThemeUtils.QUERY_KEYS.THEMES_LIST], [useThemeUtils.QUERY_KEYS.THEME_ENTITY_DETAILS]],
     onSuccess: onSuccess
   });
 };
@@ -496,6 +286,119 @@ var OVERLAY_OPACITY_SLIDER_MARKS = {
 };
 var HUNDRED = 100;
 
+var DESIGN_SCREENS = {
+  THEMES: "Themes",
+  Customize: "Customize",
+  CustomCSS: "CustomCSS"
+};
+var ONE_MEGABYTE = 1;
+
+var Card$2 = function Card(_ref) {
+  var _ref$title = _ref.title,
+    title = _ref$title === void 0 ? "" : _ref$title,
+    children = _ref.children;
+  return /*#__PURE__*/jsxRuntime.jsxs("div", {
+    className: "neeto-themes-nano-section neeto-ui-border-gray-200 mb-4 space-y-3 border-b pb-4",
+    "data-cy": "theme-".concat(neetoCist.hyphenate(title), "-properties"),
+    children: [title && /*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "neeto-themes-nano-section__title flex items-center justify-between",
+      children: /*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
+        className: "min-w-0 flex-grow",
+        "data-cy": "theme-properties",
+        lineHeight: "normal",
+        style: "h4",
+        weight: "semibold",
+        children: title
+      })
+    }), children && /*#__PURE__*/jsxRuntime.jsx("div", {
+      className: "neeto-themes-nano-section__content w-full",
+      children: children
+    })]
+  });
+};
+
+var isScreenCustomCSS = function isScreenCustomCSS(screen) {
+  return screen === DESIGN_SCREENS.CustomCSS;
+};
+
+var CustomCSS = function CustomCSS(_ref) {
+  var onEditCSSClick = _ref.onEditCSSClick,
+    currentScreen = _ref.currentScreen;
+  var _useTranslation = reactI18next.useTranslation(),
+    t = _useTranslation.t;
+  var _useFormikContext = formik.useFormikContext(),
+    values = _useFormikContext.values,
+    setFieldValue = _useFormikContext.setFieldValue;
+  var _useConfigStore = useThemeUtils.useConfigStore(function (store) {
+      return {
+        themePropertiesSchema: store["themePropertiesSchema"]
+      };
+    }, shallow.shallow),
+    themePropertiesSchema = _useConfigStore.themePropertiesSchema;
+  var customCSS = neetoCist.findBy({
+    kind: "custom_css"
+  }, values.properties);
+  if (!customCSS) return null;
+  var parentElementClass = neetoCist.findBy({
+    kind: "custom_css"
+  }, themePropertiesSchema).parentClass;
+  var isCustomCssScreen = isScreenCustomCSS(currentScreen);
+  var handleEditorToggle = function handleEditorToggle() {
+    if (!isCustomCssScreen) return onEditCSSClick(DESIGN_SCREENS.CustomCSS);
+    onEditCSSClick(DESIGN_SCREENS.Customize);
+    return setTimeout(function () {
+      utils.scrollElementIntoView("css-editor");
+    }, 400);
+  };
+  var handleChange = function handleChange(value) {
+    var index = neetoCist.findIndexBy({
+      key: customCSS.key
+    }, values.properties);
+    if (index !== -1 && values.properties[index].value !== value) {
+      setFieldValue("properties[".concat(index, "].value"), value);
+      utils.setCustomCSS({
+        css: value,
+        elementId: customCSS.key,
+        parentElementClass: parentElementClass
+      });
+    }
+  };
+  return /*#__PURE__*/jsxRuntime.jsx("div", {
+    className: "neeto-themes-sidebar__custom-css-wrapper",
+    id: "css-editor",
+    children: /*#__PURE__*/jsxRuntime.jsxs(Card$2, {
+      title: isCustomCssScreen ? "" : t("neetoThemes.build.leftSideBar.themes.customCSS"),
+      children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "neeto-themes-sidebar__custom-css-editor-header flex w-full justify-end gap-1 rounded-b-none p-2",
+        children: /*#__PURE__*/jsxRuntime.jsx(Button__default["default"], {
+          size: "small",
+          style: "secondary",
+          label: isCustomCssScreen ? t("neetoThemes.buttons.minimizeEditor") : t("neetoThemes.buttons.expandEditor"),
+          onClick: handleEditorToggle
+        })
+      }), /*#__PURE__*/jsxRuntime.jsx(Editor__default["default"], {
+        language: "css",
+        options: {
+          scrollBeyondLastLine: false,
+          minimap: {
+            enabled: false
+          }
+        },
+        theme: "vs-dark",
+        value: customCSS.value,
+        className: classNames__default["default"]({
+          rounded: true,
+          "css-editor-height__expanded": isCustomCssScreen,
+          "css-editor-height__regular": !isCustomCssScreen
+        }),
+        onChange: handleChange
+      })]
+    })
+  });
+};
+
+function ownKeys$4(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$4(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$4(Object(t), !0).forEach(function (r) { _defineProperty__default["default"](e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$4(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var buildInitialValues = function buildInitialValues(theme, themePropertiesSchema) {
   if (neetoCist.isPresent(theme)) return theme;
   return {
@@ -503,56 +406,82 @@ var buildInitialValues = function buildInitialValues(theme, themePropertiesSchem
     properties: themePropertiesSchema.map(function (_ref) {
       var key = _ref.key,
         kind = _ref.kind,
-        defaultValue = _ref.defaultValue;
+        defaultValue = _ref.defaultValue,
+        _ref$order = _ref.order,
+        order = _ref$order === void 0 ? null : _ref$order;
       switch (kind) {
         case "color":
-          return {
+          return _objectSpread$4({
             value: defaultValue,
             kind: "color",
             key: key
-          };
+          }, order !== null && {
+            order: order
+          });
         case "font_family":
-          return {
+          return _objectSpread$4({
             value: '-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"',
             kind: "font_family",
             key: key
-          };
+          }, order !== null && {
+            order: order
+          });
         case "overlay_opacity":
-          return {
+          return _objectSpread$4({
             value: 0,
             kind: "overlay_opacity",
             key: key
-          };
+          }, order !== null && {
+            order: order
+          });
         case "slider":
-          return {
+          return _objectSpread$4({
             value: 0,
             kind: "slider",
             key: key
-          };
+          }, order !== null && {
+            order: order
+          });
         case "radius":
-          return {
+          return _objectSpread$4({
             value: defaultValue,
             kind: "radius",
             key: key
-          };
+          }, order !== null && {
+            order: order
+          });
         case "boolean":
-          return {
+          return _objectSpread$4({
             value: String(defaultValue),
             kind: "boolean",
             key: key
-          };
-        case "position_selector":
-          return {
+          }, order !== null && {
+            order: order
+          });
+        case "order_selector":
+          return _objectSpread$4({
             value: defaultValue,
-            kind: "position_selector",
+            kind: "order_selector",
             key: key
-          };
+          }, order !== null && {
+            order: order
+          });
         case "alignment_block":
-          return {
+          return _objectSpread$4({
             value: defaultValue,
             kind: "alignment_block",
             key: key
-          };
+          }, order !== null && {
+            order: order
+          });
+        case "custom_css":
+          return _objectSpread$4({
+            value: defaultValue,
+            kind: "custom_css",
+            key: key
+          }, order !== null && {
+            order: order
+          });
         default:
           return null;
       }
@@ -595,29 +524,6 @@ var buildLabel = function buildLabel(key, kind) {
   return i18next.t("neetoThemes.properties.".concat(neetoCist.snakeToCamelCase(kind), ".").concat(neetoCist.snakeToCamelCase(key)));
 };
 
-var Card$2 = function Card(_ref) {
-  var _ref$title = _ref.title,
-    title = _ref$title === void 0 ? "" : _ref$title,
-    children = _ref.children;
-  return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: "neeto-ui-border-gray-300 neeto-ui-rounded-lg neeto-ui-bg-white space-y-3 border p-4",
-    "data-cy": "theme-".concat(neetoCist.hyphenate(title), "-properties"),
-    children: [title && /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: "flex items-center justify-between",
-      children: /*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
-        "data-cy": "theme-properties",
-        lineHeight: "normal",
-        style: "h4",
-        weight: "semibold",
-        children: title
-      })
-    }), children && /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: "space-y-4",
-      children: children
-    })]
-  });
-};
-
 var SelectBlock = function SelectBlock(_ref) {
   var label = _ref.label,
     _ref$placeholder = _ref.placeholder,
@@ -626,8 +532,8 @@ var SelectBlock = function SelectBlock(_ref) {
     options = _ref.options,
     onChange = _ref.onChange;
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: "flex items-center justify-between py-3 first:pt-0 last:pb-0",
-    "data-cy": "theme-style-".concat(utils.joinHyphenCase(label)),
+    className: "flex items-center justify-between py-2 first:pt-0 last:pb-0",
+    "data-cy": "theme-style-".concat(utils$1.joinHyphenCase(label)),
     children: [/*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
       "data-cy": "logo-field-labels",
       style: "body2",
@@ -644,12 +550,6 @@ var SelectBlock = function SelectBlock(_ref) {
   });
 };
 
-var DESIGN_SCREENS = {
-  THEMES: "Themes",
-  Customize: "Customize"
-};
-var ONE_MEGABYTE = 1;
-
 var ImageBlock = function ImageBlock(_ref) {
   var _findBy;
   var label = _ref.label,
@@ -666,7 +566,7 @@ var ImageBlock = function ImageBlock(_ref) {
   var _useFormikContext = formik.useFormikContext(),
     setFieldValue = _useFormikContext.setFieldValue,
     values = _useFormikContext.values;
-  var _useConfigStore = useConfigStore(function (store) {
+  var _useConfigStore = useThemeUtils.useConfigStore(function (store) {
       return {
         themePropertiesSchema: store["themePropertiesSchema"]
       };
@@ -702,7 +602,7 @@ var ImageBlock = function ImageBlock(_ref) {
             return _context.abrupt("return");
           case 4:
             _context.next = 6;
-            return getDominantColorFromUrl(image.url);
+            return utils.getDominantColorFromUrl(image.url);
           case 6:
             dominantColor = _context.sent;
             setFieldValue(name, {
@@ -728,7 +628,7 @@ var ImageBlock = function ImageBlock(_ref) {
   }();
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "space-y-3 py-3 first:pt-0 last:pb-0",
-    "data-cy": "theme-style-".concat(utils.joinHyphenCase(label)),
+    "data-cy": "theme-style-".concat(utils$1.joinHyphenCase(label)),
     children: [label && /*#__PURE__*/jsxRuntime.jsx("div", {
       className: "flex items-center justify-between",
       children: /*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
@@ -737,7 +637,7 @@ var ImageBlock = function ImageBlock(_ref) {
         children: label
       })
     }), /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: "space-y-3 divide-y divide-gray-200",
+      className: "space-y-3",
       children: [/*#__PURE__*/react.createElement(neetoImageUploaderFrontend.ImageUploader, {
         uploadConfig: uploadConfig,
         className: "h-40 w-full",
@@ -768,13 +668,10 @@ var Images = function Images(_ref) {
   var imageData = values[key];
   return /*#__PURE__*/jsxRuntime.jsx(Card$2, {
     title: title,
-    children: /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: "divide-y divide-gray-200",
-      children: /*#__PURE__*/jsxRuntime.jsx(ImageBlock, {
-        attribute: attribute,
-        imageData: imageData,
-        name: key
-      })
+    children: /*#__PURE__*/jsxRuntime.jsx(ImageBlock, {
+      attribute: attribute,
+      imageData: imageData,
+      name: key
     })
   });
 };
@@ -784,7 +681,7 @@ var AlignmentBlock = function AlignmentBlock(_ref) {
     name = _ref.name;
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "flex items-center justify-between gap-2 py-3 first:pt-0 last:pb-0",
-    "data-cy": utils.joinHyphenCase(label),
+    "data-cy": utils$1.joinHyphenCase(label),
     children: [/*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
       "data-cy": "style-fields-labels",
       style: "body2",
@@ -834,8 +731,8 @@ var ColorBlock = function ColorBlock(_ref) {
     onChange = _ref.onChange,
     showTransparencyControl = _ref.showTransparencyControl;
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: "flex items-center justify-between py-3 first:pt-0 last:pb-0",
-    "data-cy": "theme-style-".concat(utils.joinHyphenCase(label)),
+    className: "flex items-center justify-between py-2 first:pt-0 last:pb-0",
+    "data-cy": "theme-style-".concat(utils$1.joinHyphenCase(label)),
     children: [/*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
       "data-cy": "style-fields-labels",
       style: "body2",
@@ -844,7 +741,8 @@ var ColorBlock = function ColorBlock(_ref) {
       color: color,
       onChange: onChange,
       showTransparencyControl: showTransparencyControl,
-      showEyeDropper: true
+      showEyeDropper: true,
+      size: "large"
     })]
   });
 };
@@ -859,8 +757,8 @@ var FontPickerBlock = function FontPickerBlock(_ref) {
     options = _ref.options,
     onChange = _ref.onChange;
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: "flex items-center justify-between py-3 first:pt-0 last:pb-0",
-    "data-cy": "theme-style-".concat(utils.joinHyphenCase(label)),
+    className: "flex items-center justify-between py-2 first:pt-0 last:pb-0",
+    "data-cy": "theme-style-".concat(utils$1.joinHyphenCase(label)),
     children: [/*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
       "data-cy": "style-fields-labels",
       style: "body2",
@@ -895,7 +793,7 @@ var SliderBlock = function SliderBlock(_ref) {
     marks = _ref.marks;
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
     className: "flex items-center justify-between gap-3 py-3 first:pt-0 last:pb-0",
-    "data-cy": "theme-style-".concat(utils.joinHyphenCase(label)),
+    "data-cy": "theme-style-".concat(utils$1.joinHyphenCase(label)),
     children: [/*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
       "data-cy": "style-fields-labels",
       style: "body2",
@@ -927,13 +825,13 @@ var SwitchBlock = function SwitchBlock(_ref) {
   var translationKey = "neetoThemes.properties.boolean.".concat(name, "HelpText");
   var doesHelpTextExist = i18n.exists(translationKey);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: "flex items-center justify-between py-3 first:pt-0 last:pb-0",
+    className: "flex items-center justify-between py-2 first:pt-0 last:pb-0",
     children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
       className: "inline-flex items-center gap-4",
       children: [/*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
         "data-cy": "style-fields-labels",
         style: "body2",
-        className: classnames__default["default"]({
+        className: classNames__default["default"]({
           "w-32": doesHelpTextExist,
           "w-auto": !doesHelpTextExist
         }),
@@ -954,13 +852,13 @@ var Properties = function Properties(_ref) {
   var onPropertiesChange = _ref.onPropertiesChange;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var _useConfigStore = useConfigStore(function (store) {
+  var _useConfigStore = useThemeUtils.useConfigStore(function (store) {
       return {
         themePropertiesSchema: store["themePropertiesSchema"]
       };
     }, shallow.shallow),
     themePropertiesSchema = _useConfigStore.themePropertiesSchema;
-  var _useThemeStore = useThemeStore(function (store) {
+  var _useThemeStore = useThemeUtils.useThemeStore(function (store) {
       return {
         setThemeState: store["setThemeState"]
       };
@@ -969,7 +867,7 @@ var Properties = function Properties(_ref) {
   var _useFormikContext = formik.useFormikContext(),
     setFieldValue = _useFormikContext.setFieldValue,
     values = _useFormikContext.values;
-  var _useThemeUtils = useThemeUtils(),
+  var _useThemeUtils = useThemeUtils.useThemeUtils(),
     setVariable = _useThemeUtils.setVariable,
     setTheme = _useThemeUtils.setTheme;
   var handleColorChange = function handleColorChange(name) {
@@ -1010,123 +908,105 @@ var Properties = function Properties(_ref) {
   }, [values]);
   return /*#__PURE__*/jsxRuntime.jsx(Card$2, {
     title: t("neetoThemes.common.style"),
-    children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: "divide-y divide-gray-200",
-      children: [neetoCist.filterBy({
-        kind: "font_family"
-      }, values.properties).map(function (_ref3) {
-        var key = _ref3.key,
-          value = _ref3.value,
-          kind = _ref3.kind;
-        return isPropertyVisible(key, values, themePropertiesSchema) && /*#__PURE__*/jsxRuntime.jsx(FontPickerBlock, {
-          label: buildLabel(key, kind),
-          options: FONT_OPTIONS,
-          value: neetoCist.findBy({
-            value: value || null
-          }, FONT_OPTIONS),
-          onChange: function onChange(_ref4) {
-            var value = _ref4.value;
-            handleChange(key, value);
-          }
-        }, key);
-      }), neetoCist.filterBy({
-        kind: "color"
-      }, values.properties).map(function (_ref5) {
-        var _findBy;
-        var key = _ref5.key,
-          value = _ref5.value,
-          kind = _ref5.kind;
-        return isPropertyVisible(key, values, themePropertiesSchema) && /*#__PURE__*/jsxRuntime.jsx(ColorBlock, {
-          color: value,
-          label: buildLabel(key, kind),
-          showTransparencyControl: ((_findBy = neetoCist.findBy({
-            key: key
-          }, themePropertiesSchema)) === null || _findBy === void 0 ? void 0 : _findBy.showTransparencyControl) || false,
-          onChange: handleColorChange(key)
-        }, key);
-      }), neetoCist.filterBy({
-        kind: "radius"
-      }, values.properties).map(function (_ref6) {
-        var key = _ref6.key,
-          value = _ref6.value,
-          kind = _ref6.kind;
-        return isPropertyVisible(key, values, themePropertiesSchema) && /*#__PURE__*/jsxRuntime.jsx(SliderBlock, {
-          label: buildLabel(key, kind),
-          max: 50,
-          min: 0,
-          value: Number(value) || 0,
-          onChange: function onChange(radius) {
-            return handleChange(key, radius, "".concat(radius, "px"));
-          }
-        }, key);
-      }), neetoCist.filterBy({
-        kind: "overlay_opacity"
-      }, values.properties).map(function (_ref7) {
-        var key = _ref7.key,
-          value = _ref7.value,
-          kind = _ref7.kind;
-        return isPropertyVisible(key, values, themePropertiesSchema) && /*#__PURE__*/jsxRuntime.jsx(SliderBlock, {
-          label: buildLabel(key, kind),
-          marks: OVERLAY_OPACITY_SLIDER_MARKS,
-          max: HUNDRED,
-          min: ramda.negate(HUNDRED),
-          value: Number(value) || 0,
-          onChange: function onChange(opacity) {
-            return handleOverlayChange(key, opacity);
+    children: values.properties.sort(function (a, b) {
+      var _a$order, _b$order;
+      return ((_a$order = a.order) !== null && _a$order !== void 0 ? _a$order : Infinity) - ((_b$order = b.order) !== null && _b$order !== void 0 ? _b$order : Infinity);
+    }).map(function (_ref3) {
+      var _findBy;
+      var key = _ref3.key,
+        value = _ref3.value,
+        kind = _ref3.kind;
+      var isCurrentPropertyVisible = isPropertyVisible(key, values, themePropertiesSchema);
+      if (!isCurrentPropertyVisible) return null;
+      switch (kind) {
+        case "font_family":
+          return /*#__PURE__*/jsxRuntime.jsx(FontPickerBlock, {
+            label: buildLabel(key, kind),
+            options: FONT_OPTIONS,
+            value: neetoCist.findBy({
+              value: value || null
+            }, FONT_OPTIONS),
+            onChange: function onChange(_ref4) {
+              var value = _ref4.value;
+              return handleChange(key, value);
+            }
+          }, key);
+        case "color":
+          return /*#__PURE__*/jsxRuntime.jsx(ColorBlock, {
+            color: value,
+            label: buildLabel(key, kind),
+            showTransparencyControl: ((_findBy = neetoCist.findBy({
+              key: key
+            }, themePropertiesSchema)) === null || _findBy === void 0 ? void 0 : _findBy.showTransparencyControl) || false,
+            onChange: handleColorChange(key)
+          }, key);
+        case "radius":
+          return /*#__PURE__*/jsxRuntime.jsx(SliderBlock, {
+            label: buildLabel(key, kind),
+            max: 50,
+            min: 0,
+            value: Number(value) || 0,
+            onChange: function onChange(radius) {
+              return handleChange(key, radius, "".concat(radius, "px"));
+            }
+          }, key);
+        case "overlay_opacity":
+          return /*#__PURE__*/jsxRuntime.jsx(SliderBlock, {
+            label: buildLabel(key, kind),
+            marks: OVERLAY_OPACITY_SLIDER_MARKS,
+            max: HUNDRED,
+            min: ramda.negate(HUNDRED),
+            value: Number(value) || 0,
+            onChange: function onChange(opacity) {
+              return handleOverlayChange(key, opacity);
+            }
+          }, key);
+        case "position_selector":
+          {
+            var _findBy2;
+            var index = neetoCist.findIndexBy({
+              key: key
+            }, values.properties);
+            var options = (_findBy2 = neetoCist.findBy({
+              key: key
+            }, themePropertiesSchema)) === null || _findBy2 === void 0 || (_findBy2 = _findBy2.options) === null || _findBy2 === void 0 ? void 0 : _findBy2.map(neetoCist.toLabelAndValue);
+            return /*#__PURE__*/jsxRuntime.jsx(SelectBlock, {
+              label: buildLabel(key, kind),
+              options: options || POSITION_OPTIONS,
+              placeholder: "left",
+              value: neetoCist.toLabelAndValue(value),
+              onChange: function onChange(option) {
+                return setFieldValue("properties[".concat(index, "].value"), option.value);
+              }
+            }, key);
           }
-        }, key);
-      }), neetoCist.filterBy({
-        kind: "position_selector"
-      }, values.properties).map(function (_ref8) {
-        var _findBy2;
-        var key = _ref8.key,
-          kind = _ref8.kind,
-          value = _ref8.value;
-        var index = neetoCist.findIndexBy({
-          key: key
-        }, values.properties);
-        var options = (_findBy2 = neetoCist.findBy({
-          key: key
-        }, themePropertiesSchema)) === null || _findBy2 === void 0 || (_findBy2 = _findBy2.options) === null || _findBy2 === void 0 ? void 0 : _findBy2.map(neetoCist.toLabelAndValue);
-        return isPropertyVisible(key, values, themePropertiesSchema) && /*#__PURE__*/jsxRuntime.jsx(SelectBlock, {
-          label: buildLabel(key, kind),
-          options: options || POSITION_OPTIONS,
-          placeholder: "left",
-          value: neetoCist.toLabelAndValue(value),
-          onChange: function onChange(option) {
-            return setFieldValue("properties[".concat(index, "].value"), option.value);
+        case "boolean":
+          {
+            var _index = neetoCist.findIndexBy({
+              key: key
+            }, values.properties);
+            return /*#__PURE__*/jsxRuntime.jsx(SwitchBlock, {
+              checked: value !== "false",
+              label: buildLabel(key, kind),
+              name: neetoCist.snakeToCamelCase(key),
+              onChange: function onChange(e) {
+                return setFieldValue("properties[".concat(_index, "].value"), String(e.target.checked));
+              }
+            }, key);
           }
-        }, key);
-      }), neetoCist.filterBy({
-        kind: "boolean"
-      }, values.properties).map(function (_ref9) {
-        var key = _ref9.key,
-          kind = _ref9.kind,
-          value = _ref9.value;
-        var index = neetoCist.findIndexBy({
-          key: key
-        }, values.properties);
-        return isPropertyVisible(key, values, themePropertiesSchema) && /*#__PURE__*/jsxRuntime.jsx(SwitchBlock, {
-          checked: value !== "false",
-          label: buildLabel(key, kind),
-          name: neetoCist.snakeToCamelCase(key),
-          onChange: function onChange(e) {
-            return setFieldValue("properties[".concat(index, "].value"), String(e.target.checked));
+        case "alignment_block":
+          {
+            var _index2 = neetoCist.findIndexBy({
+              key: key
+            }, values.properties);
+            return /*#__PURE__*/jsxRuntime.jsx(AlignmentBlock, {
+              label: buildLabel(key, kind),
+              name: "properties[".concat(_index2, "].value")
+            });
           }
-        }, key);
-      }), neetoCist.filterBy({
-        kind: "alignment_block"
-      }, values.properties).map(function (_ref10) {
-        var key = _ref10.key,
-          kind = _ref10.kind;
-        var index = neetoCist.findIndexBy({
-          key: key
-        }, values.properties);
-        return isPropertyVisible(key, values, themePropertiesSchema) && /*#__PURE__*/jsxRuntime.jsx(AlignmentBlock, {
-          label: buildLabel(key, kind),
-          name: "properties[".concat(index, "].value")
-        });
-      })]
+        default:
+          return null;
+      }
     })
   });
 };
@@ -1152,14 +1032,16 @@ var Customize = function Customize(_ref) {
     onApplyTheme = _ref.onApplyTheme,
     isApplyingTheme = _ref.isApplyingTheme,
     onPropertiesChange = _ref.onPropertiesChange,
-    onUpdateThemeSuccess = _ref.onUpdateThemeSuccess;
+    onUpdateThemeSuccess = _ref.onUpdateThemeSuccess,
+    onEditCSSClick = _ref.onEditCSSClick,
+    currentScreen = _ref.currentScreen;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
   var _useState = react.useState({}),
     _useState2 = _slicedToArray__default["default"](_useState, 2),
     popoverInstance = _useState2[0],
     setPopoverInstance = _useState2[1];
-  var _useConfigStore = useConfigStore(function (store) {
+  var _useConfigStore = useThemeUtils.useConfigStore(function (store) {
       return {
         themePropertiesSchema: store["themePropertiesSchema"],
         entityType: store["entityType"]
@@ -1167,7 +1049,7 @@ var Customize = function Customize(_ref) {
     }, shallow.shallow),
     themePropertiesSchema = _useConfigStore.themePropertiesSchema,
     entityType = _useConfigStore.entityType;
-  var _useThemeUtils = useThemeUtils(),
+  var _useThemeUtils = useThemeUtils.useThemeUtils(),
     currentTheme = _useThemeUtils.currentTheme;
   var isEditingCurrentlyAppliedTheme = themeId === (currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.id);
   var submitBtnRef = react.useRef(null);
@@ -1178,6 +1060,7 @@ var Customize = function Customize(_ref) {
     updateTheme = _useUpdateTheme.mutate,
     isUpdating = _useUpdateTheme.isPending;
   var isSubmitting = isCreating || isUpdating;
+  var isCustomCssScreen = isScreenCustomCSS(currentScreen);
   var onSubmit = function onSubmit(values, _ref2) {
     var resetForm = _ref2.resetForm;
     var imageData = buildImageData(values, themePropertiesSchema);
@@ -1216,16 +1099,34 @@ var Customize = function Customize(_ref) {
       return /*#__PURE__*/jsxRuntime.jsxs("div", {
         className: "neeto-themes-sidebar__scroll",
         children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
-          className: "flex flex-col gap-6 p-4",
-          children: [/*#__PURE__*/jsxRuntime.jsx(ThemeMeta, {}), /*#__PURE__*/jsxRuntime.jsx(Properties, {
-            onPropertiesChange: onPropertiesChange
-          }), neetoCist.filterBy({
-            kind: "image"
-          }, themePropertiesSchema).map(function (_ref5) {
-            var key = _ref5.key;
-            return /*#__PURE__*/jsxRuntime.jsx(Images, {
-              attribute: key
-            }, key);
+          className: "neeto-themes-sidebar__scroll-content flex flex-grow flex-col px-4 py-2 lg:px-5 xl:px-6",
+          children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+            className: classNames__default["default"]({
+              hidden: isCustomCssScreen
+            }),
+            children: /*#__PURE__*/jsxRuntime.jsx(ThemeMeta, {})
+          }), /*#__PURE__*/jsxRuntime.jsx("div", {
+            className: classNames__default["default"]({
+              hidden: isCustomCssScreen
+            }),
+            children: /*#__PURE__*/jsxRuntime.jsx(Properties, {
+              onPropertiesChange: onPropertiesChange
+            })
+          }), /*#__PURE__*/jsxRuntime.jsx("div", {
+            className: classNames__default["default"]("flex flex-col gap-6", {
+              hidden: isCustomCssScreen
+            }),
+            children: neetoCist.filterBy({
+              kind: "image"
+            }, themePropertiesSchema).map(function (_ref5) {
+              var key = _ref5.key;
+              return /*#__PURE__*/jsxRuntime.jsx(Images, {
+                attribute: key
+              }, key);
+            })
+          }), /*#__PURE__*/jsxRuntime.jsx(CustomCSS, {
+            currentScreen: currentScreen,
+            onEditCSSClick: onEditCSSClick
           })]
         }), /*#__PURE__*/jsxRuntime.jsxs("div", {
           className: "neeto-ui-bg-white neeto-ui-shadow-s sticky bottom-0 left-0 right-0 flex justify-end gap-x-2 px-4 py-6",
@@ -1367,7 +1268,7 @@ var Thumbnail = function Thumbnail(_ref) {
     isPreviewing = _ref.isPreviewing,
     isHighLightedTheme = _ref.isHighLightedTheme,
     theme = _ref.theme;
-  var _useConfigStore = useConfigStore(function (store) {
+  var _useConfigStore = useThemeUtils.useConfigStore(function (store) {
       return {
         themePropertiesSchema: store["themePropertiesSchema"]
       };
@@ -1394,7 +1295,7 @@ var Thumbnail = function Thumbnail(_ref) {
     }, themePropertiesSchema)) === null || _findBy2 === void 0 ? void 0 : _findBy2.key
   }, theme.properties)) === null || _findBy === void 0 ? void 0 : _findBy.value;
   return /*#__PURE__*/jsxRuntime.jsx("div", {
-    className: classnames__default["default"]("neeto-themes-theme-thumbnail neeto-ui-rounded-lg border transition-all duration-300 ease-in-out", {
+    className: classNames__default["default"]("neeto-themes-theme-thumbnail neeto-ui-rounded-lg border transition-all duration-300 ease-in-out", {
       "neeto-ui-border-gray-400": !active,
       "neeto-ui-border-gray-800 neeto-themes-theme-thumbnail--active": active,
       "neeto-themes-theme-thumbnail--preview-active": isPreviewing,
@@ -1472,7 +1373,7 @@ var Card = function Card(_ref) {
     "data-cy": active ? "active-theme-card" : "theme-card",
     id: theme.id,
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: classnames__default["default"]("neeto-themes-theme-thumbnail neeto-ui-rounded-lg cursor-pointer border transition-all duration-300 ease-in-out", {
+      className: classNames__default["default"]("neeto-themes-theme-thumbnail neeto-ui-rounded-lg cursor-pointer border transition-all duration-300 ease-in-out", {
         "neeto-ui-border-gray-200": !active,
         "neeto-themes-theme-thumbnail--active": active,
         "neeto-themes-theme-thumbnail--preview-active": isPreviewing,
@@ -1489,7 +1390,7 @@ var Card = function Card(_ref) {
             className: "flex-shrink-0",
             "data-cy": "active-theme-label"
           }) : /*#__PURE__*/jsxRuntime.jsx("div", {
-            className: classnames__default["default"]({
+            className: classNames__default["default"]({
               hidden: !isPreviewing,
               "group-hover:block": true
             }),
@@ -1518,7 +1419,7 @@ var Card = function Card(_ref) {
           theme: theme
         })]
       }), /*#__PURE__*/jsxRuntime.jsxs("div", {
-        className: "flex items-start justify-between gap-1 p-3",
+        className: "neeto-ui-border-gray-100 flex items-start justify-between gap-1 border-t p-2",
         children: [/*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
           className: "line-clamp-2 min-w-0 flex-grow break-words pt-1",
           "data-cy": "theme-name",
@@ -1549,12 +1450,12 @@ var Card = function Card(_ref) {
           }, {
             key: "divider",
             type: "divider",
-            isVisible: isFunction(onDeleteTheme)
+            isVisible: utils.isFunction(onDeleteTheme)
           }, {
             key: "delete",
             "data-cy": "delete-theme-menu-item",
             label: t("neetoThemes.build.leftSideBar.themes.themeOptions.delete"),
-            isVisible: isFunction(onDeleteTheme),
+            isVisible: utils.isFunction(onDeleteTheme),
             onClick: function onClick(e) {
               e.stopPropagation();
               handleDeleteTheme();
@@ -1585,9 +1486,9 @@ var Themes = function Themes(_ref) {
     isApplyingTheme = _ref.isApplyingTheme;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var _useThemeUtils = useThemeUtils(),
+  var _useThemeUtils = useThemeUtils.useThemeUtils(),
     setTheme = _useThemeUtils.setTheme;
-  var _useThemeStore = useThemeStore(function (store) {
+  var _useThemeStore = useThemeUtils.useThemeStore(function (store) {
       return {
         setThemeState: store["setThemeState"],
         previewingTheme: store["previewingTheme"]
@@ -1605,7 +1506,7 @@ var Themes = function Themes(_ref) {
     if (didScrollActiveThemeIntoView.current || !(currentTheme !== null && currentTheme !== void 0 && currentTheme.id)) return;
     didScrollActiveThemeIntoView.current = true;
     setTimeout(function () {
-      scrollElementIntoView(currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.id);
+      utils.scrollElementIntoView(currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.id);
     }, 100);
   }, [didScrollActiveThemeIntoView, currentTheme === null || currentTheme === void 0 ? void 0 : currentTheme.id]);
   var setPreviewTheme = function setPreviewTheme(theme) {
@@ -1716,56 +1617,57 @@ var TitleBar = function TitleBar(_ref) {
     themeToEdit = _ref.themeToEdit;
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  if (currentScreen === DESIGN_SCREENS.Customize) {
+  var isCustomCssScreen = isScreenCustomCSS(currentScreen);
+  if (currentScreen === DESIGN_SCREENS.THEMES) {
     return /*#__PURE__*/jsxRuntime.jsx("div", {
-      className: "neeto-themes-sidebar__header px-4",
+      className: "neeto-themes-sidebar__header px-4 lg:px-5 xl:px-6",
       children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-        className: "flex items-center justify-start space-x-2",
-        children: [/*#__PURE__*/jsxRuntime.jsx(Button__default["default"], {
-          "data-cy": "customize-themes-back-button",
-          icon: LeftArrow__default["default"],
-          iconPosition: "left",
-          style: "text",
-          tooltipProps: {
-            content: t("neetoThemes.buttons.backToThemes"),
-            position: "top"
-          },
-          onClick: function onClick() {
-            return handleBackPress(themeToEdit);
-          }
-        }), /*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
+        className: "flex items-center justify-between space-x-2",
+        children: [/*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
           "data-cy": "themes-header",
           lineHeight: "normal",
           style: "h3",
           weight: "semibold",
-          children: isNewTheme ? t("neetoThemes.build.leftSideBar.themes.createTheme.title") : t("neetoThemes.build.leftSideBar.themes.editTheme.title")
+          children: t("neetoThemes.build.leftSideBar.headerTabs.themes")
+        }), /*#__PURE__*/jsxRuntime.jsx("div", {
+          className: "self-end",
+          children: /*#__PURE__*/jsxRuntime.jsx(Button__default["default"], {
+            "data-cy": "customize-themes-add-theme-button",
+            icon: Plus__default["default"],
+            iconPosition: "left",
+            style: "text",
+            tooltipProps: {
+              content: t("neetoThemes.buttons.addNewTheme"),
+              position: "top"
+            },
+            onClick: handleCreateNewTheme
+          })
         })]
       })
     });
   }
   return /*#__PURE__*/jsxRuntime.jsx("div", {
-    className: "neeto-themes-sidebar__header px-4 lg:px-5 xl:px-6",
+    className: "neeto-themes-sidebar__header px-4",
     children: /*#__PURE__*/jsxRuntime.jsxs("div", {
-      className: "flex items-center justify-between space-x-2",
-      children: [/*#__PURE__*/jsxRuntime.jsx(Typography__default["default"], {
+      className: "flex items-center justify-start space-x-2",
+      children: [/*#__PURE__*/jsxRuntime.jsx(Button__default["default"], {
+        "data-cy": "customize-themes-back-button",
+        icon: LeftArrow__default["default"],
+        iconPosition: "left",
+        style: "text",
+        tooltipProps: {
+          content: isCustomCssScreen ? t("neetoThemes.buttons.backToEdit") : t("neetoThemes.buttons.backToThemes"),
+          position: "top"
+        },
+        onClick: function onClick() {
+          return handleBackPress(themeToEdit);
+        }
+      }), /*#__PURE__*/jsxRuntime.jsxs(Typography__default["default"], {
         "data-cy": "themes-header",
         lineHeight: "normal",
         style: "h3",
         weight: "semibold",
-        children: t("neetoThemes.build.leftSideBar.headerTabs.themes")
-      }), /*#__PURE__*/jsxRuntime.jsx("div", {
-        className: "self-end",
-        children: /*#__PURE__*/jsxRuntime.jsx(Button__default["default"], {
-          "data-cy": "customize-themes-add-theme-button",
-          icon: Plus__default["default"],
-          iconPosition: "left",
-          style: "text",
-          tooltipProps: {
-            content: t("neetoThemes.buttons.addNewTheme"),
-            position: "top"
-          },
-          onClick: handleCreateNewTheme
-        })
+        children: [currentScreen === DESIGN_SCREENS.Customize && (isNewTheme ? t("neetoThemes.build.leftSideBar.themes.createTheme.title") : t("neetoThemes.build.leftSideBar.themes.editTheme.title")), isCustomCssScreen && t("neetoThemes.build.leftSideBar.themes.customCSS")]
       })]
     })
   });
@@ -1794,7 +1696,7 @@ var Sidebar = function Sidebar(_ref) {
     _useState8 = _slicedToArray__default["default"](_useState7, 2),
     themeBeingApplied = _useState8[0],
     setThemeBeingApplied = _useState8[1];
-  var _useConfigStore = useConfigStore(function (store) {
+  var _useConfigStore = useThemeUtils.useConfigStore(function (store) {
       return {
         entityType: store["entityType"],
         entityId: store["entityId"],
@@ -1806,7 +1708,7 @@ var Sidebar = function Sidebar(_ref) {
     entityId = _useConfigStore.entityId,
     isFetchingSchema = _useConfigStore.isFetchingSchema,
     defaultThemeName = _useConfigStore.defaultThemeName;
-  var _useThemeStore = useThemeStore(function (store) {
+  var _useThemeStore = useThemeUtils.useThemeStore(function (store) {
       return {
         setThemeState: store["setThemeState"]
       };
@@ -1815,7 +1717,7 @@ var Sidebar = function Sidebar(_ref) {
   var didScrollActiveThemeIntoView = react.useRef(null);
   var _useTranslation = reactI18next.useTranslation(),
     t = _useTranslation.t;
-  var _useThemeUtils = useThemeUtils(),
+  var _useThemeUtils = useThemeUtils.useThemeUtils(),
     setTheme = _useThemeUtils.setTheme;
   var _useListThemes = useListThemes(entityId),
     _useListThemes$data = _useListThemes.data,
@@ -1851,6 +1753,7 @@ var Sidebar = function Sidebar(_ref) {
     isApplyingTheme = _useApplyTheme.isPending;
   var themeToDelete = react.useRef(null);
   var themeToEdit = react.useRef(null);
+  var isCustomCssScreen = isScreenCustomCSS(currentScreen);
   var handleEditTheme = function handleEditTheme(theme) {
     themeToEdit.current = theme;
     setCurrentScreen(DESIGN_SCREENS.Customize);
@@ -1870,12 +1773,12 @@ var Sidebar = function Sidebar(_ref) {
     setThemeState({
       previewingTheme: currentTheme
     });
-    setCurrentScreen(DESIGN_SCREENS.THEMES);
+    setCurrentScreen(isCustomCssScreen ? DESIGN_SCREENS.Customize : DESIGN_SCREENS.THEMES);
     themeToEdit.current = null;
   };
   var highlightTheme = function highlightTheme(themeToHighlight) {
     setTimeout(function () {
-      scrollElementIntoView(themeToHighlight.id);
+      utils.scrollElementIntoView(themeToHighlight.id);
     }, 1500);
     setTimeout(function () {
       setThemeToHighlight(null);
@@ -1911,7 +1814,9 @@ var Sidebar = function Sidebar(_ref) {
     });
   }, [deleteTheme, themeToDelete]);
   return /*#__PURE__*/jsxRuntime.jsxs("div", {
-    className: "neeto-themes-sidebar neeto-ui-border-gray-200 flex-shrink-0 border-r",
+    className: classNames__default["default"]("neeto-themes-sidebar neeto-ui-border-gray-200 flex-shrink-0 border-r transition-all duration-300", {
+      "neeto-themes-sidebar--expanded": isCustomCssScreen
+    }),
     children: [/*#__PURE__*/jsxRuntime.jsx(TitleBar, {
       currentScreen: currentScreen,
       handleBackPress: handleBackPress,
@@ -1936,13 +1841,15 @@ var Sidebar = function Sidebar(_ref) {
       onDeleteTheme: handleDelete,
       onEditTheme: handleEditTheme
     }) : /*#__PURE__*/jsxRuntime.jsx(Customize, {
+      currentScreen: currentScreen,
       isApplyingTheme: isApplyingTheme,
       onApplyTheme: onApplyTheme,
       onCreateTheme: onCreateTheme,
       onPropertiesChange: onPropertiesChange,
       onUpdateThemeSuccess: onUpdateThemeSuccess,
       theme: themeToEdit.current,
-      themeId: (_themeToEdit$current2 = themeToEdit.current) === null || _themeToEdit$current2 === void 0 ? void 0 : _themeToEdit$current2.id
+      themeId: (_themeToEdit$current2 = themeToEdit.current) === null || _themeToEdit$current2 === void 0 ? void 0 : _themeToEdit$current2.id,
+      onEditCSSClick: setCurrentScreen
     }), /*#__PURE__*/jsxRuntime.jsx(MemoizedAlert, {
       isOpen: isDeleteAlertOpen,
       isSubmitting: isDeleting,
@@ -1973,15 +1880,15 @@ var NeetoThemesBuilder = function NeetoThemesBuilder(_ref) {
     onApplyThemeSuccess = _ref$onApplyThemeSucc === void 0 ? neetoCist.noop : _ref$onApplyThemeSucc,
     _ref$onUpdateThemeSuc = _ref.onUpdateThemeSuccess,
     onUpdateThemeSuccess = _ref$onUpdateThemeSuc === void 0 ? neetoCist.noop : _ref$onUpdateThemeSuc;
-  var _useThemeStore = useThemeStore(function (store) {
+  var _useThemeStore = useThemeUtils.useThemeStore(function (store) {
       return {
         setThemeState: store["setThemeState"]
       };
     }, shallow.shallow),
     setThemeState = _useThemeStore.setThemeState;
-  var _useThemeUtils = useThemeUtils(),
+  var _useThemeUtils = useThemeUtils.useThemeUtils(),
     setTheme = _useThemeUtils.setTheme;
-  var _useConfigStore = useConfigStore(function (store) {
+  var _useConfigStore = useThemeUtils.useConfigStore(function (store) {
       return {
         setConfigState: store["setConfigState"]
       };
@@ -2034,12 +1941,5 @@ var NeetoThemesBuilder = function NeetoThemesBuilder(_ref) {
 };
 var index = reactUtils.withTitle(NeetoThemesBuilder, i18next.t("neetoThemes.common.design"));
 
-var e=[],t=[];function n(n,r){if(n&&"undefined"!=typeof document){var a,s=!0===r.prepend?"prepend":"append",d=!0===r.singleTag,i="string"==typeof r.container?document.querySelector(r.container):document.getElementsByTagName("head")[0];if(d){var u=e.indexOf(i);-1===u&&(u=e.push(i)-1,t[u]={}),a=t[u]&&t[u][s]?t[u][s]:t[u][s]=c();}else a=c();65279===n.charCodeAt(0)&&(n=n.substring(1)),a.styleSheet?a.styleSheet.cssText+=n:a.appendChild(document.createTextNode(n));}function c(){var e=document.createElement("style");if(e.setAttribute("type","text/css"),r.attributes)for(var t=Object.keys(r.attributes),n=0;n<t.length;n++)e.setAttribute(t[n],r.attributes[t[n]]);var a="prepend"===s?"afterbegin":"beforeend";return i.insertAdjacentElement(a,e),e}}
-
-var css = ".neeto-themes__wrapper{display:flex;width:100%}.neeto-themes__wrapper .neeto-themes-sidebar{background-color:rgb(var(--neeto-ui-white));height:calc(100vh - 64px);width:240px}@media (min-width:1024px){.neeto-themes__wrapper .neeto-themes-sidebar{width:280px}}@media (min-width:1280px){.neeto-themes__wrapper .neeto-themes-sidebar{width:320px}}.neeto-themes__wrapper .neeto-themes-sidebar .neeto-themes-sidebar__header{padding-bottom:8px;padding-top:16px}.neeto-themes__wrapper .neeto-themes-sidebar .neeto-themes-sidebar__scroll{height:calc(100vh - 120px);overflow-y:auto}.neeto-themes__wrapper .neeto-themes-sidebar .neeto-themes-sidebar__scroll .neeto-ui-colorpicker__target .neeto-ui-colorpicker-target__code{display:none}.neeto-themes__wrapper .neeto-themes-preview__wrapper{flex-grow:1;height:calc(100vh - 64px);position:relative}.neeto-themes-theme-thumbnail--preview-active{border-color:rgb(var(--neeto-ui-gray-600))!important;outline:1px solid rgb(var(--neeto-ui-gray-600))!important}.neeto-themes-theme-thumbnail--active{border-color:rgb(var(--neeto-ui-primary-500))!important;outline:2px solid rgb(var(--neeto-ui-primary-500))!important}.neeto-themes-theme-thumbnail--highlight-active{border-color:rgb(var(--neeto-ui-gray-400))!important;outline:2px solid rgb(var(--neeto-ui-gray-400))!important}.neeto-themes-theme-thumbnail__apply-btn{--neeto-ui-btn-padding-x:12px;--neeto-ui-btn-border-radius:100px}.neeto-themes-theme-thumbnail__apply-btn:disabled,.neeto-themes-theme-thumbnail__apply-btn[disabled]{opacity:1!important}\n/*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImFwcC9qYXZhc2NyaXB0L3N0eWxlc2hlZXRzL2NvbXBvbmVudHMvX3RoZW1lcy5zY3NzIiwiYXBwL2phdmFzY3JpcHQvc3R5bGVzaGVldHMvYXBwbGljYXRpb24uc2NzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSx1QkFFRSxZQUFBLENBREEsVUNFRixDRENFLDZDQUdFLDJDQUFBLENBREEseUJBQUEsQ0FEQSxXQ0dKLENEQ0ksMEJBTEYsNkNBTUksV0NFSixDQUNGLENEREksMEJBUkYsNkNBU0ksV0NJSixDQUNGLENERkksMkVBRUUsa0JBQUEsQ0FEQSxnQkNLTixDRERJLDJFQUNFLDBCQUFBLENBQ0EsZUNHTixDREFRLDRJQUNFLFlDRVYsQ0RJRSxzREFHRSxXQUFBLENBREEseUJBQUEsQ0FEQSxpQkNBSixDRE1BLDhDQUNFLG9EQUFBLENBQ0EseURDSEYsQ0RNQSxzQ0FDRSx1REFBQSxDQUNBLDREQ0hGLENETUEsZ0RBQ0Usb0RBQUEsQ0FDQSx5RENIRixDRE1BLHlDQUNFLDZCQUFBLENBQ0Esa0NDSEYsQ0RJRSxxR0FFRSxtQkNISiIsInNvdXJjZXNDb250ZW50IjpbIi5uZWV0by10aGVtZXNfX3dyYXBwZXIge1xuICB3aWR0aDogMTAwJTtcbiAgZGlzcGxheTogZmxleDtcblxuICAubmVldG8tdGhlbWVzLXNpZGViYXIge1xuICAgIHdpZHRoOiAkdGhlbWVzLXNpZGViYXItd2lkdGgtc207XG4gICAgaGVpZ2h0OiBjYWxjKDEwMHZoIC0gI3skYnVpbGRlci1oZWFkZXItaGVpZ2h0fSk7XG4gICAgYmFja2dyb3VuZC1jb2xvcjogcmdiKHZhcigtLW5lZXRvLXVpLXdoaXRlKSk7XG5cbiAgICBAc2NyZWVuIGxnIHtcbiAgICAgIHdpZHRoOiAkdGhlbWVzLXNpZGViYXItd2lkdGgtbGc7XG4gICAgfVxuICAgIEBzY3JlZW4geGwge1xuICAgICAgd2lkdGg6ICR0aGVtZXMtc2lkZWJhci13aWR0aC14bDtcbiAgICB9XG5cbiAgICAubmVldG8tdGhlbWVzLXNpZGViYXJfX2hlYWRlciB7XG4gICAgICBwYWRkaW5nLXRvcDogMTZweDtcbiAgICAgIHBhZGRpbmctYm90dG9tOiA4cHg7XG4gICAgfVxuXG4gICAgLm5lZXRvLXRoZW1lcy1zaWRlYmFyX19zY3JvbGwge1xuICAgICAgaGVpZ2h0OiBjYWxjKDEwMHZoIC0gMTIwcHgpO1xuICAgICAgb3ZlcmZsb3cteTogYXV0bztcblxuICAgICAgLm5lZXRvLXVpLWNvbG9ycGlja2VyX190YXJnZXQge1xuICAgICAgICAubmVldG8tdWktY29sb3JwaWNrZXItdGFyZ2V0X19jb2RlIHtcbiAgICAgICAgICBkaXNwbGF5OiBub25lO1xuICAgICAgICB9XG4gICAgICB9XG4gICAgfVxuICB9XG5cbiAgLm5lZXRvLXRoZW1lcy1wcmV2aWV3X193cmFwcGVyIHtcbiAgICBwb3NpdGlvbjogcmVsYXRpdmU7XG4gICAgaGVpZ2h0OiBjYWxjKDEwMHZoIC0gI3skYnVpbGRlci1oZWFkZXItaGVpZ2h0fSk7XG4gICAgZmxleC1ncm93OiAxO1xuICB9XG59XG5cbi5uZWV0by10aGVtZXMtdGhlbWUtdGh1bWJuYWlsLS1wcmV2aWV3LWFjdGl2ZSB7XG4gIGJvcmRlci1jb2xvcjogcmdiKHZhcigtLW5lZXRvLXVpLWdyYXktNjAwKSkgIWltcG9ydGFudDtcbiAgb3V0bGluZTogMXB4IHNvbGlkIHJnYih2YXIoLS1uZWV0by11aS1ncmF5LTYwMCkpICFpbXBvcnRhbnQ7XG59XG5cbi5uZWV0by10aGVtZXMtdGhlbWUtdGh1bWJuYWlsLS1hY3RpdmUge1xuICBib3JkZXItY29sb3I6IHJnYih2YXIoLS1uZWV0by11aS1wcmltYXJ5LTUwMCkpICFpbXBvcnRhbnQ7XG4gIG91dGxpbmU6IDJweCBzb2xpZCByZ2IodmFyKC0tbmVldG8tdWktcHJpbWFyeS01MDApKSAhaW1wb3J0YW50O1xufVxuXG4ubmVldG8tdGhlbWVzLXRoZW1lLXRodW1ibmFpbC0taGlnaGxpZ2h0LWFjdGl2ZSB7XG4gIGJvcmRlci1jb2xvcjogcmdiKHZhcigtLW5lZXRvLXVpLWdyYXktNDAwKSkgIWltcG9ydGFudDtcbiAgb3V0bGluZTogMnB4IHNvbGlkIHJnYih2YXIoLS1uZWV0by11aS1ncmF5LTQwMCkpICFpbXBvcnRhbnQ7XG59XG5cbi5uZWV0by10aGVtZXMtdGhlbWUtdGh1bWJuYWlsX19hcHBseS1idG4ge1xuICAtLW5lZXRvLXVpLWJ0bi1wYWRkaW5nLXg6IDEycHg7XG4gIC0tbmVldG8tdWktYnRuLWJvcmRlci1yYWRpdXM6IDEwMHB4O1xuICAmOmRpc2FibGVkLFxuICAmW2Rpc2FibGVkXSB7XG4gICAgb3BhY2l0eTogMSAhaW1wb3J0YW50O1xuICB9XG59XG4iLCIubmVldG8tdGhlbWVzX193cmFwcGVyIHtcbiAgd2lkdGg6IDEwMCU7XG4gIGRpc3BsYXk6IGZsZXg7XG59XG4ubmVldG8tdGhlbWVzX193cmFwcGVyIC5uZWV0by10aGVtZXMtc2lkZWJhciB7XG4gIHdpZHRoOiAyNDBweDtcbiAgaGVpZ2h0OiBjYWxjKDEwMHZoIC0gNjRweCk7XG4gIGJhY2tncm91bmQtY29sb3I6IHJnYih2YXIoLS1uZWV0by11aS13aGl0ZSkpO1xufVxuQHNjcmVlbiBsZyB7XG4gIC5uZWV0by10aGVtZXNfX3dyYXBwZXIgLm5lZXRvLXRoZW1lcy1zaWRlYmFyIHtcbiAgICB3aWR0aDogMjgwcHg7XG4gIH1cbn1cbkBzY3JlZW4geGwge1xuICAubmVldG8tdGhlbWVzX193cmFwcGVyIC5uZWV0by10aGVtZXMtc2lkZWJhciB7XG4gICAgd2lkdGg6IDMyMHB4O1xuICB9XG59XG4ubmVldG8tdGhlbWVzX193cmFwcGVyIC5uZWV0by10aGVtZXMtc2lkZWJhciAubmVldG8tdGhlbWVzLXNpZGViYXJfX2hlYWRlciB7XG4gIHBhZGRpbmctdG9wOiAxNnB4O1xuICBwYWRkaW5nLWJvdHRvbTogOHB4O1xufVxuLm5lZXRvLXRoZW1lc19fd3JhcHBlciAubmVldG8tdGhlbWVzLXNpZGViYXIgLm5lZXRvLXRoZW1lcy1zaWRlYmFyX19zY3JvbGwge1xuICBoZWlnaHQ6IGNhbGMoMTAwdmggLSAxMjBweCk7XG4gIG92ZXJmbG93LXk6IGF1dG87XG59XG4ubmVldG8tdGhlbWVzX193cmFwcGVyIC5uZWV0by10aGVtZXMtc2lkZWJhciAubmVldG8tdGhlbWVzLXNpZGViYXJfX3Njcm9sbCAubmVldG8tdWktY29sb3JwaWNrZXJfX3RhcmdldCAubmVldG8tdWktY29sb3JwaWNrZXItdGFyZ2V0X19jb2RlIHtcbiAgZGlzcGxheTogbm9uZTtcbn1cbi5uZWV0by10aGVtZXNfX3dyYXBwZXIgLm5lZXRvLXRoZW1lcy1wcmV2aWV3X193cmFwcGVyIHtcbiAgcG9zaXRpb246IHJlbGF0aXZlO1xuICBoZWlnaHQ6IGNhbGMoMTAwdmggLSA2NHB4KTtcbiAgZmxleC1ncm93OiAxO1xufVxuXG4ubmVldG8tdGhlbWVzLXRoZW1lLXRodW1ibmFpbC0tcHJldmlldy1hY3RpdmUge1xuICBib3JkZXItY29sb3I6IHJnYih2YXIoLS1uZWV0by11aS1ncmF5LTYwMCkpICFpbXBvcnRhbnQ7XG4gIG91dGxpbmU6IDFweCBzb2xpZCByZ2IodmFyKC0tbmVldG8tdWktZ3JheS02MDApKSAhaW1wb3J0YW50O1xufVxuXG4ubmVldG8tdGhlbWVzLXRoZW1lLXRodW1ibmFpbC0tYWN0aXZlIHtcbiAgYm9yZGVyLWNvbG9yOiByZ2IodmFyKC0tbmVldG8tdWktcHJpbWFyeS01MDApKSAhaW1wb3J0YW50O1xuICBvdXRsaW5lOiAycHggc29saWQgcmdiKHZhcigtLW5lZXRvLXVpLXByaW1hcnktNTAwKSkgIWltcG9ydGFudDtcbn1cblxuLm5lZXRvLXRoZW1lcy10aGVtZS10aHVtYm5haWwtLWhpZ2hsaWdodC1hY3RpdmUge1xuICBib3JkZXItY29sb3I6IHJnYih2YXIoLS1uZWV0by11aS1ncmF5LTQwMCkpICFpbXBvcnRhbnQ7XG4gIG91dGxpbmU6IDJweCBzb2xpZCByZ2IodmFyKC0tbmVldG8tdWktZ3JheS00MDApKSAhaW1wb3J0YW50O1xufVxuXG4ubmVldG8tdGhlbWVzLXRoZW1lLXRodW1ibmFpbF9fYXBwbHktYnRuIHtcbiAgLS1uZWV0by11aS1idG4tcGFkZGluZy14OiAxMnB4O1xuICAtLW5lZXRvLXVpLWJ0bi1ib3JkZXItcmFkaXVzOiAxMDBweDtcbn1cbi5uZWV0by10aGVtZXMtdGhlbWUtdGh1bWJuYWlsX19hcHBseS1idG46ZGlzYWJsZWQsIC5uZWV0by10aGVtZXMtdGhlbWUtdGh1bWJuYWlsX19hcHBseS1idG5bZGlzYWJsZWRdIHtcbiAgb3BhY2l0eTogMSAhaW1wb3J0YW50O1xufSJdfQ== */";
-n(css,{});
-
-exports.NeetoThemesBuilder = index;
-exports.setTheme = setTheme;
-exports.useThemeUtils = useThemeUtils;
-//# sourceMappingURL=index.cjs.js.map
+module.exports = index;
+//# sourceMappingURL=NeetoThemesBuilder.js.map