globalize themes

packages/app/src/components/Theme/ThemeAntarctic.global.scss

@@ -1,5 +1,5 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 // == Define Bootstrap theme colors
@@ -33,18 +33,6 @@
   }
 }
 
-.theme :global {
-  .grw-bg-image-wrapper {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-  }
-
-  .grw-bg-image {
-    object-fit: cover;
-  }
-}
-
 $themecolor: #000080;
 $themelight: #f0f8ff;
 $accentcolor: #ffd700;
@@ -55,7 +43,7 @@ $accentcolor: #ffd700;
 
 //== Light Mode
 //
-.theme :global {
+:root .theme-antarctic {
   $primary: $themecolor;
 
   // Background colors

packages/app/src/components/Theme/ThemeAntarctic.tsx

@@ -4,7 +4,7 @@ import { Themes } from '~/stores/use-next-themes';
 
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeAntarctic.module.scss';
+// import styles from './ThemeAntarctic.module.scss';
 
 export const getBackgroundImageSrc = (colorScheme: Themes): string => {
   switch (colorScheme) {
@@ -19,17 +19,14 @@ type Props = {
 }
 
 const ThemeAntarctic = ({ children, colorScheme }: Props): JSX.Element => {
-  const newChildren = (
+  const bgImageNode = (
     <>
       {colorScheme != null && (
-        <div className='grw-bg-image-wrapper'>
-          <Image className='grw-bg-image' alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
-        </div>
+        <Image alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
       )}
-      {children}
     </>
   );
-  return <ThemeInjector className={styles.theme}>{newChildren}</ThemeInjector>;
+  return <ThemeInjector className="theme-antarctic" bgImageNode={bgImageNode}>{children}</ThemeInjector>;
 };
 
 export default ThemeAntarctic;

packages/app/src/components/Theme/ThemeBlackboard.global.scss

@@ -1,8 +1,8 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
-.theme :global {
+:root .theme-blackboard {
   // Theme colors
   $themecolor: #da8506;
   $themelight: #223729;

packages/app/src/components/Theme/ThemeBlackboard.tsx

@@ -1,8 +1,8 @@
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeBlackboard.module.scss';
+// import styles from './ThemeBlackboard.module.scss';
 
 const ThemeBlackboard = ({ children }: { children: JSX.Element }): JSX.Element => {
-  return <ThemeInjector className={styles.theme}>{children}</ThemeInjector>;
+  return <ThemeInjector className="theme-blackboard">{children}</ThemeInjector>;
 };
 export default ThemeBlackboard;

packages/app/src/components/Theme/ThemeChristmas.global.scss

@@ -1,5 +1,5 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 // == Define Bootstrap theme colors
@@ -35,21 +35,9 @@ $color-link-wiki-hover: lighten($color-link-wiki, 15%);
   }
 }
 
-.theme :global {
-  .grw-bg-image-wrapper {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-  }
-
-  .grw-bg-image {
-    object-fit: cover;
-  }
-}
-
 //== Light Mode
 //
-.theme :global {
+:root .theme-christmas {
   $primary: #d3c665;
   // Background colors
   $bgcolor-card: $gray-50;

packages/app/src/components/Theme/ThemeChristmas.tsx

@@ -4,7 +4,7 @@ import { Themes } from '~/stores/use-next-themes';
 
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeChristmas.module.scss';
+// import styles from './ThemeChristmas.module.scss';
 
 export const getBackgroundImageSrc = (colorScheme: Themes): string => {
   switch (colorScheme) {
@@ -19,17 +19,14 @@ type Props = {
 }
 
 const ThemeChristmas = ({ children, colorScheme }: Props): JSX.Element => {
-  const newChildren = (
+  const bgImageNode = (
     <>
       {colorScheme != null && (
-        <div className='grw-bg-image-wrapper'>
-          <Image className='grw-bg-image' alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
-        </div>
+        <Image alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
       )}
-      {children}
     </>
   );
-  return <ThemeInjector className={styles.theme}>{newChildren}</ThemeInjector>;
+  return <ThemeInjector className="theme-christmas" bgImageNode={bgImageNode}>{children}</ThemeInjector>;
 };
 
 export default ThemeChristmas;

packages/app/src/components/Theme/ThemeDefault.global.scss

@@ -1,5 +1,5 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 // == Define Bootstrap theme colors
@@ -16,201 +16,197 @@
 
 //== Light Mode
 //
-.theme {
-  [data-color-scheme='light'] :global {
-    $primary: #122c55;
-    $accent: #209fd8;
-
-    // Background colors
-    $bgcolor-global: white;
-    $bgcolor-inline-code: $gray-100; //optional
-    $bgcolor-card: $gray-50;
-    $bgcolor-blinked-section: rgba($primary, 0.1);
-    //$bgcolor-keyword-highlighted: $grw-marker-yellow;
-
-    // Font colors
-    $color-global: #112744;
-    $color-reversal: $light;
-    // $color-header: #2b2b2b;
-    $color-link: #1938ba;
-    $color-link-hover: lighten($color-link, 20%);
-    $color-link-wiki: $color-link;
-    $color-link-wiki-hover: lighten($color-link-wiki, 20%);
-    $color-link-nabvar: $gray-500;
-    $color-inline-code: darken($red, 15%); // optional
-
-    // List Group colors
-    // $color-list: $color-global; // optional
-    // $bgcolor-list: $bgcolor-global; // optional
-    // $color-list-hover: $color-global; // optional
-    // $bgcolor-list-hover: darken($bgcolor-global, 3%); // optional
-    // $color-list-active: $color-reversal; // optional
-    // $bgcolor-list-active: $primary; // optional
-
-    // Table colors
-    // $bgcolor-subnav: #; // optional
-    // $color-table: #; // optional
-    // $bgcolor-table: #; // optional
-    // $border-color-table: #; // optional
-    // $color-table-hover: #; // optional
-    // $bgcolor-table-hover: #; // optional
-
-    // Navbar
-    $bgcolor-navbar: $gray-900;
-    $bgcolor-search-top-dropdown: $accent;
-    $border-image-navbar: linear-gradient(to right, #36c9ff 0%, #36c9ff 33%, #7926ff 66%, #ff2eff 100%);
-
-    // Logo colors
-    $bgcolor-logo: $bgcolor-navbar;
-    $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
-
-    // Sidebar
-    $bgcolor-sidebar: $primary;
-    $bgcolor-sidebar-nav-item-active: rgba(black, 0.37); // optional
-    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
-    // Sidebar resize button
-    $color-resize-button: $color-reversal;
-    $bgcolor-resize-button: $accent;
-    $color-resize-button-hover: $color-reversal;
-    $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
-    // Sidebar contents
-    $color-sidebar-context: $color-global;
-    $bgcolor-sidebar-context: lighten($primary, 77%);
-    // Sidebar list group
-    $bgcolor-sidebar-list-group: $gray-50; // optional
-
-    // Subnavigation
-    // $bgcolor-subnav: #fafafa; // optional
-
-    // Tabs
-    // $color-nav-tabs-link-active: #; //optional
-    // $bordercolor-nav-tabs-hover: # # $bordercolor-nav-tabs; // optional
-    // $bordercolor-nav-tabs-active: # # $bgcolor-global; // optional
-
-    // Tags
-    // $color-tags: #; //optional
-    // $bgcolor-tags: #; //optional
-
-    // Icon colors
-    $color-editor-icons: $color-global;
-
-    // Border colors
-    $border-color-theme: $gray-400;
-    $bordercolor-inline-code: $gray-400; // optional
-
-    // Dropdown colors
-    $bgcolor-dropdown-link-active: $growi-blue;
-
-    // admin theme box
-    $color-theme-color-box: lighten($primary, 20%);
-
-    @import '../../styles/theme/apply-colors';
-    @import '../../styles/theme/apply-colors-light';
-
-    // Button
-    .btn-group.grw-page-editor-mode-manager {
-      .btn.btn-outline-primary {
-        @include page-editor-mode-manager.btn-page-editor-mode-manager($primary, lighten($primary, 65%), lighten($primary, 70%));
-      }
+:root[data-theme='light'] .theme-default {
+  $primary: #122c55;
+  $accent: #209fd8;
+
+  // Background colors
+  $bgcolor-global: white;
+  $bgcolor-inline-code: $gray-100; //optional
+  $bgcolor-card: $gray-50;
+  $bgcolor-blinked-section: rgba($primary, 0.1);
+  //$bgcolor-keyword-highlighted: $grw-marker-yellow;
+
+  // Font colors
+  $color-global: #112744;
+  $color-reversal: $light;
+  // $color-header: #2b2b2b;
+  $color-link: #1938ba;
+  $color-link-hover: lighten($color-link, 20%);
+  $color-link-wiki: $color-link;
+  $color-link-wiki-hover: lighten($color-link-wiki, 20%);
+  $color-link-nabvar: $gray-500;
+  $color-inline-code: darken($red, 15%); // optional
+
+  // List Group colors
+  // $color-list: $color-global; // optional
+  // $bgcolor-list: $bgcolor-global; // optional
+  // $color-list-hover: $color-global; // optional
+  // $bgcolor-list-hover: darken($bgcolor-global, 3%); // optional
+  // $color-list-active: $color-reversal; // optional
+  // $bgcolor-list-active: $primary; // optional
+
+  // Table colors
+  // $bgcolor-subnav: #; // optional
+  // $color-table: #; // optional
+  // $bgcolor-table: #; // optional
+  // $border-color-table: #; // optional
+  // $color-table-hover: #; // optional
+  // $bgcolor-table-hover: #; // optional
+
+  // Navbar
+  $bgcolor-navbar: $gray-900;
+  $bgcolor-search-top-dropdown: $accent;
+  $border-image-navbar: linear-gradient(to right, #36c9ff 0%, #36c9ff 33%, #7926ff 66%, #ff2eff 100%);
+
+  // Logo colors
+  $bgcolor-logo: $bgcolor-navbar;
+  $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
+
+  // Sidebar
+  $bgcolor-sidebar: $primary;
+  $bgcolor-sidebar-nav-item-active: rgba(black, 0.37); // optional
+  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
+  // Sidebar resize button
+  $color-resize-button: $color-reversal;
+  $bgcolor-resize-button: $accent;
+  $color-resize-button-hover: $color-reversal;
+  $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
+  // Sidebar contents
+  $color-sidebar-context: $color-global;
+  $bgcolor-sidebar-context: lighten($primary, 77%);
+  // Sidebar list group
+  $bgcolor-sidebar-list-group: $gray-50; // optional
+
+  // Subnavigation
+  // $bgcolor-subnav: #fafafa; // optional
+
+  // Tabs
+  // $color-nav-tabs-link-active: #; //optional
+  // $bordercolor-nav-tabs-hover: # # $bordercolor-nav-tabs; // optional
+  // $bordercolor-nav-tabs-active: # # $bgcolor-global; // optional
+
+  // Tags
+  // $color-tags: #; //optional
+  // $bgcolor-tags: #; //optional
+
+  // Icon colors
+  $color-editor-icons: $color-global;
+
+  // Border colors
+  $border-color-theme: $gray-400;
+  $bordercolor-inline-code: $gray-400; // optional
+
+  // Dropdown colors
+  $bgcolor-dropdown-link-active: $growi-blue;
+
+  // admin theme box
+  $color-theme-color-box: lighten($primary, 20%);
+
+  @import '../../styles/theme/apply-colors';
+  @import '../../styles/theme/apply-colors-light';
+
+  // Button
+  .btn-group.grw-page-editor-mode-manager {
+    .btn.btn-outline-primary {
+      @include page-editor-mode-manager.btn-page-editor-mode-manager($primary, lighten($primary, 65%), lighten($primary, 70%));
     }
   }
 }
 
 //== Dark Mode
 //
-.theme {
-  [data-color-scheme='dark'] :global {
-    $primary: #115cd3;
-    $accent: #db00c2;
-
-    // Background colors
-    $bgcolor-global: #131418;
-    $bgcolor-inline-code: #1f1f22; //optional
-    $bgcolor-card: darken($bgcolor-global, 5%);
-    $bgcolor-blinked-section: rgba($primary, 0.4);
-    $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
-
-    // Font colors
-    $color-global: $gray-400;
-    $color-reversal: $gray-900;
-    // $color-header: desaturate($primary, 20%);
-    $color-link: #7b9ad5;
-    $color-link-hover: lighten($color-link, 10%);
-    $color-link-wiki: $color-link;
-    $color-link-wiki-hover: lighten($color-link-wiki, 10%);
-    $color-link-nabvar: #a7a7a7;
-    $color-inline-code: #c7254e; // optional
-
-    // List Group colors
-    // $color-list: $color-global; // optional
-    // $bgcolor-list: $bgcolor-global; // optional
-    // $color-list-hover: $color-global; // optional
-    // $bgcolor-list-hover: lighten($bgcolor-global, 3%); // optional
-    // $color-list-active:white ; // optional
-    // $bgcolor-list-active: $primary; // optional
-
-    // Table colors
-    // $color-table: #; // optional
-    // $bgcolor-table: #; // optional
-    // $border-color-table: #; // optional
-    // $color-table-hover: #; // optional
-    // $bgcolor-table-hover: #; // optional
-
-    // Navbar
-    $bgcolor-navbar: #2a2929;
-    $bgcolor-search-top-dropdown: $accent;
-    $border-image-navbar: linear-gradient(to right, #44bfe3 0%, #b04aff 50%, #ff1794 100%);
-
-    // Logo colors
-    $bgcolor-logo: $bgcolor-navbar;
-    $fillcolor-logo-mark: $gray-700;
-
-    // Sidebar
-    $bgcolor-sidebar: #122c55;
-    $bgcolor-sidebar-nav-item-active: rgba(#969494, 0.3); // optional
-    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
-    // Sidebar resize button
-    $color-resize-button: white;
-    $bgcolor-resize-button: $accent;
-    $color-resize-button-hover: white;
-    $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
-    // Sidebar contents
-    $bgcolor-sidebar-context: lighten($bgcolor-global, 8%);
-    $color-sidebar-context: $color-global;
-    // Sidebar list group
-    $bgcolor-sidebar-list-group: #1c2a3e; // optional
-
-    // Subnavigation
-    $bgcolor-subnav: lighten($bgcolor-global, 4%); // optional
-
-    // Tabs
-    $bordercolor-nav-tabs: $gray-700; // optional
-    // $color-nav-tabs-link-active: #; //optional
-    $bordercolor-nav-tabs-hover: #666 #666 $bordercolor-nav-tabs; // optional
-    // $bordercolor-nav-tabs-active: # # $bgcolor-global; // optional
-
-    // Tags
-    // $color-tags: #; //optional
-    // $bgcolor-tags: #; //optional
-
-    // Icon colors
-    $color-editor-icons: $color-global;
-
-    // Border colors
-    $border-color-theme: $gray-400;
-    $bordercolor-inline-code: $secondary; // optional
-
-    // admin theme box
-    $color-theme-color-box: $primary;
-
-    @import '../../styles/theme/apply-colors';
-    @import '../../styles/theme/apply-colors-dark';
-
-    //Button
-    .btn-group.grw-page-editor-mode-manager {
-      .btn.btn-outline-primary {
-        @include page-editor-mode-manager.btn-page-editor-mode-manager(lighten($primary, 30%), lighten($primary, 20%), $primary, darken($primary, 20%));
-      }
+:root[data-theme='light'] .theme-dark {
+  $primary: #115cd3;
+  $accent: #db00c2;
+
+  // Background colors
+  $bgcolor-global: #131418;
+  $bgcolor-inline-code: #1f1f22; //optional
+  $bgcolor-card: darken($bgcolor-global, 5%);
+  $bgcolor-blinked-section: rgba($primary, 0.4);
+  $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
+
+  // Font colors
+  $color-global: $gray-400;
+  $color-reversal: $gray-900;
+  // $color-header: desaturate($primary, 20%);
+  $color-link: #7b9ad5;
+  $color-link-hover: lighten($color-link, 10%);
+  $color-link-wiki: $color-link;
+  $color-link-wiki-hover: lighten($color-link-wiki, 10%);
+  $color-link-nabvar: #a7a7a7;
+  $color-inline-code: #c7254e; // optional
+
+  // List Group colors
+  // $color-list: $color-global; // optional
+  // $bgcolor-list: $bgcolor-global; // optional
+  // $color-list-hover: $color-global; // optional
+  // $bgcolor-list-hover: lighten($bgcolor-global, 3%); // optional
+  // $color-list-active:white ; // optional
+  // $bgcolor-list-active: $primary; // optional
+
+  // Table colors
+  // $color-table: #; // optional
+  // $bgcolor-table: #; // optional
+  // $border-color-table: #; // optional
+  // $color-table-hover: #; // optional
+  // $bgcolor-table-hover: #; // optional
+
+  // Navbar
+  $bgcolor-navbar: #2a2929;
+  $bgcolor-search-top-dropdown: $accent;
+  $border-image-navbar: linear-gradient(to right, #44bfe3 0%, #b04aff 50%, #ff1794 100%);
+
+  // Logo colors
+  $bgcolor-logo: $bgcolor-navbar;
+  $fillcolor-logo-mark: $gray-700;
+
+  // Sidebar
+  $bgcolor-sidebar: #122c55;
+  $bgcolor-sidebar-nav-item-active: rgba(#969494, 0.3); // optional
+  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
+  // Sidebar resize button
+  $color-resize-button: white;
+  $bgcolor-resize-button: $accent;
+  $color-resize-button-hover: white;
+  $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
+  // Sidebar contents
+  $bgcolor-sidebar-context: lighten($bgcolor-global, 8%);
+  $color-sidebar-context: $color-global;
+  // Sidebar list group
+  $bgcolor-sidebar-list-group: #1c2a3e; // optional
+
+  // Subnavigation
+  $bgcolor-subnav: lighten($bgcolor-global, 4%); // optional
+
+  // Tabs
+  $bordercolor-nav-tabs: $gray-700; // optional
+  // $color-nav-tabs-link-active: #; //optional
+  $bordercolor-nav-tabs-hover: #666 #666 $bordercolor-nav-tabs; // optional
+  // $bordercolor-nav-tabs-active: # # $bgcolor-global; // optional
+
+  // Tags
+  // $color-tags: #; //optional
+  // $bgcolor-tags: #; //optional
+
+  // Icon colors
+  $color-editor-icons: $color-global;
+
+  // Border colors
+  $border-color-theme: $gray-400;
+  $bordercolor-inline-code: $secondary; // optional
+
+  // admin theme box
+  $color-theme-color-box: $primary;
+
+  @import '../../styles/theme/apply-colors';
+  @import '../../styles/theme/apply-colors-dark';
+
+  //Button
+  .btn-group.grw-page-editor-mode-manager {
+    .btn.btn-outline-primary {
+      @include page-editor-mode-manager.btn-page-editor-mode-manager(lighten($primary, 30%), lighten($primary, 20%), $primary, darken($primary, 20%));
     }
   }
 }

packages/app/src/components/Theme/ThemeDefault.tsx

@@ -1,8 +1,8 @@
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeDefault.module.scss';
+// import styles from './ThemeDefault.module.scss';
 
 const ThemeDefault = ({ children }: { children: JSX.Element }): JSX.Element => {
-  return <ThemeInjector className={styles.theme}>{children}</ThemeInjector>;
+  return <ThemeInjector className="theme-default">{children}</ThemeInjector>;
 };
 export default ThemeDefault;

packages/app/src/components/Theme/ThemeFireRed.global.scss

@@ -1,209 +1,205 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
-.theme {
-  [data-color-scheme='light'] :global {
-    // Theme colors
-    $themecolor: #ea5532;
-    $themelight: #ffffff;
-    $accentcolor: #bfbfbf;
-    $subthemecolor: #e6e6e6;
-
-    $primary: $themecolor;
-
-    // Background colors
-    $bgcolor-global: $themelight;
-    $bgcolor-inline-code: $gray-100; //optional
-    $bgcolor-card: $accentcolor;
-    $bgcolor-blinked-section: rgba($primary, 0.1);
-    //$bgcolor-keyword-highlighted: $grw-marker-yellow;
-
-    // Font colors
-    $color-global: #2c2c2c;
-    $color-reversal: $gray-100;
-    $color-link: $primary;
-    $color-link-hover: lighten($color-link, 12%);
-    $color-link-wiki: $primary;
-    $color-link-wiki-hover: lighten($color-link-wiki, 12%);
-    $color-link-nabvar: $color-reversal;
-    $color-inline-code: #c7254e; // optional
-    $color-search: $color-global;
-
-    // List Group colors
-    // $color-list: $color-global;
-    $bgcolor-list: transparent;
-    $color-list-hover: $color-search;
-    $bgcolor-list-hover: darken($bgcolor-global, 3%);
-    // $color-list-active: $color-reversal;
-    // $bgcolor-list-active: $primary;
-
-    // Navbar
-    $bgcolor-navbar: $color-global;
-    $bgcolor-search-top-dropdown: $themecolor;
-    $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
-
-    // Logo colors
-    $bgcolor-logo: $themelight;
-    $fillcolor-logo-mark: $themelight;
-
-    // Sidebar
-    $bgcolor-sidebar: $accentcolor;
-    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
-    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #ffffff; // optional
-    // Sidebar resize button
-    $color-resize-button: #ffffff;
-    $bgcolor-resize-button: $primary;
-    $color-resize-button-hover: $color-reversal;
-    $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
-    // Sidebar contents
-    $color-sidebar-context: $color-global;
-    $bgcolor-sidebar-context: #ececec;
-    // Sidebar list group
-    // $bgcolor-sidebar-list-group: #; // optional
-
-    // Icon colors
-    $color-editor-icons: $color-global;
-
-    // Border colors
-    $border-color-theme: $primary;
-    $bordercolor-inline-code: #ccc8c8; // optional
-
-    // admin theme box
-    $color-theme-color-box: $primary;
-
-    @import '../../styles/theme/apply-colors';
-    @import '../../styles/theme/apply-colors-light';
-
-    // Navs {
-    .nav-tabs {
-      border-bottom: $border-color-theme 1px solid;
-      .nav-link {
-        &:hover {
-          border-color: lighten($border-color-theme, 10%);
-          border-bottom: none;
-        }
-        &.active {
-          background-color: transparent;
-        }
+:root[data-theme='light'] .theme-fire-red {
+  // Theme colors
+  $themecolor: #ea5532;
+  $themelight: #ffffff;
+  $accentcolor: #bfbfbf;
+  $subthemecolor: #e6e6e6;
+
+  $primary: $themecolor;
+
+  // Background colors
+  $bgcolor-global: $themelight;
+  $bgcolor-inline-code: $gray-100; //optional
+  $bgcolor-card: $accentcolor;
+  $bgcolor-blinked-section: rgba($primary, 0.1);
+  //$bgcolor-keyword-highlighted: $grw-marker-yellow;
+
+  // Font colors
+  $color-global: #2c2c2c;
+  $color-reversal: $gray-100;
+  $color-link: $primary;
+  $color-link-hover: lighten($color-link, 12%);
+  $color-link-wiki: $primary;
+  $color-link-wiki-hover: lighten($color-link-wiki, 12%);
+  $color-link-nabvar: $color-reversal;
+  $color-inline-code: #c7254e; // optional
+  $color-search: $color-global;
+
+  // List Group colors
+  // $color-list: $color-global;
+  $bgcolor-list: transparent;
+  $color-list-hover: $color-search;
+  $bgcolor-list-hover: darken($bgcolor-global, 3%);
+  // $color-list-active: $color-reversal;
+  // $bgcolor-list-active: $primary;
+
+  // Navbar
+  $bgcolor-navbar: $color-global;
+  $bgcolor-search-top-dropdown: $themecolor;
+  $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
+
+  // Logo colors
+  $bgcolor-logo: $themelight;
+  $fillcolor-logo-mark: $themelight;
+
+  // Sidebar
+  $bgcolor-sidebar: $accentcolor;
+  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
+  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #ffffff; // optional
+  // Sidebar resize button
+  $color-resize-button: #ffffff;
+  $bgcolor-resize-button: $primary;
+  $color-resize-button-hover: $color-reversal;
+  $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
+  // Sidebar contents
+  $color-sidebar-context: $color-global;
+  $bgcolor-sidebar-context: #ececec;
+  // Sidebar list group
+  // $bgcolor-sidebar-list-group: #; // optional
+
+  // Icon colors
+  $color-editor-icons: $color-global;
+
+  // Border colors
+  $border-color-theme: $primary;
+  $bordercolor-inline-code: #ccc8c8; // optional
+
+  // admin theme box
+  $color-theme-color-box: $primary;
+
+  @import '../../styles/theme/apply-colors';
+  @import '../../styles/theme/apply-colors-light';
+
+  // Navs {
+  .nav-tabs {
+    border-bottom: $border-color-theme 1px solid;
+    .nav-link {
+      &:hover {
+        border-color: lighten($border-color-theme, 10%);
+        border-bottom: none;
       }
-    }
-    // Button
-    .btn-group.grw-page-editor-mode-manager {
-      .btn.btn-outline-primary {
-        @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, lighten($primary, 20%));
+      &.active {
+        background-color: transparent;
       }
     }
   }
+  // Button
+  .btn-group.grw-page-editor-mode-manager {
+    .btn.btn-outline-primary {
+      @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, lighten($primary, 20%));
+    }
+  }
 }
 
-.theme {
-  [data-color-scheme='dark'] :global {
-    // Theme colors
-    $themecolor: #ea5532;
-    $themedark: #333333;
-    $accentcolor: #212121;
-    $subthemecolor: #2e2e2e;
-
-    $primary: #ea5532;
-    $dark: #a7a7a7;
-
-    // Background colors
-    $bgcolor-global: $themedark;
-    $bgcolor-navbar: #2b2b2b;
-    $bgcolor-inline-code: $gray-100; //optional
-    $bgcolor-card: darken($themedark, 5%);
-    $bgcolor-blinked-section: rgba($primary, 0.5);
-    $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
-
-    // Font colors
-    $color-global: #ffffff;
-    $color-reversal: $gray-100;
-    $color-link: $primary;
-    $color-link-hover: lighten($color-link, 12%);
-    $color-link-wiki: $primary;
-    $color-link-wiki-hover: lighten($color-link-wiki, 12%);
-    $color-link-nabvar: $color-reversal;
-    $color-inline-code: $subthemecolor;
-    $color-inline-code: #c7254e; // optional
-    $color-search: $dark;
-
-    // List Group colors
-    // $color-list: $color-global;
-    $bgcolor-list: transparent;
-    $color-list-hover: $accentcolor;
-    // $bgcolor-list-hover: lighten($bgcolor-global, 3%);
-    // $color-list-active: $color-reversal;
-    // $bgcolor-list-active: $primary;
-
-    // Navbar
-    $bgcolor-navbar: #2c2c2c;
-    $bgcolor-search-top-dropdown: $themecolor;
-    $border-image-navbar: linear-gradient(to right, #ea5532 0%, #c9171e 100%);
-
-    // Logo colors
-    $bgcolor-logo: #ffffff;
-    $fillcolor-logo-mark: #ffffff;
-    // $fillcolor-logo-mark: #4e5a60;
-
-    // Sidebar
-    $bgcolor-sidebar: $accentcolor;
-    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
-    $text-shadow-sidebar-nav-item-active: 0px 0px 10px $primary; // optional
-    // Sidebar resize button
-    $color-resize-button: $color-global;
-    $bgcolor-resize-button: $primary;
-    $color-resize-button-hover: $color-global;
-    $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
-    // Sidebar contents
-    $bgcolor-sidebar-context: #413f3f;
-    $color-sidebar-context: $color-global;
-    // Sidebar list group
-    // $bgcolor-sidebar-list-group: #; // optional
-
-    // Icon colors
-    $color-editor-icons: $color-global;
-
-    // Border colors
-    $border-color-theme: $primary;
-    $bordercolor-inline-code: #4d4d4d; // optional
-
-    // Dropdown colors
-    $color-dropdown-link-active: $color-global;
-    $color-dropdown-link-hover: $color-reversal;
-
-    // admin theme box
-    $color-theme-color-box: $primary;
-
-    @import '../../styles/theme/apply-colors';
-    @import '../../styles/theme/apply-colors-dark';
-
-    // Navs
-    .nav-tabs {
-      border-bottom: $border-color-theme 1px solid;
-      .nav-link {
-        &:hover {
-          border-color: lighten($border-color-theme, 10%);
-          border-bottom: none;
-        }
-        &.active {
-          color: $color-link;
-          background-color: transparent;
-          border-color: $border-color-theme;
-        }
+:root[data-theme='dark'] .theme-fire-red {
+  // Theme colors
+  $themecolor: #ea5532;
+  $themedark: #333333;
+  $accentcolor: #212121;
+  $subthemecolor: #2e2e2e;
+
+  $primary: #ea5532;
+  $dark: #a7a7a7;
+
+  // Background colors
+  $bgcolor-global: $themedark;
+  $bgcolor-navbar: #2b2b2b;
+  $bgcolor-inline-code: $gray-100; //optional
+  $bgcolor-card: darken($themedark, 5%);
+  $bgcolor-blinked-section: rgba($primary, 0.5);
+  $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
+
+  // Font colors
+  $color-global: #ffffff;
+  $color-reversal: $gray-100;
+  $color-link: $primary;
+  $color-link-hover: lighten($color-link, 12%);
+  $color-link-wiki: $primary;
+  $color-link-wiki-hover: lighten($color-link-wiki, 12%);
+  $color-link-nabvar: $color-reversal;
+  $color-inline-code: $subthemecolor;
+  $color-inline-code: #c7254e; // optional
+  $color-search: $dark;
+
+  // List Group colors
+  // $color-list: $color-global;
+  $bgcolor-list: transparent;
+  $color-list-hover: $accentcolor;
+  // $bgcolor-list-hover: lighten($bgcolor-global, 3%);
+  // $color-list-active: $color-reversal;
+  // $bgcolor-list-active: $primary;
+
+  // Navbar
+  $bgcolor-navbar: #2c2c2c;
+  $bgcolor-search-top-dropdown: $themecolor;
+  $border-image-navbar: linear-gradient(to right, #ea5532 0%, #c9171e 100%);
+
+  // Logo colors
+  $bgcolor-logo: #ffffff;
+  $fillcolor-logo-mark: #ffffff;
+  // $fillcolor-logo-mark: #4e5a60;
+
+  // Sidebar
+  $bgcolor-sidebar: $accentcolor;
+  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
+  $text-shadow-sidebar-nav-item-active: 0px 0px 10px $primary; // optional
+  // Sidebar resize button
+  $color-resize-button: $color-global;
+  $bgcolor-resize-button: $primary;
+  $color-resize-button-hover: $color-global;
+  $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
+  // Sidebar contents
+  $bgcolor-sidebar-context: #413f3f;
+  $color-sidebar-context: $color-global;
+  // Sidebar list group
+  // $bgcolor-sidebar-list-group: #; // optional
+
+  // Icon colors
+  $color-editor-icons: $color-global;
+
+  // Border colors
+  $border-color-theme: $primary;
+  $bordercolor-inline-code: #4d4d4d; // optional
+
+  // Dropdown colors
+  $color-dropdown-link-active: $color-global;
+  $color-dropdown-link-hover: $color-reversal;
+
+  // admin theme box
+  $color-theme-color-box: $primary;
+
+  @import '../../styles/theme/apply-colors';
+  @import '../../styles/theme/apply-colors-dark';
+
+  // Navs
+  .nav-tabs {
+    border-bottom: $border-color-theme 1px solid;
+    .nav-link {
+      &:hover {
+        border-color: lighten($border-color-theme, 10%);
+        border-bottom: none;
+      }
+      &.active {
+        color: $color-link;
+        background-color: transparent;
+        border-color: $border-color-theme;
       }
     }
+  }
 
-    // Table
-    .table {
-      color: white;
-    }
+  // Table
+  .table {
+    color: white;
+  }
 
-    // Button
-    .btn-group.grw-page-editor-mode-manager {
-      .btn.btn-outline-primary {
-        @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, darken($primary, 20%));
-      }
+  // Button
+  .btn-group.grw-page-editor-mode-manager {
+    .btn.btn-outline-primary {
+      @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, darken($primary, 20%));
     }
   }
 }

packages/app/src/components/Theme/ThemeFireRed.tsx

@@ -1,8 +1,8 @@
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeFireRed.module.scss';
+// import styles from './ThemeFireRed.module.scss';
 
 const ThemeFireRed = ({ children }: { children: JSX.Element }): JSX.Element => {
-  return <ThemeInjector className={styles.theme}>{children}</ThemeInjector>;
+  return <ThemeInjector className="theme-fire-red">{children}</ThemeInjector>;
 };
 export default ThemeFireRed;

packages/app/src/components/Theme/ThemeFuture.global.scss

@@ -1,12 +1,12 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 $primary: #00b5b7;
 $themecolor: #16282d;
 $accentcolor: #00fff5;
 
-.theme :global {
+:root .theme-future {
   // Background colors
   $bgcolor-global: $themecolor;
   $bgcolor-inline-code: #1f1f22; //optional

packages/app/src/components/Theme/ThemeFuture.tsx

@@ -1,8 +1,8 @@
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeFuture.module.scss';
+// import styles from './ThemeFuture.module.scss';
 
 const ThemeFuture = ({ children }: { children: JSX.Element }): JSX.Element => {
-  return <ThemeInjector className={styles.theme}>{children}</ThemeInjector>;
+  return <ThemeInjector className="theme-future">{children}</ThemeInjector>;
 };
 export default ThemeFuture;

packages/app/src/components/Theme/ThemeHalloween.global.scss

@@ -1,5 +1,5 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 $themecolor: #aa4a04;
@@ -27,21 +27,10 @@ $light: lighten($secondary, 10%);
   }
 }
 
-.theme :global {
-  .grw-bg-image-wrapper {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-  }
-
-  .grw-navbar {
-    background-image: url('/images/themes/halloween/halloween-navbar.jpg') !important;
-  }
-}
 
 //== Light Mode
 //
-.theme :global {
+:root .theme-halloween {
   // Background colors
   $bgcolor-global: #050000;
   $bgcolor-inline-code: #1f1f22; //optional
@@ -115,7 +104,11 @@ $light: lighten($secondary, 10%);
   @import '../../styles/theme/apply-colors';
   @import '../../styles/theme/apply-colors-dark';
 
-  //Button
+  .grw-navbar {
+    background-image: url('/images/themes/halloween/halloween-navbar.jpg') !important;
+  }
+
+  // Button
   .btn-group.grw-page-editor-mode-manager {
     .btn.btn-outline-primary {
       @include page-editor-mode-manager.btn-page-editor-mode-manager(lighten($primary, 35%), $primary, lighten($primary, 5%), darken($primary, 20%));

packages/app/src/components/Theme/ThemeHalloween.tsx

@@ -4,7 +4,7 @@ import { Themes } from '~/stores/use-next-themes';
 
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeHalloween.module.scss';
+// import styles from './ThemeHalloween.module.scss';
 
 export const getBackgroundImageSrc = (colorScheme: Themes): string => {
   switch (colorScheme) {
@@ -19,17 +19,14 @@ type Props = {
 }
 
 const ThemeHalloween = ({ children, colorScheme }: Props): JSX.Element => {
-  const newChildren = (
+  const bgImageNode = (
     <>
       {colorScheme != null && (
-        <div className='grw-bg-image-wrapper'>
-          <Image className='grw-bg-image' alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
-        </div>
+        <Image alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
       )}
-      {children}
     </>
   );
-  return <ThemeInjector className={styles.theme}>{newChildren}</ThemeInjector>;
+  return <ThemeInjector className="theme-halloween" bgImageNode={bgImageNode}>{children}</ThemeInjector>;
 };
 
 export default ThemeHalloween;

packages/app/src/components/Theme/ThemeHufflepuff.tsx

@@ -26,7 +26,7 @@ const ThemeHufflepuff = ({ children, colorScheme }: Props): JSX.Element => {
   const bgImageNode = (
     <>
       {colorScheme != null && (
-        <Image className='grw-bg-image' alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
+        <Image alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
       )}
     </>
   );

packages/app/src/components/Theme/ThemeIsland.global.scss

@@ -1,20 +1,12 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/mixins';
 
 $color-primary: #97cbc3;
 $color-themelight: rgba(183, 226, 219, 1);
 
-.theme :global {
-  .grw-bg-image-wrapper {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-  }
-}
-
-.theme :global {
+:root .theme-island {
   $primary: $color-primary;
   // Background colors
   $bgcolor-card: $gray-50;

packages/app/src/components/Theme/ThemeIsland.tsx

@@ -4,7 +4,7 @@ import { Themes } from '~/stores/use-next-themes';
 
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeIsland.module.scss';
+// import styles from './ThemeIsland.module.scss';
 
 export const getBackgroundImageSrc = (colorScheme: Themes): string => {
   switch (colorScheme) {
@@ -19,17 +19,14 @@ type Props = {
 }
 
 const ThemeIsland = ({ children, colorScheme }: Props): JSX.Element => {
-  const newChildren = (
+  const bgImageNode = (
     <>
       {colorScheme != null && (
-        <div className='grw-bg-image-wrapper'>
-          <Image className='grw-bg-image' alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
-        </div>
+        <Image alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
       )}
-      {children}
     </>
   );
-  return <ThemeInjector className={styles.theme}>{newChildren}</ThemeInjector>;
+  return <ThemeInjector className="theme-island" bgImageNode={bgImageNode}>{children}</ThemeInjector>;
 };
 
 export default ThemeIsland;

packages/app/src/components/Theme/ThemeJadeGreen.global.scss

@@ -1,209 +1,205 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
-.theme {
-  [data-color-scheme='light'] :global {
-    // Theme colors
-    $themecolor: #38b48b;
-    $themelight: #ffffff;
-    $accentcolor: #bfbfbf;
-    $subthemecolor: #e6e6e6;
-
-    $primary: $themecolor;
-
-    // Background colors
-    $bgcolor-global: $themelight;
-    $bgcolor-inline-code: $gray-100; //optional
-    $bgcolor-card: $accentcolor;
-    $bgcolor-blinked-section: rgba($primary, 0.1);
-    //$bgcolor-keyword-highlighted: $grw-marker-yellow;
-
-    // Font colors
-    $color-global: #2c2c2c;
-    $color-reversal: $gray-100;
-    $color-link: $primary;
-    $color-link-hover: lighten($color-link, 12%);
-    $color-link-wiki: $primary;
-    $color-link-wiki-hover: lighten($color-link-wiki, 12%);
-    $color-link-nabvar: $color-reversal;
-    $color-inline-code: #c7254e; // optional
-    $color-search: $color-global;
-
-    // List Group colors
-    // $color-list: $color-global;
-    $bgcolor-list: transparent;
-    $color-list-hover: $color-search;
-    $bgcolor-list-hover: darken($bgcolor-global, 3%);
-    // $color-list-active: $color-reversal;
-    // $bgcolor-list-active: $primary;
-
-    // Navbar
-    $bgcolor-navbar: $color-global;
-    $bgcolor-search-top-dropdown: $themecolor;
-    $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
-
-    // Logo colors
-    $bgcolor-logo: $themelight;
-    $fillcolor-logo-mark: $themelight;
-
-    // Sidebar
-    $bgcolor-sidebar: $accentcolor;
-    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
-    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #ffffff; // optional
-    // Sidebar resize button
-    $color-resize-button: #ffffff;
-    $bgcolor-resize-button: $primary;
-    $color-resize-button-hover: $color-reversal;
-    $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
-    // Sidebar contents
-    $color-sidebar-context: $color-global;
-    $bgcolor-sidebar-context: #ebebeb;
-    // Sidebar list group
-    // $bgcolor-sidebar-list-group: #; // optional
-
-    // Icon colors
-    $color-editor-icons: $color-global;
-
-    // Border colors
-    $border-color-theme: $primary;
-    $bordercolor-inline-code: #ccc8c8; // optional
-
-    // admin theme box
-    $color-theme-color-box: $primary;
-
-    @import '../../styles/theme/apply-colors';
-    @import '../../styles/theme/apply-colors-light';
-
-    // Navs {
-    .nav-tabs {
-      border-bottom: $border-color-theme 1px solid;
-      .nav-link {
-        &:hover {
-          border-color: lighten($border-color-theme, 10%);
-          border-bottom: none;
-        }
-        &.active {
-          background-color: transparent;
-        }
+:root[data-theme='light'] .theme-jade-green {
+  // Theme colors
+  $themecolor: #38b48b;
+  $themelight: #ffffff;
+  $accentcolor: #bfbfbf;
+  $subthemecolor: #e6e6e6;
+
+  $primary: $themecolor;
+
+  // Background colors
+  $bgcolor-global: $themelight;
+  $bgcolor-inline-code: $gray-100; //optional
+  $bgcolor-card: $accentcolor;
+  $bgcolor-blinked-section: rgba($primary, 0.1);
+  //$bgcolor-keyword-highlighted: $grw-marker-yellow;
+
+  // Font colors
+  $color-global: #2c2c2c;
+  $color-reversal: $gray-100;
+  $color-link: $primary;
+  $color-link-hover: lighten($color-link, 12%);
+  $color-link-wiki: $primary;
+  $color-link-wiki-hover: lighten($color-link-wiki, 12%);
+  $color-link-nabvar: $color-reversal;
+  $color-inline-code: #c7254e; // optional
+  $color-search: $color-global;
+
+  // List Group colors
+  // $color-list: $color-global;
+  $bgcolor-list: transparent;
+  $color-list-hover: $color-search;
+  $bgcolor-list-hover: darken($bgcolor-global, 3%);
+  // $color-list-active: $color-reversal;
+  // $bgcolor-list-active: $primary;
+
+  // Navbar
+  $bgcolor-navbar: $color-global;
+  $bgcolor-search-top-dropdown: $themecolor;
+  $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
+
+  // Logo colors
+  $bgcolor-logo: $themelight;
+  $fillcolor-logo-mark: $themelight;
+
+  // Sidebar
+  $bgcolor-sidebar: $accentcolor;
+  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
+  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #ffffff; // optional
+  // Sidebar resize button
+  $color-resize-button: #ffffff;
+  $bgcolor-resize-button: $primary;
+  $color-resize-button-hover: $color-reversal;
+  $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
+  // Sidebar contents
+  $color-sidebar-context: $color-global;
+  $bgcolor-sidebar-context: #ebebeb;
+  // Sidebar list group
+  // $bgcolor-sidebar-list-group: #; // optional
+
+  // Icon colors
+  $color-editor-icons: $color-global;
+
+  // Border colors
+  $border-color-theme: $primary;
+  $bordercolor-inline-code: #ccc8c8; // optional
+
+  // admin theme box
+  $color-theme-color-box: $primary;
+
+  @import '../../styles/theme/apply-colors';
+  @import '../../styles/theme/apply-colors-light';
+
+  // Navs {
+  .nav-tabs {
+    border-bottom: $border-color-theme 1px solid;
+    .nav-link {
+      &:hover {
+        border-color: lighten($border-color-theme, 10%);
+        border-bottom: none;
       }
-    }
-    // Button
-    .btn-group.grw-page-editor-mode-manager {
-      .btn.btn-outline-primary {
-        @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, lighten($primary, 20%));
+      &.active {
+        background-color: transparent;
       }
     }
   }
+  // Button
+  .btn-group.grw-page-editor-mode-manager {
+    .btn.btn-outline-primary {
+      @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, lighten($primary, 20%));
+    }
+  }
 }
 
-.theme {
-  [data-color-scheme='dark'] :global {
-    // Theme colors
-    $themecolor: #38b48b;
-    $themedark: #333333;
-    $accentcolor: #212121;
-    $subthemecolor: #2e2e2e;
-
-    $primary: #38b48b;
-    $dark: #a7a7a7;
-
-    // Background colors
-    $bgcolor-global: $themedark;
-    $bgcolor-navbar: #2b2b2b;
-    $bgcolor-inline-code: $gray-100; //optional
-    $bgcolor-card: darken($themedark, 5%);
-    $bgcolor-blinked-section: rgba($primary, 0.5);
-    $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
-
-    // Font colors
-    $color-global: #ffffff;
-    $color-reversal: $gray-100;
-    $color-link: $primary;
-    $color-link-hover: lighten($color-link, 12%);
-    $color-link-wiki: $primary;
-    $color-link-wiki-hover: lighten($color-link-wiki, 12%);
-    $color-link-nabvar: $color-reversal;
-    $color-inline-code: $subthemecolor;
-    $color-inline-code: #c7254e; // optional
-    $color-search: $dark;
-
-    // List Group colors
-    // $color-list: $color-global;
-    $bgcolor-list: transparent;
-    $color-list-hover: $accentcolor;
-    // $bgcolor-list-hover: lighten($bgcolor-global, 3%);
-    // $color-list-active: $color-reversal;
-    // $bgcolor-list-active: $primary;
-
-    // Navbar
-    $bgcolor-navbar: #2c2c2c;
-    $bgcolor-search-top-dropdown: $themecolor;
-    $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
-
-    // Logo colors
-    $bgcolor-logo: #ffffff;
-    $fillcolor-logo-mark: #ffffff;
-    // $fillcolor-logo-mark: #4e5a60;
-
-    // Sidebar
-    $bgcolor-sidebar: $accentcolor;
-    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
-    $text-shadow-sidebar-nav-item-active: 0px 0px 10px $primary; // optional
-    // Sidebar resize button
-    $color-resize-button: $color-global;
-    $bgcolor-resize-button: $primary;
-    $color-resize-button-hover: $color-global;
-    $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
-    // Sidebar contents
-    $bgcolor-sidebar-context: #3c403c;
-    $color-sidebar-context: $color-global;
-    // Sidebar list group
-    // $bgcolor-sidebar-list-group: #; // optional
-
-    // Icon colors
-    $color-editor-icons: $color-global;
-
-    // Border colors
-    $border-color-theme: $primary;
-    $bordercolor-inline-code: #4d4d4d; // optional
-
-    // Dropdown colors
-    $color-dropdown-link-active: $color-global;
-    $color-dropdown-link-hover: $color-reversal;
-
-    // admin theme box
-    $color-theme-color-box: $primary;
-
-    @import '../../styles/theme/apply-colors';
-    @import '../../styles/theme/apply-colors-dark';
-
-    // Navs
-    .nav-tabs {
-      border-bottom: $border-color-theme 1px solid;
-      .nav-link {
-        &:hover {
-          border-color: lighten($border-color-theme, 10%);
-          border-bottom: none;
-        }
-        &.active {
-          color: $color-link;
-          background-color: transparent;
-          border-color: $border-color-theme;
-        }
+:root[data-theme='dark'] .theme-jade-green {
+  // Theme colors
+  $themecolor: #38b48b;
+  $themedark: #333333;
+  $accentcolor: #212121;
+  $subthemecolor: #2e2e2e;
+
+  $primary: #38b48b;
+  $dark: #a7a7a7;
+
+  // Background colors
+  $bgcolor-global: $themedark;
+  $bgcolor-navbar: #2b2b2b;
+  $bgcolor-inline-code: $gray-100; //optional
+  $bgcolor-card: darken($themedark, 5%);
+  $bgcolor-blinked-section: rgba($primary, 0.5);
+  $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
+
+  // Font colors
+  $color-global: #ffffff;
+  $color-reversal: $gray-100;
+  $color-link: $primary;
+  $color-link-hover: lighten($color-link, 12%);
+  $color-link-wiki: $primary;
+  $color-link-wiki-hover: lighten($color-link-wiki, 12%);
+  $color-link-nabvar: $color-reversal;
+  $color-inline-code: $subthemecolor;
+  $color-inline-code: #c7254e; // optional
+  $color-search: $dark;
+
+  // List Group colors
+  // $color-list: $color-global;
+  $bgcolor-list: transparent;
+  $color-list-hover: $accentcolor;
+  // $bgcolor-list-hover: lighten($bgcolor-global, 3%);
+  // $color-list-active: $color-reversal;
+  // $bgcolor-list-active: $primary;
+
+  // Navbar
+  $bgcolor-navbar: #2c2c2c;
+  $bgcolor-search-top-dropdown: $themecolor;
+  $border-image-navbar: linear-gradient(to right, $primary 0%, darken($primary, 5%) 100%);
+
+  // Logo colors
+  $bgcolor-logo: #ffffff;
+  $fillcolor-logo-mark: #ffffff;
+  // $fillcolor-logo-mark: #4e5a60;
+
+  // Sidebar
+  $bgcolor-sidebar: $accentcolor;
+  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
+  $text-shadow-sidebar-nav-item-active: 0px 0px 10px $primary; // optional
+  // Sidebar resize button
+  $color-resize-button: $color-global;
+  $bgcolor-resize-button: $primary;
+  $color-resize-button-hover: $color-global;
+  $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
+  // Sidebar contents
+  $bgcolor-sidebar-context: #3c403c;
+  $color-sidebar-context: $color-global;
+  // Sidebar list group
+  // $bgcolor-sidebar-list-group: #; // optional
+
+  // Icon colors
+  $color-editor-icons: $color-global;
+
+  // Border colors
+  $border-color-theme: $primary;
+  $bordercolor-inline-code: #4d4d4d; // optional
+
+  // Dropdown colors
+  $color-dropdown-link-active: $color-global;
+  $color-dropdown-link-hover: $color-reversal;
+
+  // admin theme box
+  $color-theme-color-box: $primary;
+
+  @import '../../styles/theme/apply-colors';
+  @import '../../styles/theme/apply-colors-dark';
+
+  // Navs
+  .nav-tabs {
+    border-bottom: $border-color-theme 1px solid;
+    .nav-link {
+      &:hover {
+        border-color: lighten($border-color-theme, 10%);
+        border-bottom: none;
+      }
+      &.active {
+        color: $color-link;
+        background-color: transparent;
+        border-color: $border-color-theme;
       }
     }
+  }
 
-    // Table
-    .table {
-      color: white;
-    }
+  // Table
+  .table {
+    color: white;
+  }
 
-    // Button
-    .btn-group.grw-page-editor-mode-manager {
-      .btn.btn-outline-primary {
-        @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, darken($primary, 20%));
-      }
+  // Button
+  .btn-group.grw-page-editor-mode-manager {
+    .btn.btn-outline-primary {
+      @include page-editor-mode-manager.btn-page-editor-mode-manager(#ffffff, $primary, $primary, darken($primary, 20%));
     }
   }
 }

packages/app/src/components/Theme/ThemeJadeGreen.tsx

@@ -1,8 +1,8 @@
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeJadeGreen.module.scss';
+// import styles from './ThemeJadeGreen.module.scss';
 
 const ThemeJadeGreen = ({ children }: { children: JSX.Element }): JSX.Element => {
-  return <ThemeInjector className={styles.theme}>{children}</ThemeInjector>;
+  return <ThemeInjector className="theme-jade-green">{children}</ThemeInjector>;
 };
 export default ThemeJadeGreen;

packages/app/src/components/Theme/ThemeKibela.global.scss

@@ -1,5 +1,5 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 $bgcolor-theme: rgb(18, 86, 163);
@@ -8,7 +8,7 @@ $subthemecolor: rgb(88, 130, 250);
 $lightthemecolor: rgba(181, 203, 247, 0.61);
 
 // Light Mode
-.theme :global {
+:root .theme-kibela {
   // Background colors
   $bgcolor-navbar: white;
   $bgcolor-navbar-active: $bgcolor-theme;

packages/app/src/components/Theme/ThemeKibela.tsx

@@ -1,8 +1,8 @@
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeKibela.module.scss';
+// import styles from './ThemeKibela.module.scss';
 
 const ThemeKibela = ({ children }: { children: JSX.Element }): JSX.Element => {
-  return <ThemeInjector className={styles.theme}>{children}</ThemeInjector>;
+  return <ThemeInjector className="theme-kibela">{children}</ThemeInjector>;
 };
 export default ThemeKibela;

packages/app/src/components/Theme/ThemeMonoBlue.global.scss

@@ -1,205 +1,201 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
-.theme {
-  [data-color-scheme='light'] :global {
-    // Theme colors
-    $themecolor: #00587a;
-    $themelight: #f7fbfd;
-    $accentcolor: #16617d;
-    $subthemecolor: #186718;
-
-    $primary: $themecolor;
-
-    // Background colors
-    $bgcolor-global: $themelight;
-    $bgcolor-inline-code: $gray-100; //optional
-    $bgcolor-card: darken($themelight, 5%);
-    $bgcolor-blinked-section: rgba($primary, 0.1);
-    //$bgcolor-keyword-highlighted: $grw-marker-yellow;
-
-    // Font colors
-    $color-global: $themecolor;
-    $color-reversal: $gray-100;
-    $color-link: lighten($primary, 5%);
-    $color-link-hover: lighten($color-link, 12%);
-    $color-link-wiki: lighten($primary, 20%);
-    $color-link-wiki-hover: lighten($color-link-wiki, 20%);
-    $color-link-nabvar: $color-reversal;
-    $color-inline-code: #c7254e; // optional
-    $color-search: #c0d6df;
-
-    // List Group colors
-    // $color-list: $color-global;
-    $bgcolor-list: transparent;
-    $color-list-hover: $color-search;
-    $bgcolor-list-hover: lighten($primary, 70%);
-    // $color-list-active: $color-reversal;
-    // $bgcolor-list-active: $primary;
-
-    // Navbar
-    $bgcolor-navbar: #2a2929;
-    $bgcolor-search-top-dropdown: $themecolor;
-    $border-image-navbar: linear-gradient(to right, #54bafd 0%, #3d98a3 50%, #708b0b 100%);
-
-    // Logo colors
-    $bgcolor-logo: $themecolor;
-    $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
-
-    // Sidebar
-    $bgcolor-sidebar: $themecolor;
-    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
-    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
-    // Sidebar resize button
-    $color-resize-button: $color-reversal;
-    $bgcolor-resize-button: #209fd8;
-    $color-resize-button-hover: $color-reversal;
-    $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
-    // Sidebar contents
-    $color-sidebar-context: $color-global;
-    $bgcolor-sidebar-context: #f1fcff;
-    // Sidebar list group
-    // $bgcolor-sidebar-list-group: #; // optional
-
-    // Icon colors
-    $color-editor-icons: $color-global;
-
-    // Border colors
-    $border-color-theme: $gray-300;
-    $bordercolor-inline-code: #ccc8c8; // optional
-
-    // admin theme box
-    $color-theme-color-box: lighten($primary, 20%);
-
-    @import '../../styles/theme/apply-colors';
-    @import '../../styles/theme/apply-colors-light';
-
-    // Navs {
-    .nav-tabs {
-      border-bottom: $border-color-theme 1px solid;
-      .nav-link {
-        &:hover {
-          border-color: lighten($border-color-theme, 10%);
-          border-bottom: none;
-        }
-        &.active {
-          background-color: transparent;
-        }
+:root[data-theme='light'] .theme-mono-blue {
+  // Theme colors
+  $themecolor: #00587a;
+  $themelight: #f7fbfd;
+  $accentcolor: #16617d;
+  $subthemecolor: #186718;
+
+  $primary: $themecolor;
+
+  // Background colors
+  $bgcolor-global: $themelight;
+  $bgcolor-inline-code: $gray-100; //optional
+  $bgcolor-card: darken($themelight, 5%);
+  $bgcolor-blinked-section: rgba($primary, 0.1);
+  //$bgcolor-keyword-highlighted: $grw-marker-yellow;
+
+  // Font colors
+  $color-global: $themecolor;
+  $color-reversal: $gray-100;
+  $color-link: lighten($primary, 5%);
+  $color-link-hover: lighten($color-link, 12%);
+  $color-link-wiki: lighten($primary, 20%);
+  $color-link-wiki-hover: lighten($color-link-wiki, 20%);
+  $color-link-nabvar: $color-reversal;
+  $color-inline-code: #c7254e; // optional
+  $color-search: #c0d6df;
+
+  // List Group colors
+  // $color-list: $color-global;
+  $bgcolor-list: transparent;
+  $color-list-hover: $color-search;
+  $bgcolor-list-hover: lighten($primary, 70%);
+  // $color-list-active: $color-reversal;
+  // $bgcolor-list-active: $primary;
+
+  // Navbar
+  $bgcolor-navbar: #2a2929;
+  $bgcolor-search-top-dropdown: $themecolor;
+  $border-image-navbar: linear-gradient(to right, #54bafd 0%, #3d98a3 50%, #708b0b 100%);
+
+  // Logo colors
+  $bgcolor-logo: $themecolor;
+  $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
+
+  // Sidebar
+  $bgcolor-sidebar: $themecolor;
+  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.37); // optional
+  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
+  // Sidebar resize button
+  $color-resize-button: $color-reversal;
+  $bgcolor-resize-button: #209fd8;
+  $color-resize-button-hover: $color-reversal;
+  $bgcolor-resize-button-hover: lighten($bgcolor-resize-button, 5%);
+  // Sidebar contents
+  $color-sidebar-context: $color-global;
+  $bgcolor-sidebar-context: #f1fcff;
+  // Sidebar list group
+  // $bgcolor-sidebar-list-group: #; // optional
+
+  // Icon colors
+  $color-editor-icons: $color-global;
+
+  // Border colors
+  $border-color-theme: $gray-300;
+  $bordercolor-inline-code: #ccc8c8; // optional
+
+  // admin theme box
+  $color-theme-color-box: lighten($primary, 20%);
+
+  @import '../../styles/theme/apply-colors';
+  @import '../../styles/theme/apply-colors-light';
+
+  // Navs {
+  .nav-tabs {
+    border-bottom: $border-color-theme 1px solid;
+    .nav-link {
+      &:hover {
+        border-color: lighten($border-color-theme, 10%);
+        border-bottom: none;
       }
-    }
-    // Button
-    .btn-group.grw-page-editor-mode-manager {
-      .btn.btn-outline-primary {
-        @include page-editor-mode-manager.btn-page-editor-mode-manager($primary, lighten($primary, 65%), lighten($primary, 70%));
+      &.active {
+        background-color: transparent;
       }
     }
   }
+  // Button
+  .btn-group.grw-page-editor-mode-manager {
+    .btn.btn-outline-primary {
+      @include page-editor-mode-manager.btn-page-editor-mode-manager($primary, lighten($primary, 65%), lighten($primary, 70%));
+    }
+  }
 }
 
-.theme {
-  [data-color-scheme='dark'] :global {
-    // Theme colors
-    $themecolor: #00587a;
-    $themedark: #061f2f;
-    $accentcolor: #16617d;
-    $subthemecolor: #c1f1f0;
-
-    $primary: #0090c8;
-    $dark: #031018;
-
-    // Background colors
-    $bgcolor-global: $themedark;
-    $bgcolor-navbar: #27343b;
-    $bgcolor-inline-code: #1f1f22; //optional
-    $bgcolor-card: darken($themedark, 5%);
-    $bgcolor-blinked-section: rgba($primary, 0.5);
-    $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
-
-    // Font colors
-    $color-global: #d3d4d4;
-    $color-reversal: $gray-100;
-    $color-link: #97d1f0;
-    $color-link-hover: darken($color-link, 12%);
-    $color-link-wiki: lighten($primary, 20%);
-    $color-link-wiki-hover: lighten($color-link-wiki, 20%);
-    $color-link-nabvar: $color-reversal;
-    $color-inline-code: $subthemecolor;
-    $color-inline-code: #c7254e; // optional
-    $color-search: #000102;
-
-    // List Group colors
-    // $color-list: $color-global;
-    $bgcolor-list: transparent;
-    $color-list-hover: $accentcolor;
-    // $bgcolor-list-hover: lighten($bgcolor-global, 3%);
-    // $color-list-active: $color-reversal;
-    // $bgcolor-list-active: $primary;
-
-    // Navbar
-    $bgcolor-navbar: #2a2929;
-    $bgcolor-search-top-dropdown: $themecolor;
-    $border-image-navbar: linear-gradient(to right, #54bafd 0%, #3d98a3 50%, #708b0b 100%);
-
-    // Logo colors
-    $bgcolor-logo: #13191c;
-    $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
-    // $fillcolor-logo-mark: #4e5a60;
-
-    // Sidebar
-    $bgcolor-sidebar: $accentcolor;
-    // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
-    $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
-    // Sidebar resize button
-    $color-resize-button: $color-global;
-    $bgcolor-resize-button: $themecolor;
-    $color-resize-button-hover: $color-global;
-    $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
-    // Sidebar contents
-    $bgcolor-sidebar-context: darken($bgcolor-sidebar, 13%);
-    $color-sidebar-context: $color-global;
-    // Sidebar list group
-    // $bgcolor-sidebar-list-group: #; // optional
-
-    // Icon colors
-    $color-editor-icons: $color-global;
-
-    // Border colors
-    $border-color-theme: #146aa0;
-    $bordercolor-inline-code: #4d4d4d; // optional
-
-    // admin theme box
-    $color-theme-color-box: $primary;
-
-    @import '../../styles/theme/apply-colors';
-    @import '../../styles/theme/apply-colors-dark';
-
-    // Navs
-    .nav-tabs {
-      border-bottom: $border-color-theme 1px solid;
-      .nav-link {
-        &:hover {
-          border-color: lighten($border-color-theme, 10%);
-          border-bottom: none;
-        }
-        &.active {
-          color: $color-link;
-          background-color: transparent;
-          border-color: $border-color-theme;
-        }
+:root[data-theme='dark'] .theme-mono-blue {
+  // Theme colors
+  $themecolor: #00587a;
+  $themedark: #061f2f;
+  $accentcolor: #16617d;
+  $subthemecolor: #c1f1f0;
+
+  $primary: #0090c8;
+  $dark: #031018;
+
+  // Background colors
+  $bgcolor-global: $themedark;
+  $bgcolor-navbar: #27343b;
+  $bgcolor-inline-code: #1f1f22; //optional
+  $bgcolor-card: darken($themedark, 5%);
+  $bgcolor-blinked-section: rgba($primary, 0.5);
+  $bgcolor-keyword-highlighted: darken($grw-marker-red, 30%);
+
+  // Font colors
+  $color-global: #d3d4d4;
+  $color-reversal: $gray-100;
+  $color-link: #97d1f0;
+  $color-link-hover: darken($color-link, 12%);
+  $color-link-wiki: lighten($primary, 20%);
+  $color-link-wiki-hover: lighten($color-link-wiki, 20%);
+  $color-link-nabvar: $color-reversal;
+  $color-inline-code: $subthemecolor;
+  $color-inline-code: #c7254e; // optional
+  $color-search: #000102;
+
+  // List Group colors
+  // $color-list: $color-global;
+  $bgcolor-list: transparent;
+  $color-list-hover: $accentcolor;
+  // $bgcolor-list-hover: lighten($bgcolor-global, 3%);
+  // $color-list-active: $color-reversal;
+  // $bgcolor-list-active: $primary;
+
+  // Navbar
+  $bgcolor-navbar: #2a2929;
+  $bgcolor-search-top-dropdown: $themecolor;
+  $border-image-navbar: linear-gradient(to right, #54bafd 0%, #3d98a3 50%, #708b0b 100%);
+
+  // Logo colors
+  $bgcolor-logo: #13191c;
+  $fillcolor-logo-mark: lighten(desaturate($bgcolor-navbar, 10%), 15%);
+  // $fillcolor-logo-mark: #4e5a60;
+
+  // Sidebar
+  $bgcolor-sidebar: $accentcolor;
+  // $bgcolor-sidebar-nav-item-active: rgba(#, 0.3); // optional
+  $text-shadow-sidebar-nav-item-active: 0px 0px 10px #0099ff; // optional
+  // Sidebar resize button
+  $color-resize-button: $color-global;
+  $bgcolor-resize-button: $themecolor;
+  $color-resize-button-hover: $color-global;
+  $bgcolor-resize-button-hover: darken($bgcolor-resize-button, 5%);
+  // Sidebar contents
+  $bgcolor-sidebar-context: darken($bgcolor-sidebar, 13%);
+  $color-sidebar-context: $color-global;
+  // Sidebar list group
+  // $bgcolor-sidebar-list-group: #; // optional
+
+  // Icon colors
+  $color-editor-icons: $color-global;
+
+  // Border colors
+  $border-color-theme: #146aa0;
+  $bordercolor-inline-code: #4d4d4d; // optional
+
+  // admin theme box
+  $color-theme-color-box: $primary;
+
+  @import '../../styles/theme/apply-colors';
+  @import '../../styles/theme/apply-colors-dark';
+
+  // Navs
+  .nav-tabs {
+    border-bottom: $border-color-theme 1px solid;
+    .nav-link {
+      &:hover {
+        border-color: lighten($border-color-theme, 10%);
+        border-bottom: none;
+      }
+      &.active {
+        color: $color-link;
+        background-color: transparent;
+        border-color: $border-color-theme;
       }
     }
+  }
 
-    // Table
-    .table {
-      color: white;
-    }
+  // Table
+  .table {
+    color: white;
+  }
 
-    // Button
-    .btn-group.grw-page-editor-mode-manager {
-      .btn.btn-outline-primary {
-        @include page-editor-mode-manager.btn-page-editor-mode-manager(lighten($primary, 30%), $primary, darken($primary, 10%), darken($primary, 20%));
-      }
+  // Button
+  .btn-group.grw-page-editor-mode-manager {
+    .btn.btn-outline-primary {
+      @include page-editor-mode-manager.btn-page-editor-mode-manager(lighten($primary, 30%), $primary, darken($primary, 10%), darken($primary, 20%));
     }
   }
 }

packages/app/src/components/Theme/ThemeMonoBlue.tsx

@@ -1,8 +1,8 @@
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeMonoBlue.module.scss';
+// import styles from './ThemeMonoBlue.module.scss';
 
 const ThemeMonoBlue = ({ children }: { children: JSX.Element }): JSX.Element => {
-  return <ThemeInjector className={styles.theme}>{children}</ThemeInjector>;
+  return <ThemeInjector className="theme-mono-blue">{children}</ThemeInjector>;
 };
 export default ThemeMonoBlue;

packages/app/src/components/Theme/ThemeNature.global.scss

@@ -1,5 +1,5 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 // == Define Bootstrap theme colors
@@ -36,7 +36,7 @@ $themecolor: #12b105;
 
 //== Light Mode
 //
-.theme :global {
+:root .theme-nature {
   $primary: #460039;
   $light: $gray-100;
 

packages/app/src/components/Theme/ThemeNature.tsx

@@ -1,8 +1,8 @@
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeNature.module.scss';
+// import styles from './ThemeNature.module.scss';
 
 const ThemeNature = ({ children }: { children: JSX.Element }): JSX.Element => {
-  return <ThemeInjector className={styles.theme}>{children}</ThemeInjector>;
+  return <ThemeInjector className="theme-nature">{children}</ThemeInjector>;
 };
 export default ThemeNature;

packages/app/src/components/Theme/ThemeSpring.global.scss

@@ -1,5 +1,5 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 @use '../../styles/bootstrap/init' as bs;
 
@@ -25,22 +25,9 @@ $accentcolor: #e08dbc;
   border-bottom: $accentcolor 4px solid;
 }
 
-.theme :global {
-  .grw-bg-image-wrapper {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-  }
-
-  .grw-bg-image {
-    object-fit: cover;
-    object-position: bottom;
-  }
-}
-
 //== Light Mode
 //
-.theme :global {
+:root .theme-spring {
   $primary: $themecolor;
   $secondary: $accentcolor;
 

packages/app/src/components/Theme/ThemeSpring.tsx

@@ -4,7 +4,7 @@ import { Themes } from '~/stores/use-next-themes';
 
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeSpring.module.scss';
+// import styles from './ThemeSpring.module.scss';
 
 export const getBackgroundImageSrc = (colorScheme: Themes): string => {
   switch (colorScheme) {
@@ -19,17 +19,14 @@ type Props = {
 }
 
 const ThemeSpring = ({ children, colorScheme }: Props): JSX.Element => {
-  const newChildren = (
+  const bgImageNode = (
     <>
       {colorScheme != null && (
-        <div className='grw-bg-image-wrapper'>
-          <Image className='grw-bg-image' alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
-        </div>
+        <Image alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
       )}
-      {children}
     </>
   );
-  return <ThemeInjector className={styles.theme}>{newChildren}</ThemeInjector>;
+  return <ThemeInjector className="theme-spring" bgImageNode={bgImageNode}>{children}</ThemeInjector>;
 };
 
 export default ThemeSpring;

packages/app/src/components/Theme/ThemeWood.global.scss

@@ -1,5 +1,5 @@
-@use '../../styles/variables' as *;
-@use '../../styles/bootstrap/variables' as *;
+// @use '../../styles/variables' as *;
+// @use '../../styles/bootstrap/variables' as *;
 @use '../../styles/theme/mixins/page-editor-mode-manager';
 
 // == Define Bootstrap theme colors
@@ -34,22 +34,9 @@
 $themecolor: #b9b177;
 $themelight: #f5f3ee;
 
-.theme :global {
-  .grw-bg-image-wrapper {
-    position: fixed;
-    width: 100%;
-    height: 100%;
-  }
-
-  .grw-bg-image {
-    object-fit: cover;
-    object-position: center center;
-  }
-}
-
 //== Light Mode
 //
-.theme :global {
+:root .theme-wood {
   $primary: #aaa45f;
 
   // Background colors

packages/app/src/components/Theme/ThemeWood.tsx

@@ -4,7 +4,7 @@ import { Themes } from '~/stores/use-next-themes';
 
 import { ThemeInjector } from './utils/ThemeInjector';
 
-import styles from './ThemeWood.module.scss';
+// import styles from './ThemeWood.module.scss';
 
 export const getBackgroundImageSrc = (colorScheme: Themes): string => {
   switch (colorScheme) {
@@ -19,17 +19,14 @@ type Props = {
 }
 
 const ThemeWood = ({ children, colorScheme }: Props): JSX.Element => {
-  const newChildren = (
+  const bgImageNode = (
     <>
       {colorScheme != null && (
-        <div className='grw-bg-image-wrapper'>
-          <Image className='grw-bg-image' alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
-        </div>
+        <Image alt='background image' src={getBackgroundImageSrc(colorScheme)} layout='fill' quality="100" />
       )}
-      {children}
     </>
   );
-  return <ThemeInjector className={styles.theme}>{newChildren}</ThemeInjector>;
+  return <ThemeInjector className="theme-wood" bgImageNode={bgImageNode}>{children}</ThemeInjector>;
 };
 
 export default ThemeWood;