diff --git a/apps/taiga-lumbermill/src/components/app/app.component.html b/apps/taiga-lumbermill/src/components/app/app.component.html
index b54876d26..72273050a 100644
--- a/apps/taiga-lumbermill/src/components/app/app.component.html
+++ b/apps/taiga-lumbermill/src/components/app/app.component.html
@@ -1,3 +1,3 @@
-<tui-root [attr.tuiTheme]="themeService.theme">
+<tui-root [attr.tuiTheme]="darkMode() ? 'dark' : null">
     <app-navigation />
 </tui-root>
diff --git a/apps/taiga-lumbermill/src/components/app/app.component.ts b/apps/taiga-lumbermill/src/components/app/app.component.ts
index 3458d60b9..cedef18ce 100644
--- a/apps/taiga-lumbermill/src/components/app/app.component.ts
+++ b/apps/taiga-lumbermill/src/components/app/app.component.ts
@@ -1,8 +1,7 @@
 import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
 import {RouterModule} from '@angular/router';
-import {TuiRoot} from '@taiga-ui/core';
+import {TUI_DARK_MODE, TuiRoot} from '@taiga-ui/core';
 
-import {ThemeService} from '../../services/theme.service';
 import {NavigationComponent} from '../navigation/navigation.component';
 
 @Component({
@@ -13,6 +12,5 @@ import {NavigationComponent} from '../navigation/navigation.component';
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AppComponent {
-    protected themeService = inject(ThemeService);
-    public title = 'taiga-lumbermill';
+    protected readonly darkMode = inject(TUI_DARK_MODE);
 }
diff --git a/apps/taiga-lumbermill/src/components/app/app.routes.ts b/apps/taiga-lumbermill/src/components/app/app.routes.ts
index 7a74da1ba..bbbf3921b 100644
--- a/apps/taiga-lumbermill/src/components/app/app.routes.ts
+++ b/apps/taiga-lumbermill/src/components/app/app.routes.ts
@@ -12,7 +12,7 @@ export const appRoutes: Route[] = [
                 path: '',
                 loadComponent: async () =>
                     import(
-                        '../../dashboards/dashboards-list/dashboards-list.component'
+                        '../../components/dashboards-list/dashboards-list.component'
                     ).then((mod) => mod.DashboardsListComponent),
                 data: {title: ''},
             },
@@ -37,28 +37,28 @@ export const appRoutes: Route[] = [
     {
         path: 'theme',
         loadComponent: async () =>
-            import('../../dashboards/theme-generator/theme-generator.component').then(
+            import('../../features/theme-generator/theme-generator.component').then(
                 (mod) => mod.ThemeGeneratorComponent,
             ),
     },
     {
         path: '',
         loadComponent: async () =>
-            import('../../dashboards/common-page/common-page.component').then(
+            import('../../components/common-page/common-page.component').then(
                 (mod) => mod.CommonPageComponent,
             ),
     },
     {
         path: 'login',
         loadComponent: async () =>
-            import('../../dashboards/login/login.component').then(
+            import('../../features/login/login.component').then(
                 (mod) => mod.LoginComponent,
             ),
     },
     {
         path: 'sign-up',
         loadComponent: async () =>
-            import('../../dashboards/sign-up/sign-up.component').then(
+            import('../../features/sign-up/sign-up.component').then(
                 (mod) => mod.SignUpComponent,
             ),
     },
diff --git a/apps/taiga-lumbermill/src/dashboards/common-page/common-page.component.html b/apps/taiga-lumbermill/src/components/common-page/common-page.component.html
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/common-page/common-page.component.html
rename to apps/taiga-lumbermill/src/components/common-page/common-page.component.html
diff --git a/apps/taiga-lumbermill/src/dashboards/common-page/common-page.component.less b/apps/taiga-lumbermill/src/components/common-page/common-page.component.less
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/common-page/common-page.component.less
rename to apps/taiga-lumbermill/src/components/common-page/common-page.component.less
diff --git a/apps/taiga-lumbermill/src/dashboards/common-page/common-page.component.ts b/apps/taiga-lumbermill/src/components/common-page/common-page.component.ts
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/common-page/common-page.component.ts
rename to apps/taiga-lumbermill/src/components/common-page/common-page.component.ts
diff --git a/apps/taiga-lumbermill/src/dashboards/dashboards-list/dashboards-list.component.html b/apps/taiga-lumbermill/src/components/dashboards-list/dashboards-list.component.html
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/dashboards-list/dashboards-list.component.html
rename to apps/taiga-lumbermill/src/components/dashboards-list/dashboards-list.component.html
diff --git a/apps/taiga-lumbermill/src/dashboards/dashboards-list/dashboards-list.component.less b/apps/taiga-lumbermill/src/components/dashboards-list/dashboards-list.component.less
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/dashboards-list/dashboards-list.component.less
rename to apps/taiga-lumbermill/src/components/dashboards-list/dashboards-list.component.less
diff --git a/apps/taiga-lumbermill/src/dashboards/dashboards-list/dashboards-list.component.ts b/apps/taiga-lumbermill/src/components/dashboards-list/dashboards-list.component.ts
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/dashboards-list/dashboards-list.component.ts
rename to apps/taiga-lumbermill/src/components/dashboards-list/dashboards-list.component.ts
diff --git a/apps/taiga-lumbermill/src/components/navigation/navigation.component.html b/apps/taiga-lumbermill/src/components/navigation/navigation.component.html
index ad56e423a..4b06d2e34 100644
--- a/apps/taiga-lumbermill/src/components/navigation/navigation.component.html
+++ b/apps/taiga-lumbermill/src/components/navigation/navigation.component.html
@@ -2,69 +2,158 @@
     <button
         appearance="secondary"
         iconStart="@tui.layout-grid"
+        tuiDropdownOpen
         tuiIconButton
         type="button"
+        [tuiDropdown]="menu"
     >
         Menu
+        <ng-template #menu>
+            <tui-data-list
+                *ngIf="mobile()"
+                size="s"
+            >
+                <button
+                    iconStart="@tui.palette"
+                    routerLink="/theme"
+                    tuiOption
+                    type="button"
+                >
+                    Theme Generator
+                </button>
+                <button
+                    iconStart="@tui.layout-dashboard"
+                    routerLink="/dashboards/iot"
+                    tuiOption
+                    type="button"
+                >
+                    Iot dashboard
+                </button>
+                <button
+                    iconStart="@tui.layout-dashboard"
+                    routerLink="/dashboards/crypto"
+                    tuiOption
+                    type="button"
+                >
+                    Crypto dashboard
+                </button>
+                <button
+                    iconStart="@tui.log-in"
+                    routerLink="/theme"
+                    tuiOption
+                    type="button"
+                >
+                    Log in
+                </button>
+                <button
+                    iconStart="@tui.key-round"
+                    routerLink="/theme"
+                    tuiOption
+                    type="button"
+                >
+                    Sign up
+                </button>
+            </tui-data-list>
+        </ng-template>
     </button>
     <span tuiNavigationLogo>
         <tui-icon icon="@tui.home" />
         <span tuiFade>Taiga lumbermill</span>
     </span>
+
+    <hr />
+
     <button
         appearance="secondary"
-        tuiButton
-        tuiChevron
+        size="s"
+        tuiIconButton
         type="button"
-        [tuiDropdown]="products"
-        [(tuiDropdownOpen)]="openTheme"
-    >
-        <span tuiFade>{{ themeService.theme }}</span>
-        <ng-template #products>
-            <tui-data-list size="s">
-                @for (theme of themeService.themes; track $index) {
-                    <button
-                        tuiOption
-                        type="button"
-                        [value]="theme"
-                        (click)="chooseTheme(theme)"
-                    >
-                        {{ theme }}
-                        <tui-icon
-                            *ngIf="themeService.theme === theme"
-                            icon="@tui.check"
-                            [style.font-size.em]="1"
-                            [style.margin-left.rem]="0.5"
-                        />
-                    </button>
-                }
-            </tui-data-list>
-        </ng-template>
-    </button>
-    <hr />
+        class="tui-doc-dark-mode-switch"
+        [iconStart]="icon()"
+        [style.border-radius.%]="100"
+        (click)="darkMode.set(!darkMode())"
+    ></button>
 </header>
 <div [style.display]="'flex'">
     <aside
-        *ngIf="!(mobile$ | async)"
+        *ngIf="!mobile()"
         class="aside-bar"
         [tuiNavigationAside]="expanded"
     >
         <header>
-            <a
+            <button
                 iconStart="@tui.home"
                 routerLink="/"
                 tuiAsideItem
+                type="button"
+                [routerLinkActiveOptions]="{exact: true}"
             >
                 <span tuiFade>Taiga lumbermill</span>
-            </a>
+            </button>
         </header>
-        <a
+        <tui-aside-group>
+            <button
+                iconStart="@tui.layout-dashboard"
+                tuiAsideItem
+                tuiChevron
+                type="button"
+            >
+                Dashboards
+                <ng-template>
+                    <button
+                        routerLink="/dashboards/iot"
+                        tuiAsideItem
+                        type="button"
+                    >
+                        IOT
+                    </button>
+                    <button
+                        routerLink="/dashboards/crypto"
+                        tuiAsideItem
+                        type="button"
+                    >
+                        Crypto
+                    </button>
+                </ng-template>
+            </button>
+        </tui-aside-group>
+        <tui-aside-group>
+            <button
+                iconStart="@tui.square-library"
+                tuiAsideItem
+                tuiChevron
+                type="button"
+            >
+                Features
+                <ng-template>
+                    <button
+                        iconStart="@tui.log-in"
+                        routerLink="/login"
+                        tuiAsideItem
+                        type="button"
+                    >
+                        Log in
+                    </button>
+                    <button
+                        iconStart="@tui.key-round"
+                        routerLink="/sign-up"
+                        tuiAsideItem
+                        type="button"
+                    >
+                        Sign up
+                    </button>
+                </ng-template>
+            </button>
+        </tui-aside-group>
+        <hr />
+        <button
             iconStart="@tui.palette"
             routerLink="/theme"
             tuiAsideItem
+            type="button"
         >
             Theme Generator
-        </a>
+        </button>
         <footer>
             <button
                 tuiAsideItem
diff --git a/apps/taiga-lumbermill/src/components/navigation/navigation.component.ts b/apps/taiga-lumbermill/src/components/navigation/navigation.component.ts
index 1f4980ca8..f5a13b94a 100644
--- a/apps/taiga-lumbermill/src/components/navigation/navigation.component.ts
+++ b/apps/taiga-lumbermill/src/components/navigation/navigation.component.ts
@@ -1,58 +1,37 @@
-import {CommonModule} from '@angular/common';
-import {ChangeDetectionStrategy, Component, inject} from '@angular/core';
-import {RouterLink, RouterLinkActive, RouterModule} from '@angular/router';
-import {TuiRepeatTimes} from '@taiga-ui/cdk';
+import {NgIf} from '@angular/common';
+import {ChangeDetectionStrategy, Component, computed, inject} from '@angular/core';
+import {toSignal} from '@angular/core/rxjs-interop';
+import {RouterLink, RouterLinkActive, RouterOutlet} from '@angular/router';
 import {
+    TUI_DARK_MODE,
     TuiAppearance,
     TuiBreakpointService,
     TuiButton,
     TuiDataList,
     TuiDropdown,
-    TuiExpand,
     TuiIcon,
-    TuiSurface,
     TuiTitle,
 } from '@taiga-ui/core';
-import {
-    TuiAvatar,
-    TuiBadge,
-    TuiBadgeNotification,
-    TuiChevron,
-    TuiFade,
-    TuiTabs,
-} from '@taiga-ui/kit';
-import {TuiCardLarge, TuiHeader, TuiNavigation} from '@taiga-ui/layout';
+import {TuiChevron, TuiFade} from '@taiga-ui/kit';
+import {TuiNavigation} from '@taiga-ui/layout';
 import {map} from 'rxjs';
 
-import {IotComponent} from '../../dashboards/iot/iot.component';
-import {ThemeService} from '../../services/theme.service';
-
 @Component({
     standalone: true,
     selector: 'app-navigation',
     imports: [
-        CommonModule,
-        IotComponent,
+        NgIf,
         RouterLink,
         RouterLinkActive,
-        RouterModule,
+        RouterOutlet,
         TuiAppearance,
-        TuiAvatar,
-        TuiBadge,
-        TuiBadgeNotification,
         TuiButton,
-        TuiCardLarge,
         TuiChevron,
         TuiDataList,
         TuiDropdown,
-        TuiExpand,
         TuiFade,
-        TuiHeader,
         TuiIcon,
         TuiNavigation,
-        TuiRepeatTimes,
-        TuiSurface,
-        TuiTabs,
         TuiTitle,
     ],
     templateUrl: './navigation.component.html',
@@ -60,18 +39,14 @@ import {ThemeService} from '../../services/theme.service';
     changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class NavigationComponent {
-    protected themeService = inject(ThemeService);
-    protected readonly mobile$ = inject(TuiBreakpointService).pipe(
-        map((key) => key === 'mobile'),
+    protected readonly mobile = toSignal(
+        inject(TuiBreakpointService).pipe(map((key) => key === 'mobile')),
     );
 
-    protected open = false;
-    protected expanded = false;
-    protected submenu = false;
-    protected openTheme = false;
+    protected readonly darkMode = inject(TUI_DARK_MODE);
+    protected readonly icon = computed(() =>
+        this.darkMode() ? '@tui.sun' : '@tui.moon',
+    );
 
-    public chooseTheme(theme: string): void {
-        this.themeService.theme = theme;
-        this.openTheme = false;
-    }
+    protected expanded = false;
 }
diff --git a/apps/taiga-lumbermill/src/dashboards/crypto/components/pools/pools.component.ts b/apps/taiga-lumbermill/src/dashboards/crypto/components/pools/pools.component.ts
index b8093b55a..9830b103f 100644
--- a/apps/taiga-lumbermill/src/dashboards/crypto/components/pools/pools.component.ts
+++ b/apps/taiga-lumbermill/src/dashboards/crypto/components/pools/pools.component.ts
@@ -20,8 +20,8 @@ import {TuiAvatar, TuiAvatarStack, TuiSkeleton} from '@taiga-ui/kit';
 import {TuiCardLarge, TuiCell, TuiHeader} from '@taiga-ui/layout';
 import {TuiInputModule} from '@taiga-ui/legacy';
 
-import {CryptoService} from '../../../../services/crypto.service';
 import {CoinIconPipe} from '../../pipes/coin-icon.pipe';
+import {CryptoService} from '../../services/crypto.service';
 
 export interface TableData {
     readonly Pair: string;
diff --git a/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/price-chart/price-chart.component.ts b/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/price-chart/price-chart.component.ts
index 738773d17..c9cb76e64 100644
--- a/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/price-chart/price-chart.component.ts
+++ b/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/price-chart/price-chart.component.ts
@@ -21,8 +21,8 @@ import {TuiAppearance, TuiButton, TuiHint, TuiSurface} from '@taiga-ui/core';
 import {TuiSkeleton} from '@taiga-ui/kit';
 import {combineLatest, switchMap} from 'rxjs';
 
-import type {HistoryData} from '../../../../../services/crypto.service';
-import {CryptoService} from '../../../../../services/crypto.service';
+import type {HistoryData} from '../../../services/crypto.service';
+import {CryptoService} from '../../../services/crypto.service';
 import {INTERVALS} from './price-chart.constant';
 
 @Component({
diff --git a/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/price-list/price-list.component.ts b/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/price-list/price-list.component.ts
index 19a3b560a..ffefd9ca7 100644
--- a/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/price-list/price-list.component.ts
+++ b/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/price-list/price-list.component.ts
@@ -11,7 +11,7 @@ import {TuiAppearance, TuiButton, TuiTitle} from '@taiga-ui/core';
 import {TuiAvatar, TuiSkeleton} from '@taiga-ui/kit';
 import {TuiCardLarge, TuiCell, TuiHeader} from '@taiga-ui/layout';
 
-import {CryptoService} from '../../../../../services/crypto.service';
+import {CryptoService} from '../../../services/crypto.service';
 
 @Component({
     standalone: true,
diff --git a/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/prices.component.ts b/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/prices.component.ts
index 116b6bef8..a99d2e26f 100644
--- a/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/prices.component.ts
+++ b/apps/taiga-lumbermill/src/dashboards/crypto/components/prices/prices.component.ts
@@ -4,7 +4,7 @@ import {TuiAppearance, TuiTitle} from '@taiga-ui/core';
 import {TuiSkeleton} from '@taiga-ui/kit';
 import {TuiCardLarge, TuiHeader} from '@taiga-ui/layout';
 
-import {CryptoService} from '../../../../services/crypto.service';
+import {CryptoService} from '../../services/crypto.service';
 import {PriceChartComponent} from './price-chart/price-chart.component';
 import {PriceListComponent} from './price-list/price-list.component';
 
diff --git a/apps/taiga-lumbermill/src/dashboards/crypto/components/staking/staking.component.ts b/apps/taiga-lumbermill/src/dashboards/crypto/components/staking/staking.component.ts
index 75ca7c9c6..41552a32e 100644
--- a/apps/taiga-lumbermill/src/dashboards/crypto/components/staking/staking.component.ts
+++ b/apps/taiga-lumbermill/src/dashboards/crypto/components/staking/staking.component.ts
@@ -22,8 +22,8 @@ import {TuiCardLarge, TuiHeader} from '@taiga-ui/layout';
 import {TuiInputNumberModule} from '@taiga-ui/legacy';
 import type {PolymorpheusContent} from '@taiga-ui/polymorpheus';
 
-import {CryptoService} from '../../../../services/crypto.service';
 import {CoinIconPipe} from '../../pipes/coin-icon.pipe';
+import {CryptoService} from '../../services/crypto.service';
 
 @Component({
     standalone: true,
diff --git a/apps/taiga-lumbermill/src/dashboards/crypto/components/swap/swap.component.ts b/apps/taiga-lumbermill/src/dashboards/crypto/components/swap/swap.component.ts
index 6e276d985..a6538dbb0 100644
--- a/apps/taiga-lumbermill/src/dashboards/crypto/components/swap/swap.component.ts
+++ b/apps/taiga-lumbermill/src/dashboards/crypto/components/swap/swap.component.ts
@@ -20,7 +20,7 @@ import {
 import {TuiAvatar, TuiChevron, TuiInputInline, TuiSkeleton} from '@taiga-ui/kit';
 import {TuiCardLarge, TuiCell, TuiHeader} from '@taiga-ui/layout';
 
-import {CryptoService} from '../../../../services/crypto.service';
+import {CryptoService} from '../../services/crypto.service';
 
 @Component({
     standalone: true,
diff --git a/apps/taiga-lumbermill/src/services/crypto.service.ts b/apps/taiga-lumbermill/src/dashboards/crypto/services/crypto.service.ts
similarity index 100%
rename from apps/taiga-lumbermill/src/services/crypto.service.ts
rename to apps/taiga-lumbermill/src/dashboards/crypto/services/crypto.service.ts
diff --git a/apps/taiga-lumbermill/src/dashboards/login/login.component.html b/apps/taiga-lumbermill/src/features/login/login.component.html
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/login/login.component.html
rename to apps/taiga-lumbermill/src/features/login/login.component.html
diff --git a/apps/taiga-lumbermill/src/dashboards/login/login.component.less b/apps/taiga-lumbermill/src/features/login/login.component.less
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/login/login.component.less
rename to apps/taiga-lumbermill/src/features/login/login.component.less
diff --git a/apps/taiga-lumbermill/src/dashboards/login/login.component.ts b/apps/taiga-lumbermill/src/features/login/login.component.ts
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/login/login.component.ts
rename to apps/taiga-lumbermill/src/features/login/login.component.ts
diff --git a/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.html b/apps/taiga-lumbermill/src/features/sign-up/sign-up.component.html
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.html
rename to apps/taiga-lumbermill/src/features/sign-up/sign-up.component.html
diff --git a/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.less b/apps/taiga-lumbermill/src/features/sign-up/sign-up.component.less
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.less
rename to apps/taiga-lumbermill/src/features/sign-up/sign-up.component.less
diff --git a/apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.ts b/apps/taiga-lumbermill/src/features/sign-up/sign-up.component.ts
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/sign-up/sign-up.component.ts
rename to apps/taiga-lumbermill/src/features/sign-up/sign-up.component.ts
diff --git a/apps/taiga-lumbermill/src/dashboards/theme-generator/theme-example/theme-example.component.html b/apps/taiga-lumbermill/src/features/theme-generator/theme-example/theme-example.component.html
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/theme-generator/theme-example/theme-example.component.html
rename to apps/taiga-lumbermill/src/features/theme-generator/theme-example/theme-example.component.html
diff --git a/apps/taiga-lumbermill/src/dashboards/theme-generator/theme-example/theme-example.component.less b/apps/taiga-lumbermill/src/features/theme-generator/theme-example/theme-example.component.less
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/theme-generator/theme-example/theme-example.component.less
rename to apps/taiga-lumbermill/src/features/theme-generator/theme-example/theme-example.component.less
diff --git a/apps/taiga-lumbermill/src/dashboards/theme-generator/theme-example/theme-example.component.ts b/apps/taiga-lumbermill/src/features/theme-generator/theme-example/theme-example.component.ts
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/theme-generator/theme-example/theme-example.component.ts
rename to apps/taiga-lumbermill/src/features/theme-generator/theme-example/theme-example.component.ts
diff --git a/apps/taiga-lumbermill/src/dashboards/theme-generator/theme-generator.component.html b/apps/taiga-lumbermill/src/features/theme-generator/theme-generator.component.html
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/theme-generator/theme-generator.component.html
rename to apps/taiga-lumbermill/src/features/theme-generator/theme-generator.component.html
diff --git a/apps/taiga-lumbermill/src/dashboards/theme-generator/theme-generator.component.less b/apps/taiga-lumbermill/src/features/theme-generator/theme-generator.component.less
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/theme-generator/theme-generator.component.less
rename to apps/taiga-lumbermill/src/features/theme-generator/theme-generator.component.less
diff --git a/apps/taiga-lumbermill/src/dashboards/theme-generator/theme-generator.component.ts b/apps/taiga-lumbermill/src/features/theme-generator/theme-generator.component.ts
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/theme-generator/theme-generator.component.ts
rename to apps/taiga-lumbermill/src/features/theme-generator/theme-generator.component.ts
diff --git a/apps/taiga-lumbermill/src/dashboards/theme-generator/theme-generator.constants.ts b/apps/taiga-lumbermill/src/features/theme-generator/theme-generator.constants.ts
similarity index 100%
rename from apps/taiga-lumbermill/src/dashboards/theme-generator/theme-generator.constants.ts
rename to apps/taiga-lumbermill/src/features/theme-generator/theme-generator.constants.ts
diff --git a/apps/taiga-lumbermill/src/services/theme.service.ts b/apps/taiga-lumbermill/src/services/theme.service.ts
deleted file mode 100644
index 0b2b5f174..000000000
--- a/apps/taiga-lumbermill/src/services/theme.service.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import {inject, Injectable} from '@angular/core';
-import {LOCAL_STORAGE} from '@ng-web-apis/common';
-import {tuiCreateToken} from '@taiga-ui/cdk';
-
-export const TUI_THEME_KEY = tuiCreateToken('data-tui-theme');
-
-@Injectable({
-    providedIn: 'root',
-})
-export class ThemeService {
-    private readonly storage = inject(LOCAL_STORAGE);
-    private readonly key = inject(TUI_THEME_KEY);
-    public themes = ['light', 'dark'];
-
-    public get theme(): string {
-        const value = this.storage.getItem(this.key);
-
-        if (value === null) {
-            this.storage.setItem(this.key, 'light');
-
-            return 'light';
-        }
-
-        return value;
-    }
-
-    public set theme(theme: string) {
-        this.storage.setItem(this.key, theme);
-    }
-}