From ce4525fadfd1b82e42d058f461e72972fb64172d Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <mihai.condrea@digisoftware.ro>
Date: Sun, 1 Dec 2024 10:54:51 +0200
Subject: [PATCH] feat(app): Rework app style, Ktor handling, and dynamic
 lessons (WIP)

Reworked the entire app style for a more polished and consistent look.
Improved Ktor handling for better network communication and data management.
Introduced more dynamic lessons with enhanced content and interactivity.
This work is still in progress and further improvements are planned.
---
 .idea/compiler.xml                            |   2 +-
 .idea/deploymentTargetSelector.xml            |   8 +
 .idea/gradle.xml                              |   1 +
 .idea/inspectionProfiles/Project_Default.xml  |  27 ++
 .idea/kotlinc.xml                             |   2 +-
 .idea/misc.xml                                |   3 +-
 .idea/other.xml                               | 252 ---------------
 .idea/runConfigurations.xml                   |  17 +
 .idea/studiobot.xml                           |   6 +
 CHANGELOG.md                                  |   9 +
 app/build.gradle.kts                          | 178 ++++++-----
 app/proguard-rules.pro                        |   4 -
 app/src/main/AndroidManifest.xml              |  60 ++--
 .../englishwithlidia/plus/MainActivity.kt     | 252 ---------------
 .../englishwithlidia/plus/MainComposable.kt   | 165 ----------
 .../plus/constants/api/ApiConstants.kt        |   5 +
 .../datastore/DataStoreNamesConstants.kt      |  14 +
 .../plus/constants/error/ErrorType.kt         |   5 +
 .../plus/data/client/KtorClient.kt            |  72 +++++
 .../plus/data/core/AppCoreManager.kt          | 180 ++++-------
 .../plus/data/core/ads/AdsCoreManager.kt      | 121 +++++++
 .../core/datastore/DataStoreCoreManager.kt    |  25 ++
 .../plus/data/datastore/DataStore.kt          |  26 +-
 .../plus/data/model/api/ApiResponse.kt        |  25 +-
 .../model/ui/animations/button/ButtonState.kt |   3 +
 .../plus/data/model/ui/error/UiErrorModel.kt  |   5 +
 .../data/model/ui/lessons/UiLessonsAsset.kt   |  20 --
 ...igationItem.kt => NavigationDrawerItem.kt} |   2 +-
 .../plus/data/model/ui/screens/UiLesson.kt    |  13 +
 .../{lessons => screens}/UiLessonDetails.kt   |   6 +-
 .../data/model/ui/screens/UiLessonsAsset.kt   |  17 +
 .../ui/components/FloatingActionButton.kt     |  52 +++
 .../components/Preferences.kt}                | 129 +++++---
 .../plus/ui/components/Snackbar.kt            |  34 ++
 .../components/ads/BannerAds.kt}              |   8 +-
 .../ui/components/animations/Animations.kt    | 129 ++++++++
 .../dialogs/LanguageDialogComposable.kt       |   2 +-
 .../dialogs/SelectLanguageAlertDialog.kt      | 112 +++++++
 .../dialogs/VersionInfoAlertDialog.kt         |  66 ++++
 .../dialogs/VersionInfoDialogComposable.kt    |   4 +-
 .../components}/drawable/HomeBanner.kt        |   2 +-
 .../components}/drawable/ImageUtils.kt        |   2 +-
 .../components/layouts/LessonContentLayout.kt |   3 +
 .../ui/components/layouts/LessonListLayout.kt | 182 +++++++++++
 .../components/navigation/NavigationDrawer.kt | 139 ++++++++
 .../ui/components/navigation/TopAppBar.kt     | 117 +++++++
 .../plus/ui/help/HelpComposable.kt            | 255 ---------------
 .../plus/ui/help/HelpViewModel.kt             |  47 ---
 .../plus/ui/home/HomeComposable.kt            | 222 -------------
 .../plus/ui/home/HomeViewModel.kt             |  30 --
 .../plus/ui/home/HomeViewModelFactory.kt      |  16 -
 .../ui/home/repository/LessonRepository.kt    |  44 ---
 .../plus/ui/lessons/LessonsComposable.kt      | 246 ---------------
 .../ui/{ => screens}/help/HelpActivity.kt     |   8 +-
 .../plus/ui/screens/help/HelpScreen.kt        | 296 ++++++++++++++++++
 .../plus/ui/screens/help/HelpViewModel.kt     |  62 ++++
 .../plus/ui/screens/home/HomeScreen.kt        |  66 ++++
 .../plus/ui/screens/home/HomeViewModel.kt     |  47 +++
 .../home/repository/LessonRepository.kt       |  21 ++
 .../LessonRepositoryImplementation.kt         |  60 ++++
 .../{ => screens}/lessons/LessonsActivity.kt  |   6 +-
 .../ui/screens/lessons/LessonsComposable.kt   | 224 +++++++++++++
 .../{ => screens}/lessons/LessonsViewModel.kt |   4 +-
 .../lessons/LessonsViewModelFactory.kt        |   4 +-
 .../plus/ui/screens/main/MainActivity.kt      | 147 +++++++++
 .../plus/ui/screens/main/MainScreen.kt        |  66 ++++
 .../plus/ui/screens/main/MainViewModel.kt     |  56 ++++
 .../screens/main/repository/MainRepository.kt |  76 +++++
 .../MainRepositoryImplementation.kt           |  92 ++++++
 .../settings/SettingsActivity.kt              |   8 +-
 .../ui/screens/settings/SettingsComposable.kt | 106 +++++++
 .../settings/about/AboutSettingsActivity.kt   |   6 +-
 .../settings/about/AboutSettingsComposable.kt | 102 ++++++
 .../advanced/AdvancedSettingsActivity.kt      |   6 +-
 .../advanced/AdvancedSettingsComposable.kt    |  45 +++
 .../display/DisplaySettingsActivity.kt        |   6 +-
 .../display/DisplaySettingsComposable.kt      | 169 ++++++++++
 .../display/theme/ThemeSettingsActivity.kt    |   6 +-
 .../display/theme/ThemeSettingsComposable.kt  |  83 +++--
 .../settings/display/theme/style/Color.kt     |  75 +++++
 .../settings/display/theme/style/Theme.kt     |  41 +--
 .../privacy/PrivacySettingsActivity.kt        |   6 +-
 .../privacy/PrivacySettingsComposable.kt      | 107 +++++++
 .../privacy/ads/AdsSettingsActivity.kt        |  27 +-
 .../privacy/ads/AdsSettingsComposable.kt      | 143 +++++++++
 .../PermissionsSettingsActivity.kt            |   6 +-
 .../PermissionsSettingsComposable.kt          |  64 ++++
 .../usage/UsageAndDiagnosticsActivity.kt      |   6 +-
 .../usage/UsageAndDiagnosticsComposable.kt    | 114 +++++++
 .../{ => screens}/startup/StartupActivity.kt  |  27 +-
 .../ui/screens/startup/StartupComposable.kt   | 139 ++++++++
 .../{ => screens}/support/SupportActivity.kt  |  18 +-
 .../support/SupportScreen.kt}                 |  95 +++---
 .../{ => screens}/support/SupportViewModel.kt |  10 +-
 .../plus/ui/settings/SettingsComposable.kt    |  97 ------
 .../settings/about/AboutSettingsComposable.kt |  89 ------
 .../advanced/AdvancedSettingsComposable.kt    |  60 ----
 .../display/DisplaySettingsComposable.kt      | 159 ----------
 .../ui/settings/display/theme/style/Color.kt  |  75 -----
 .../ui/settings/display/theme/style/Type.kt   |  60 ----
 .../privacy/PrivacySettingsComposable.kt      | 119 -------
 .../privacy/ads/AdsSettingsComposable.kt      | 137 --------
 .../PermissionsSettingsComposable.kt          |  85 -----
 .../usage/UsageAndDiagnosticsComposable.kt    | 117 -------
 .../plus/ui/startup/StartupComposable.kt      | 138 --------
 .../plus/ui/viewmodel/BaseViewModel.kt        |  90 ++++++
 .../plus/utils/ClipboardUtil.kt               |  20 ++
 .../plus/utils/IntentUtils.kt                 |  38 +++
 .../plus/utils/OpenSourceLicensesUtils.kt     | 103 ++++++
 .../plus/utils/compose/AnimationUtils.kt      |  47 ---
 .../plus/utils/error/ErrorHandler.kt          |  27 ++
 .../plus/utils/helpers/StringsHelper.kt       |   8 +
 .../interfaces/OnShowAdCompleteListener.kt    |   6 +
 .../ic_launcher.xml                           |   0
 .../ic_shortcut_lessons.xml                   |   0
 .../ic_shortcut_settings.xml                  |   0
 .../ic_shortcut_website.xml                   |   0
 app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 4362 bytes
 app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 2758 bytes
 .../main/res/mipmap-xhdpi/ic_launcher.webp    | Bin 0 -> 6096 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.webp   | Bin 0 -> 9788 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.webp  | Bin 0 -> 14124 bytes
 app/src/main/res/values/strings.xml           |  17 +-
 .../res/values/untranslatable_strings.xml     |   9 +
 build.gradle.kts                              |  18 +-
 gradle/libs.versions.toml                     |  93 +++---
 gradle/wrapper/gradle-wrapper.properties      |   4 +-
 127 files changed, 4318 insertions(+), 3314 deletions(-)
 delete mode 100644 .idea/other.xml
 create mode 100644 .idea/runConfigurations.xml
 create mode 100644 .idea/studiobot.xml
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/MainActivity.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/MainComposable.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/api/ApiConstants.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/datastore/DataStoreNamesConstants.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/error/ErrorType.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/client/KtorClient.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/ads/AdsCoreManager.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/datastore/DataStoreCoreManager.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/animations/button/ButtonState.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/error/UiErrorModel.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/lessons/UiLessonsAsset.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/navigation/{NavigationItem.kt => NavigationDrawerItem.kt} (85%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLesson.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/{lessons => screens}/UiLessonDetails.kt (72%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLessonsAsset.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/FloatingActionButton.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/{utils/compose/components/SettingsComposablesUtils.kt => ui/components/Preferences.kt} (74%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/Snackbar.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/{ads/BannerAdsComposable.kt => ui/components/ads/BannerAds.kt} (86%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/animations/Animations.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => components}/dialogs/LanguageDialogComposable.kt (98%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/SelectLanguageAlertDialog.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/VersionInfoAlertDialog.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => components}/dialogs/VersionInfoDialogComposable.kt (94%)
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/{utils => ui/components}/drawable/HomeBanner.kt (99%)
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/{utils => ui/components}/drawable/ImageUtils.kt (93%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/layouts/LessonContentLayout.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/layouts/LessonListLayout.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/navigation/NavigationDrawer.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/navigation/TopAppBar.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpComposable.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpViewModel.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeComposable.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeViewModel.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeViewModelFactory.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/repository/LessonRepository.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/help/HelpActivity.kt (74%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpScreen.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpViewModel.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/HomeScreen.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/HomeViewModel.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/repository/LessonRepository.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/repository/LessonRepositoryImplementation.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/lessons/LessonsActivity.kt (87%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/lessons/LessonsViewModel.kt (96%)
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/lessons/LessonsViewModelFactory.kt (83%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainActivity.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainScreen.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainViewModel.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/repository/MainRepository.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/repository/MainRepositoryImplementation.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/SettingsActivity.kt (73%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/SettingsComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/about/AboutSettingsActivity.kt (76%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/about/AboutSettingsComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/advanced/AdvancedSettingsActivity.kt (75%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/advanced/AdvancedSettingsComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/display/DisplaySettingsActivity.kt (75%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/DisplaySettingsComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/display/theme/ThemeSettingsActivity.kt (75%)
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/display/theme/ThemeSettingsComposable.kt (53%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/style/Color.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/display/theme/style/Theme.kt (80%)
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/privacy/PrivacySettingsActivity.kt (75%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/PrivacySettingsComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/privacy/ads/AdsSettingsActivity.kt (67%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/ads/AdsSettingsComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/privacy/permissions/PermissionsSettingsActivity.kt (74%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/permissions/PermissionsSettingsComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/settings/privacy/usage/UsageAndDiagnosticsActivity.kt (74%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/usage/UsageAndDiagnosticsComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/startup/StartupActivity.kt (69%)
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/startup/StartupComposable.kt
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/support/SupportActivity.kt (62%)
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{support/SupportComposable.kt => screens/support/SupportScreen.kt} (75%)
 rename app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/{ => screens}/support/SupportViewModel.kt (81%)
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/SettingsComposable.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/about/AboutSettingsComposable.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/advanced/AdvancedSettingsComposable.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/DisplaySettingsComposable.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Color.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Type.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/PrivacySettingsComposable.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/ads/AdsSettingsComposable.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/permissions/PermissionsSettingsComposable.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/usage/UsageAndDiagnosticsComposable.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/startup/StartupComposable.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/viewmodel/BaseViewModel.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/ClipboardUtil.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/OpenSourceLicensesUtils.kt
 delete mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/compose/AnimationUtils.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/error/ErrorHandler.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/helpers/StringsHelper.kt
 create mode 100644 app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/interfaces/OnShowAdCompleteListener.kt
 rename app/src/main/res/{mipmap-anydpi => mipmap-anydpi-v26}/ic_launcher.xml (100%)
 rename app/src/main/res/{mipmap-anydpi => mipmap-anydpi-v26}/ic_shortcut_lessons.xml (100%)
 rename app/src/main/res/{mipmap-anydpi => mipmap-anydpi-v26}/ic_shortcut_settings.xml (100%)
 rename app/src/main/res/{mipmap-anydpi => mipmap-anydpi-v26}/ic_shortcut_website.xml (100%)
 create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp
 create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp
 create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp
 create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
 create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b589d56..b86273d 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index b268ef3..34b87bc 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,6 +4,14 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
+        <DropdownSelection timestamp="2024-11-25T10:14:46.810032200Z">
+          <Target type="DEFAULT_BOOT">
+            <handle>
+              <DeviceId pluginId="LocalEmulator" identifier="path=C:\Users\mihai.condrea\.android\avd\Android_6.0_API_23_.avd" />
+            </handle>
+          </Target>
+        </DropdownSelection>
+        <DialogSelection />
       </SelectionState>
     </selectionStates>
   </component>
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 0897082..7b3006b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,7 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 103e00c..910c7a2 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,12 +1,39 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="ComposePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="ComposePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
+    <inspection_tool class="GlancePreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewDeviceShouldUseNewSpec" enabled="true" level="WEAK WARNING" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="composableFile" value="true" />
     </inspection_tool>
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 6d0ee1c..5815a4a 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="2.0.0" />
+    <option name="version" value="2.0.10" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 3c7a7d8..1cbbb0f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
@@ -107,7 +108,7 @@
       </map>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/other.xml b/.idea/other.xml
deleted file mode 100644
index 4604c44..0000000
--- a/.idea/other.xml
+++ /dev/null
@@ -1,252 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="direct_access_persist.xml">
-    <option name="deviceSelectionList">
-      <list>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="27" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="F01L" />
-          <option name="id" value="F01L" />
-          <option name="manufacturer" value="FUJITSU" />
-          <option name="name" value="F-01L" />
-          <option name="screenDensity" value="360" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1280" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="28" />
-          <option name="brand" value="DOCOMO" />
-          <option name="codename" value="SH-01L" />
-          <option name="id" value="SH-01L" />
-          <option name="manufacturer" value="SHARP" />
-          <option name="name" value="AQUOS sense2 SH-01L" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2160" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="a51" />
-          <option name="id" value="a51" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy A51" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="akita" />
-          <option name="id" value="akita" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="b0q" />
-          <option name="id" value="b0q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S22 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="32" />
-          <option name="brand" value="google" />
-          <option name="codename" value="bluejay" />
-          <option name="id" value="bluejay" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="crownqlteue" />
-          <option name="id" value="crownqlteue" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Note9" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2220" />
-          <option name="screenY" value="1080" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="dm3q" />
-          <option name="id" value="dm3q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S23 Ultra" />
-          <option name="screenDensity" value="600" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3088" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix" />
-          <option name="id" value="felix" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="felix_camera" />
-          <option name="id" value="felix_camera" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Fold (Camera-enabled)" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="2208" />
-          <option name="screenY" value="1840" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="gts8uwifi" />
-          <option name="id" value="gts8uwifi" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Tab S8 Ultra" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1848" />
-          <option name="screenY" value="2960" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="husky" />
-          <option name="id" value="husky" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8 Pro" />
-          <option name="screenDensity" value="390" />
-          <option name="screenX" value="1008" />
-          <option name="screenY" value="2244" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="motorola" />
-          <option name="codename" value="java" />
-          <option name="id" value="java" />
-          <option name="manufacturer" value="Motorola" />
-          <option name="name" value="G20" />
-          <option name="screenDensity" value="280" />
-          <option name="screenX" value="720" />
-          <option name="screenY" value="1600" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="lynx" />
-          <option name="id" value="lynx" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7a" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="31" />
-          <option name="brand" value="google" />
-          <option name="codename" value="oriole" />
-          <option name="id" value="oriole" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 6" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="panther" />
-          <option name="id" value="panther" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 7" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="q5q" />
-          <option name="id" value="q5q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy Z Fold5" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1812" />
-          <option name="screenY" value="2176" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="r11" />
-          <option name="id" value="r11" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Watch" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="384" />
-          <option name="screenY" value="384" />
-          <option name="type" value="WEAR_OS" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="30" />
-          <option name="brand" value="google" />
-          <option name="codename" value="redfin" />
-          <option name="id" value="redfin" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 5" />
-          <option name="screenDensity" value="440" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2340" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="34" />
-          <option name="brand" value="google" />
-          <option name="codename" value="shiba" />
-          <option name="id" value="shiba" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel 8" />
-          <option name="screenDensity" value="420" />
-          <option name="screenX" value="1080" />
-          <option name="screenY" value="2400" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="33" />
-          <option name="brand" value="google" />
-          <option name="codename" value="tangorpro" />
-          <option name="id" value="tangorpro" />
-          <option name="manufacturer" value="Google" />
-          <option name="name" value="Pixel Tablet" />
-          <option name="screenDensity" value="320" />
-          <option name="screenX" value="1600" />
-          <option name="screenY" value="2560" />
-        </PersistentDeviceSelectionData>
-        <PersistentDeviceSelectionData>
-          <option name="api" value="29" />
-          <option name="brand" value="samsung" />
-          <option name="codename" value="x1q" />
-          <option name="id" value="x1q" />
-          <option name="manufacturer" value="Samsung" />
-          <option name="name" value="Galaxy S20" />
-          <option name="screenDensity" value="480" />
-          <option name="screenX" value="1440" />
-          <option name="screenY" value="3200" />
-        </PersistentDeviceSelectionData>
-      </list>
-    </option>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
new file mode 100644
index 0000000..16660f1
--- /dev/null
+++ b/.idea/runConfigurations.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/studiobot.xml b/.idea/studiobot.xml
new file mode 100644
index 0000000..9298202
--- /dev/null
+++ b/.idea/studiobot.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="StudioBotProjectSettings">
+    <option name="shareContext" value="OptedOut" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85461bc..5101592 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# Version 5.1.0:
+- Fixed lessons not loading, added a new api for that that is more dynamic
+- Fixed the entire project building, now it should work with no probems and see the lessons
+- Updated the project's dependencies
+- Added a new about libraries screen with eula and changelog info
+- Removed unused stuff from the project, now the app should be more clear
+- backported the app to support android 6 or higher instead of android 8 and higher
+- 
+
 # Version 5.0.0:
 - **Major**: This release brings significant improvements to the app's core functionality, user experience, and architecture.
 - **Major**: The entire project has been rewritten using Jetpack Compose, resulting in enhanced performance, improved compatibility, and a more modern UI.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e092f68..256e0da 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,40 +1,40 @@
 plugins {
-    alias(libs.plugins.androidApplication)
-    alias(libs.plugins.jetbrainsKotlinAndroid)
-    alias(libs.plugins.jetbrainsKotlinParcelize)
-    alias(libs.plugins.kotlin.serialization)
-    alias(libs.plugins.googlePlayServices)
-    alias(libs.plugins.googleOssServices)
-    alias(libs.plugins.googleFirebase)
-    alias(libs.plugins.compose.compiler)
+    alias(notation = libs.plugins.androidApplication)
+    alias(notation = libs.plugins.jetbrainsKotlinAndroid)
+    alias(notation = libs.plugins.jetbrainsKotlinParcelize)
+    alias(notation = libs.plugins.kotlin.serialization)
+    alias(notation = libs.plugins.googlePlayServices)
+    alias(notation = libs.plugins.about.libraries)
+    alias(notation = libs.plugins.googleFirebase)
+    alias(notation = libs.plugins.compose.compiler)
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
     namespace = "com.d4rk.englishwithlidia.plus"
     defaultConfig {
         applicationId = "com.d4rk.englishwithlidia.plus"
-        minSdk = 26
-        targetSdk = 34
+        minSdk = 23
+        targetSdk = 35
         versionCode = 62
         versionName = "5.0.0"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         resourceConfigurations += listOf(
-            "en",
-            "de",
-            "es",
-            "fr",
-            "hi",
-            "hu",
-            "in",
-            "it",
-            "ja",
-            "ro",
-            "ru",
-            "tr",
-            "sv",
-            "bg",
-            "pl",
+            "en" ,
+            "de" ,
+            "es" ,
+            "fr" ,
+            "hi" ,
+            "hu" ,
+            "in" ,
+            "it" ,
+            "ja" ,
+            "ro" ,
+            "ru" ,
+            "tr" ,
+            "sv" ,
+            "bg" ,
+            "pl" ,
             "uk"
         )
         vectorDrawables {
@@ -49,7 +49,7 @@ android {
             isShrinkResources = true
             isDebuggable = false
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+                getDefaultProguardFile("proguard-android-optimize.txt") , "proguard-rules.pro"
             )
         }
 
@@ -57,7 +57,7 @@ android {
             multiDexEnabled = true
             isDebuggable = true
             proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro"
+                getDefaultProguardFile("proguard-android-optimize.txt") , "proguard-rules.pro"
             )
         }
     }
@@ -90,69 +90,73 @@ android {
 }
 
 dependencies {
+
+    //AndroidX
+    implementation(dependencyNotation = libs.androidx.core.ktx)
+    implementation(dependencyNotation = libs.androidx.appcompat)
+    implementation(dependencyNotation = libs.androidx.core.splashscreen)
+    implementation(dependencyNotation = libs.androidx.multidex)
+    implementation(dependencyNotation = libs.androidx.work.runtime.ktx)
+    implementation(dependencyNotation = libs.androidx.media3.exoplayer)
+    implementation(dependencyNotation = libs.androidx.media3.ui)
+    implementation(dependencyNotation = libs.androidx.media3.session)
+
+    // Compose
+    implementation(dependencyNotation = platform(libs.androidx.compose.bom))
+    implementation(dependencyNotation = libs.androidx.ui)
+    implementation(dependencyNotation = libs.androidx.activity.compose)
+    implementation(dependencyNotation = libs.androidx.ui.graphics)
+    implementation(dependencyNotation = libs.androidx.compose.runtime)
+    implementation(dependencyNotation = libs.androidx.runtime.livedata)
+    implementation(dependencyNotation = libs.androidx.ui.tooling.preview)
+    implementation(dependencyNotation = libs.androidx.material3)
+    implementation(dependencyNotation = libs.androidx.material.icons.extended)
+    implementation(dependencyNotation = libs.datastore.preferences)
+    implementation(dependencyNotation = libs.androidx.datastore.preferences)
+    implementation(dependencyNotation = libs.androidx.foundation)
+    implementation(dependencyNotation = libs.androidx.navigation.compose)
+
     // Firebase
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.crashlytics.ktx)
-    implementation(libs.firebase.analytics.ktx)
-    implementation(libs.firebase.perf)
+    implementation(dependencyNotation = platform(libs.firebase.bom))
+    implementation(dependencyNotation = libs.firebase.analytics.ktx)
+    implementation(dependencyNotation = libs.firebase.crashlytics.ktx)
+    implementation(dependencyNotation = libs.firebase.perf)
 
     // Google
-    implementation(libs.play.services.ads)
-    implementation(libs.billing)
-    implementation(libs.material)
-    implementation(libs.play.services.oss.licenses)
-    implementation(libs.review.ktx)
-    implementation(libs.app.update.ktx)
-    implementation(libs.volley)
+    implementation(dependencyNotation = libs.play.services.ads)
+    implementation(dependencyNotation = libs.billing)
+    implementation(dependencyNotation = libs.material)
+    implementation(dependencyNotation = libs.app.update.ktx)
+    implementation(dependencyNotation = libs.review.ktx)
 
-    // Compose
-    implementation(platform(libs.androidx.compose.bom))
-    implementation(libs.androidx.activity.compose)
-    implementation(libs.androidx.animation.core)
-    implementation(libs.androidx.foundation)
-    implementation(libs.androidx.material.icons.extended)
-    implementation(libs.androidx.material3)
-    implementation(libs.androidx.runtime)
-    implementation(libs.androidx.runtime.livedata)
-    implementation(libs.androidx.ui)
-    implementation(libs.androidx.graphics.shapes)
-    implementation(libs.androidx.constraintlayout.compose)
-    implementation(libs.ui.tooling)
-    implementation(libs.androidx.datastore.core)
-    implementation(libs.androidx.navigation.compose)
-
-    // AndroidX
-    implementation(libs.androidx.core.ktx)
-    implementation(libs.androidx.appcompat)
-    implementation(libs.androidx.core.splashscreen)
-    implementation(libs.androidx.lifecycle.runtime.ktx)
-    implementation(libs.androidx.lifecycle.process)
-    implementation(libs.androidx.lifecycle.common.java8)
-    implementation(libs.androidx.lifecycle.livedata.ktx)
-    implementation(libs.androidx.lifecycle.viewmodel.ktx)
-    implementation(libs.androidx.multidex)
-    implementation(libs.androidx.work.runtime.ktx)
-    implementation(libs.androidx.media3.exoplayer)
-    implementation(libs.androidx.media3.ui)
-    implementation(libs.androidx.media3.session)
+    // Images
+    implementation(dependencyNotation = libs.coil.compose)
+    implementation(dependencyNotation = libs.coil.network.okhttp)
 
     // Kotlin
-    implementation(libs.kotlinx.coroutines.android)
-    implementation(libs.ktor.client.core)
-    implementation(libs.ktor.client.cio)
-    implementation(libs.ktor.client.content.negotiation)
-    implementation(libs.ktor.serialization.kotlinx.json)
-
-    // Other
-    implementation(libs.lottie.compose)
-    implementation(libs.coil.compose)
-    implementation(libs.slf4j.simple)
-
-    // Test
-    testImplementation(libs.junit)
-    androidTestImplementation(libs.androidx.junit)
-    androidTestImplementation(libs.androidx.espresso.core)
-    androidTestImplementation(libs.ui.test.junit4)
-    debugImplementation(libs.androidx.ui.tooling)
-    debugImplementation(libs.androidx.ui.test.manifest)
+    implementation(dependencyNotation = libs.kotlinx.coroutines.android)
+    implementation(dependencyNotation = libs.kotlinx.serialization.json)
+
+    // Ktor
+    implementation(dependencyNotation = platform(libs.ktor.bom))
+    implementation(dependencyNotation = libs.ktor.client.android)
+    implementation(dependencyNotation = libs.ktor.client.serialization)
+    implementation(dependencyNotation = libs.ktor.client.logging)
+    implementation(dependencyNotation = libs.ktor.client.content.negotiation)
+    implementation(dependencyNotation = libs.ktor.serialization.kotlinx.json)
+
+    // Lifecycle
+    implementation(dependencyNotation = libs.androidx.lifecycle.runtime.ktx)
+    implementation(dependencyNotation = libs.androidx.lifecycle.livedata.ktx)
+    implementation(dependencyNotation = libs.androidx.lifecycle.process)
+    implementation(dependencyNotation = libs.androidx.lifecycle.viewmodel.ktx)
+    implementation(dependencyNotation = libs.androidx.lifecycle.viewmodel.compose)
+    implementation(dependencyNotation = libs.androidx.lifecycle.runtime.compose)
+
+    // About
+    implementation(dependencyNotation = libs.aboutlibraries)
+    implementation(dependencyNotation = libs.core)
+
+    // Wavy Slider
+    implementation(dependencyNotation = libs.wavy.slider)
 }
\ No newline at end of file
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 615843b..f4c284b 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -29,8 +29,4 @@
 
 -keep class com.google.firebase.** {
   public *;
-}
-
--keep class ch.qos.logback.** {
-public *;
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7f98d19..d998df9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,10 +34,10 @@
         android:theme="@style/AppTheme"
         tools:targetApi="33">
 
-        <activity android:name=".ui.startup.StartupActivity" />
+        <activity android:name=".ui.screens.startup.StartupActivity" />
 
         <activity
-            android:name=".MainActivity"
+            android:name=".ui.screens.main.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
@@ -51,43 +51,43 @@
         </activity>
 
         <activity
-            android:name=".ui.lessons.LessonsActivity"
-            android:parentActivityName=".MainActivity" />
+            android:name=".ui.screens.lessons.LessonsActivity"
+            android:parentActivityName=".ui.screens.main.MainActivity" />
 
         <activity
-            android:name=".ui.support.SupportActivity"
-            android:parentActivityName=".MainActivity" />
+            android:name=".ui.screens.support.SupportActivity"
+            android:parentActivityName=".ui.screens.main.MainActivity" />
 
         <activity
-            android:name=".ui.settings.SettingsActivity"
+            android:name=".ui.screens.settings.SettingsActivity"
             android:exported="true"
             android:label="@string/settings"
-            android:parentActivityName=".MainActivity">
+            android:parentActivityName=".ui.screens.main.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.APPLICATION_PREFERENCES" />
             </intent-filter>
         </activity>
 
         <activity
-            android:name=".ui.settings.display.DisplaySettingsActivity"
-            android:parentActivityName=".ui.settings.SettingsActivity" />
+            android:name=".ui.screens.settings.display.DisplaySettingsActivity"
+            android:parentActivityName=".ui.screens.settings.SettingsActivity" />
 
         <activity
-            android:name=".ui.settings.display.theme.ThemeSettingsActivity"
-            android:parentActivityName=".ui.settings.display.DisplaySettingsActivity" />
+            android:name=".ui.screens.settings.display.theme.ThemeSettingsActivity"
+            android:parentActivityName=".ui.screens.settings.display.DisplaySettingsActivity" />
 
         <activity
-            android:name=".ui.settings.advanced.AdvancedSettingsActivity"
-            android:parentActivityName=".ui.settings.SettingsActivity" />
+            android:name=".ui.screens.settings.advanced.AdvancedSettingsActivity"
+            android:parentActivityName=".ui.screens.settings.SettingsActivity" />
 
         <activity
-            android:name=".ui.settings.privacy.PrivacySettingsActivity"
-            android:parentActivityName=".ui.settings.SettingsActivity" />
+            android:name=".ui.screens.settings.privacy.PrivacySettingsActivity"
+            android:parentActivityName=".ui.screens.settings.SettingsActivity" />
 
         <activity
-            android:name=".ui.settings.privacy.permissions.PermissionsSettingsActivity"
+            android:name=".ui.screens.settings.privacy.permissions.PermissionsSettingsActivity"
             android:exported="true"
-            android:parentActivityName=".ui.settings.privacy.PrivacySettingsActivity"
+            android:parentActivityName=".ui.screens.settings.privacy.PrivacySettingsActivity"
             android:permission="android.permission.START_VIEW_PERMISSION_USAGE">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW_PERMISSION_USAGE" />
@@ -98,28 +98,20 @@
         </activity>
 
         <activity
-            android:name=".ui.settings.privacy.usage.UsageAndDiagnosticsActivity"
-            android:parentActivityName=".ui.settings.privacy.PrivacySettingsActivity" />
+            android:name=".ui.screens.settings.privacy.usage.UsageAndDiagnosticsActivity"
+            android:parentActivityName=".ui.screens.settings.privacy.PrivacySettingsActivity" />
 
         <activity
-            android:name=".ui.settings.privacy.ads.AdsSettingsActivity"
-            android:parentActivityName=".ui.settings.privacy.PrivacySettingsActivity" />
+            android:name=".ui.screens.settings.privacy.ads.AdsSettingsActivity"
+            android:parentActivityName=".ui.screens.settings.privacy.PrivacySettingsActivity" />
 
         <activity
-            android:name=".ui.settings.about.AboutSettingsActivity"
-            android:parentActivityName=".ui.settings.SettingsActivity" />
+            android:name=".ui.screens.settings.about.AboutSettingsActivity"
+            android:parentActivityName=".ui.screens.settings.SettingsActivity" />
 
         <activity
-            android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
-            android:theme="@style/AppThemeActionBar" />
-
-        <activity
-            android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
-            android:theme="@style/AppThemeActionBar" />
-
-        <activity
-            android:name=".ui.help.HelpActivity"
-            android:parentActivityName=".MainActivity" />
+            android:name=".ui.screens.help.HelpActivity"
+            android:parentActivityName=".ui.screens.main.MainActivity" />
 
         <service
             android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/MainActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/MainActivity.kt
deleted file mode 100644
index c9e67bb..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/MainActivity.kt
+++ /dev/null
@@ -1,252 +0,0 @@
-package com.d4rk.englishwithlidia.plus
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.activity.compose.setContent
-import androidx.activity.enableEdgeToEdge
-import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Surface
-import androidx.compose.ui.Modifier
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import androidx.lifecycle.lifecycleScope
-import com.android.volley.NoConnectionError
-import com.android.volley.TimeoutError
-import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
-import com.d4rk.englishwithlidia.plus.notifications.managers.AppUpdateNotificationsManager
-import com.d4rk.englishwithlidia.plus.notifications.managers.AppUsageNotificationsManager
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
-import com.d4rk.englishwithlidia.plus.ui.startup.StartupActivity
-import com.google.android.gms.ads.MobileAds
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.play.core.appupdate.AppUpdateManager
-import com.google.android.play.core.appupdate.AppUpdateManagerFactory
-import com.google.android.play.core.install.model.ActivityResult
-import com.google.android.play.core.install.model.AppUpdateType
-import com.google.android.play.core.install.model.UpdateAvailability
-import com.google.firebase.analytics.FirebaseAnalytics
-import com.google.firebase.crashlytics.FirebaseCrashlytics
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.tasks.await
-
-class MainActivity : AppCompatActivity() {
-    private lateinit var dataStore: DataStore
-    private lateinit var appUpdateManager: AppUpdateManager
-    private var appUpdateNotificationsManager: AppUpdateNotificationsManager =
-        AppUpdateNotificationsManager(this)
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        installSplashScreen()
-        enableEdgeToEdge()
-        dataStore = DataStore.getInstance(this@MainActivity)
-        MobileAds.initialize(this@MainActivity)
-        startupScreen()
-        setupUpdateNotifications()
-        setContent {
-            AppTheme {
-                Surface(
-                    modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
-                ) {
-                    MainComposable()
-                }
-            }
-        }
-        setupSettings()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        val appUsageNotificationsManager = AppUsageNotificationsManager(this)
-        appUsageNotificationsManager.scheduleAppUsageCheck()
-        appUpdateNotificationsManager.checkAndSendUpdateNotification()
-        checkForFlexibleUpdate()
-    }
-
-    /**
-     * This method overrides the `onBackPressed()` method **(deprecated in Java)** to display a confirmation dialog
-     * before closing the activity. While this method might work, it's recommended to use more modern approaches
-     * for handling back button presses, such as using Navigation components or Activity lifecycles.
-     *
-     * This method is annotated with `@Deprecated` and `@Suppress("DEPRECATION")` to explicitly mark it as deprecated
-     * and suppress compiler warnings during its usage.
-     *
-     * Consider utilizing alternative approaches for handling back button events.
-     */
-    @Deprecated("Deprecated in Java")
-    @Suppress("DEPRECATION")
-    override fun onBackPressed() {
-        MaterialAlertDialogBuilder(this)
-            .setTitle(R.string.close)
-            .setMessage(R.string.summary_close)
-            .setPositiveButton(android.R.string.yes) { _, _ ->
-                super.onBackPressed()
-                moveTaskToBack(true)
-            }
-            .setNegativeButton(android.R.string.no, null)
-            .apply { show() }
-    }
-
-    /**
-     * Overrides the `onActivityResult` method to handle the result of an activity launched for result.
-     *
-     * This function is specifically designed to handle the result of a request code (1)
-     * which is used for in-app updates. It checks the `resultCode` to determine the outcome of the update process.
-     * Depending on the `resultCode`, it either displays a Snackbar message indicating a successful update or
-     * calls a function to show a Snackbar message indicating that the update failed.
-     *
-     * @param requestCode The integer request code originally supplied to startActivityForResult(),
-     * allowing you to identify who this result came from.
-     * @param resultCode The integer result code returned by the child activity through its setResult().
-     * @param data An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
-     */
-    @Deprecated("Deprecated in Java")
-    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
-        super.onActivityResult(requestCode, resultCode, data)
-        if (requestCode == 1) {
-            when (resultCode) {
-                RESULT_OK -> {
-                    val snackbar = Snackbar.make(
-                        findViewById(android.R.id.content),
-                        R.string.snack_app_updated,
-                        Snackbar.LENGTH_LONG
-                    ).setAction(android.R.string.ok, null)
-                    snackbar.show()
-                }
-
-                ActivityResult.RESULT_IN_APP_UPDATE_FAILED -> {
-                    showUpdateFailedSnackbar()
-                }
-            }
-        }
-    }
-
-    /**
-     * Checks for the availability of updates and triggers the appropriate update flow if conditions are met.
-     *
-     * This function uses the lifecycle scope to asynchronously check for available updates using the
-     * Google Play Core library. If an update is available and meets certain conditions, it triggers
-     * the update flow. The update can be of two types: IMMEDIATE or FLEXIBLE.
-     *
-     * For an IMMEDIATE update, it checks if the client version is more than 90 days old. If so, it triggers the update.
-     * For a FLEXIBLE update, it checks if the client version is less than 90 days old. If so, it triggers the update.
-     *
-     * The function also ensures that no developer-triggered update is in progress before triggering a new update.
-     *
-     * @param lifecycleScope The lifecycle scope used for launching coroutines, obtained from the hosting activity.
-     */
-    private fun checkForFlexibleUpdate() {
-        lifecycleScope.launch {
-            try {
-                val appUpdateInfo = appUpdateManager.appUpdateInfo.await()
-                if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE && appUpdateInfo.isUpdateTypeAllowed(
-                        AppUpdateType.IMMEDIATE
-                    ) && appUpdateInfo.updateAvailability() != UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS
-                ) {
-                    @Suppress("DEPRECATION") appUpdateManager.appUpdateInfo.addOnSuccessListener { info ->
-                        when {
-                            info.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE && info.isUpdateTypeAllowed(
-                                AppUpdateType.IMMEDIATE
-                            ) -> {
-                                info.clientVersionStalenessDays()?.let {
-                                    if (it > 90) {
-                                        appUpdateManager.startUpdateFlowForResult(
-                                            info, AppUpdateType.IMMEDIATE, this@MainActivity, 1
-                                        )
-                                    }
-                                }
-                            }
-
-                            info.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE && info.isUpdateTypeAllowed(
-                                AppUpdateType.FLEXIBLE
-                            ) -> {
-                                info.clientVersionStalenessDays()?.let {
-                                    if (it < 90) {
-                                        appUpdateManager.startUpdateFlowForResult(
-                                            info, AppUpdateType.FLEXIBLE, this@MainActivity, 1
-                                        )
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-            } catch (e: Exception) {
-                if (!BuildConfig.DEBUG) {
-                    when (e) {
-                        is NoConnectionError, is TimeoutError -> {
-                            Snackbar.make(
-                                findViewById(android.R.id.content),
-                                getString(R.string.snack_network_error),
-                                Snackbar.LENGTH_LONG
-                            ).show()
-                        }
-
-                        else -> {
-                            Snackbar.make(
-                                findViewById(android.R.id.content),
-                                getString(R.string.snack_general_error),
-                                Snackbar.LENGTH_LONG
-                            ).show()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Displays a Snackbar message indicating that the update process has failed.
-     *
-     * This function creates a Snackbar with a message indicating that the update process has failed.
-     * The Snackbar includes a "Try Again" action which, when clicked, triggers the `checkForFlexibleUpdate` function
-     * to check for updates and initiate the appropriate update flow if conditions are met.
-     */
-    private fun showUpdateFailedSnackbar() {
-        val snackbar = Snackbar.make(
-            findViewById(android.R.id.content), R.string.snack_update_failed, Snackbar.LENGTH_LONG
-        ).setAction(R.string.try_again) {
-            checkForFlexibleUpdate()
-        }
-        snackbar.show()
-    }
-
-    private fun setupUpdateNotifications() {
-        appUpdateManager = AppUpdateManagerFactory.create(this)
-        appUpdateNotificationsManager = AppUpdateNotificationsManager(this)
-    }
-
-    /**
-     * Configures application settings based on data stored in a DataStore.
-     *
-     * This function uses a lifecycle coroutine scope to asynchronously retrieve the value of `usageAndDiagnostics`
-     * from the DataStore. It then adjusts the Firebase Analytics and Crashlytics collection settings based on the retrieved value.
-     *
-     * If `usageAndDiagnostics` is enabled, both Firebase Analytics and Crashlytics data collection will be enabled. If it's not, data collection will be disabled.
-     *
-     * @see androidx.lifecycle.lifecycleScope
-     * @see androidx.datastore.preferences.core.DataStore
-     * @see com.google.firebase.analytics.FirebaseAnalytics
-     * @see com.google.firebase.crashlytics.FirebaseCrashlytics
-     */
-    private fun setupSettings() {
-        lifecycleScope.launch {
-            val isEnabled = dataStore.usageAndDiagnostics.first()
-            FirebaseAnalytics.getInstance(this@MainActivity)
-                .setAnalyticsCollectionEnabled(isEnabled)
-            FirebaseCrashlytics.getInstance().setCrashlyticsCollectionEnabled(isEnabled)
-        }
-    }
-
-    private fun startupScreen() {
-        lifecycleScope.launch {
-            if (dataStore.startup.first()) {
-                dataStore.saveStartup(false)
-                startActivity(Intent(this@MainActivity, StartupActivity::class.java))
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/MainComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/MainComposable.kt
deleted file mode 100644
index 549804f..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/MainComposable.kt
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.d4rk.englishwithlidia.plus
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.outlined.EventNote
-import androidx.compose.material.icons.automirrored.outlined.HelpOutline
-import androidx.compose.material.icons.filled.Menu
-import androidx.compose.material.icons.outlined.Settings
-import androidx.compose.material.icons.outlined.Share
-import androidx.compose.material.icons.outlined.VolunteerActivism
-import androidx.compose.material3.DrawerValue
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.ModalDrawerSheet
-import androidx.compose.material3.ModalNavigationDrawer
-import androidx.compose.material3.NavigationDrawerItem
-import androidx.compose.material3.NavigationDrawerItemDefaults
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBar
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberDrawerState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableIntStateOf
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.saveable.rememberSaveable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import com.d4rk.englishwithlidia.plus.data.model.ui.navigation.NavigationItem
-import com.d4rk.englishwithlidia.plus.ui.help.HelpActivity
-import com.d4rk.englishwithlidia.plus.ui.home.HomeComposable
-import com.d4rk.englishwithlidia.plus.ui.settings.SettingsActivity
-import com.d4rk.englishwithlidia.plus.ui.support.SupportActivity
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun MainComposable() {
-    val drawerItems = listOf(
-        NavigationItem(
-            title = R.string.settings,
-            selectedIcon = Icons.Outlined.Settings,
-        ),
-        NavigationItem(
-            title = R.string.help_and_feedback,
-            selectedIcon = Icons.AutoMirrored.Outlined.HelpOutline,
-        ),
-        NavigationItem(
-            title = R.string.updates,
-            selectedIcon = Icons.AutoMirrored.Outlined.EventNote,
-        ),
-        NavigationItem(
-            title = R.string.share, selectedIcon = Icons.Outlined.Share
-        ),
-    )
-    val drawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
-    val scope = rememberCoroutineScope()
-    val context = LocalContext.current
-    val selectedItemIndex by rememberSaveable { mutableIntStateOf(-1) }
-    ModalNavigationDrawer(drawerState = drawerState, drawerContent = {
-        ModalDrawerSheet {
-            Spacer(modifier = Modifier.height(16.dp))
-            drawerItems.forEachIndexed { index, item ->
-                val title = stringResource(item.title)
-                NavigationDrawerItem(
-                    label = { Text(text = title) },
-                    selected = index == selectedItemIndex,
-                    onClick = {
-                        when (item.title) {
-
-                            R.string.settings -> {
-                                IntentUtils.openActivity(
-                                    context, SettingsActivity::class.java
-                                )
-                            }
-
-                            R.string.help_and_feedback -> {
-                                IntentUtils.openActivity(
-                                    context, HelpActivity::class.java
-                                )
-                            }
-
-                            R.string.updates -> {
-                                IntentUtils.openUrl(
-                                    context,
-                                    "https://github.com/D4rK7355608/${context.packageName}/blob/master/CHANGELOG.md"
-                                )
-                            }
-
-                            R.string.share -> {
-                                IntentUtils.shareApp(context)
-                            }
-                        }
-                        scope.launch {
-                            drawerState.close()
-                        }
-                    },
-                    icon = {
-                        Icon(
-                            item.selectedIcon, contentDescription = title
-                        )
-                    },
-                    badge = {
-                        item.badgeCount?.let {
-                            Text(text = item.badgeCount.toString())
-                        }
-                    },
-                    modifier = Modifier.padding(NavigationDrawerItemDefaults.ItemPadding)
-                )
-            }
-        }
-
-    }, content = {
-        Scaffold(
-            topBar = {
-                TopAppBar(
-                    colors = TopAppBarDefaults.topAppBarColors(
-                        containerColor = MaterialTheme.colorScheme.primary,
-                        titleContentColor = MaterialTheme.colorScheme.onPrimary,
-                        navigationIconContentColor = MaterialTheme.colorScheme.onPrimary,
-                        actionIconContentColor = MaterialTheme.colorScheme.onSecondary
-                    ),
-                    title = {
-                        Text(text = stringResource(R.string.app_name))
-                    },
-                    navigationIcon = {
-                        IconButton(onClick = {
-                            scope.launch {
-                                drawerState.apply {
-                                    if (isClosed) open() else close()
-                                }
-                            }
-                        }) {
-                            Icon(
-                                imageVector = Icons.Default.Menu, contentDescription = "Menu"
-                            )
-                        }
-                    },
-                    actions = {
-                        IconButton(onClick = {
-                            IntentUtils.openActivity(context, SupportActivity::class.java)
-                        }) {
-                            Icon(
-                                Icons.Outlined.VolunteerActivism, contentDescription = "Support"
-                            )
-                        }
-                    },
-                )
-            },
-        ) { innerPadding ->
-            Box(modifier = Modifier.padding(innerPadding)) {
-                HomeComposable()
-            }
-        }
-    })
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/api/ApiConstants.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/api/ApiConstants.kt
new file mode 100644
index 0000000..0d3d9ba
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/api/ApiConstants.kt
@@ -0,0 +1,5 @@
+package com.d4rk.englishwithlidia.plus.constants.api
+
+object ApiConstants {
+    const val BASE_REPOSITORY_URL = "https://raw.githubusercontent.com/D4rK7355608/com.d4rk.apis/refs/heads/main/English%20with%20Lidia"
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/datastore/DataStoreNamesConstants.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/datastore/DataStoreNamesConstants.kt
new file mode 100644
index 0000000..0566133
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/datastore/DataStoreNamesConstants.kt
@@ -0,0 +1,14 @@
+package com.d4rk.englishwithlidia.plus.constants.datastore
+
+object DataStoreNamesConstants {
+    const val DATA_STORE_SETTINGS = "settings"
+    const val DATA_STORE_LAST_USED = "last_used"
+    const val DATA_STORE_STARTUP = "startup"
+    const val DATA_STORE_THEME_MODE = "theme_mode"
+    const val DATA_STORE_AMOLED_MODE = "amoled_mode"
+    const val DATA_STORE_DYNAMIC_COLORS = "dynamic_colors"
+    const val DATA_STORE_BOUNCY_BUTTONS = "bouncy_buttons"
+    const val DATA_STORE_LANGUAGE = "language"
+    const val DATA_STORE_USAGE_AND_DIAGNOSTICS = "usage_and_diagnostics"
+    const val DATA_STORE_ADS = "ads"
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/error/ErrorType.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/error/ErrorType.kt
new file mode 100644
index 0000000..4f425dc
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/constants/error/ErrorType.kt
@@ -0,0 +1,5 @@
+package com.d4rk.englishwithlidia.plus.constants.error
+
+enum class ErrorType {
+    SECURITY_EXCEPTION , IO_EXCEPTION , ACTIVITY_NOT_FOUND , ILLEGAL_ARGUMENT , UNKNOWN_ERROR ,
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/client/KtorClient.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/client/KtorClient.kt
new file mode 100644
index 0000000..e83db44
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/client/KtorClient.kt
@@ -0,0 +1,72 @@
+package com.d4rk.englishwithlidia.plus.data.client
+
+import android.util.Log
+import io.ktor.client.HttpClient
+import io.ktor.client.engine.android.Android
+import io.ktor.client.plugins.DefaultRequest
+import io.ktor.client.plugins.HttpResponseValidator
+import io.ktor.client.plugins.HttpTimeout
+import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
+import io.ktor.client.plugins.logging.LogLevel
+import io.ktor.client.plugins.logging.Logger
+import io.ktor.client.plugins.logging.Logging
+import io.ktor.client.plugins.observer.ResponseObserver
+import io.ktor.client.request.accept
+import io.ktor.http.ContentType
+import io.ktor.http.contentType
+import io.ktor.serialization.kotlinx.json.json
+import kotlinx.serialization.json.Json
+
+class KtorClient {
+
+    private val networkTimeout = 6_000L
+
+    fun createClient() : HttpClient {
+        return HttpClient(Android) {
+            install(ContentNegotiation) {
+                json(Json {
+                    prettyPrint = true
+                    isLenient = true
+                    ignoreUnknownKeys = true
+                    encodeDefaults = false
+                })
+            }
+
+            install(HttpTimeout) {
+                requestTimeoutMillis = networkTimeout
+                connectTimeoutMillis = networkTimeout
+                socketTimeoutMillis = networkTimeout
+            }
+
+            install(Logging) {
+                logger = object : Logger {
+                    override fun log(message : String) {
+                        println("English with Lidia -> KtorClient: $message")
+                    }
+                }
+
+                level = LogLevel.NONE
+
+            }
+            install(ResponseObserver) {
+                onResponse { response ->
+                    Log.d("HTTP status:" , "${response.status.value}")
+                }
+            }
+            install(DefaultRequest) {
+                contentType(ContentType.Application.Json)
+                accept(ContentType.Application.Json)
+            }
+
+            HttpResponseValidator {
+                handleResponseExceptionWithRequest { cause , _ ->
+                    when (cause) {
+                        is java.net.UnknownHostException -> throw Exception("Network connection error. Please check your internet connection.")
+                        is io.ktor.client.plugins.ClientRequestException -> throw Exception("Client request failed: ${cause.message}")
+                        is io.ktor.client.plugins.ServerResponseException -> throw Exception("Server error occurred: ${cause.message}")
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/AppCoreManager.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/AppCoreManager.kt
index 5b1e4f0..190a6a5 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/AppCoreManager.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/AppCoreManager.kt
@@ -2,55 +2,92 @@
 
 package com.d4rk.englishwithlidia.plus.data.core
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.Application
-import android.content.Context
 import android.os.Bundle
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import androidx.lifecycle.ProcessLifecycleOwner
 import androidx.multidex.MultiDexApplication
-import com.d4rk.englishwithlidia.plus.constants.ads.AdsConstants
-import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
-import com.d4rk.englishwithlidia.plus.notifications.managers.AppUsageNotificationsManager
-import com.google.android.gms.ads.AdError
-import com.google.android.gms.ads.AdRequest
-import com.google.android.gms.ads.FullScreenContentCallback
-import com.google.android.gms.ads.LoadAdError
-import com.google.android.gms.ads.MobileAds
-import com.google.android.gms.ads.appopen.AppOpenAd
-import kotlinx.coroutines.flow.first
-import kotlinx.coroutines.runBlocking
-import java.util.Date
-
-@Suppress("SameParameterValue")
-class AppCoreManager : MultiDexApplication(), Application.ActivityLifecycleCallbacks, LifecycleObserver {
-
-    private lateinit var appOpenAdManager: AppOpenAdManager
-    private var currentActivity: Activity? = null
+import com.d4rk.englishwithlidia.plus.data.client.KtorClient
+import com.d4rk.englishwithlidia.plus.data.core.ads.AdsCoreManager
+import com.d4rk.englishwithlidia.plus.data.core.datastore.DataStoreCoreManager
+import io.ktor.client.HttpClient
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+class AppCoreManager : MultiDexApplication(), Application.ActivityLifecycleCallbacks,
+    LifecycleObserver {
+
+    private val dataStoreCoreManager: DataStoreCoreManager =
+        DataStoreCoreManager(context = this)
+    private val adsCoreManager: AdsCoreManager =
+        AdsCoreManager(context = this)
+
+    private enum class AppInitializationStage {
+        DATA_STORE,
+        ADS
+    }
 
-    private lateinit var dataStore: DataStore
+    companion object {
+        @SuppressLint("StaticFieldLeak")
+        lateinit var instance: AppCoreManager
+            private set
+        lateinit var ktorClient: HttpClient
+    }
+
+    private var currentStage = AppInitializationStage.DATA_STORE
+    private var isAppLoaded = false
 
     override fun onCreate() {
         super.onCreate()
+        instance = this
+        ktorClient = KtorClient().createClient()
         registerActivityLifecycleCallbacks(this)
-        MobileAds.initialize(this)
-        ProcessLifecycleOwner.get().lifecycle.addObserver(this)
-        dataStore = DataStore.getInstance(this@AppCoreManager)
-        appOpenAdManager = AppOpenAdManager()
-        val notificationsManager = AppUsageNotificationsManager(this)
-        notificationsManager.scheduleAppUsageCheck()
+        ProcessLifecycleOwner.get().lifecycle.addObserver(observer = this)
+        CoroutineScope(Dispatchers.Main).launch {
+            if (dataStoreCoreManager.initializeDataStore()) {
+                proceedToNextStage()
+            }
+        }
+    }
+
+    private fun proceedToNextStage() {
+        when (currentStage) {
+            AppInitializationStage.DATA_STORE -> {
+                currentStage = AppInitializationStage.ADS
+                adsCoreManager.setDataStore(dataStoreCoreManager.dataStore)
+                adsCoreManager.initializeAds()
+                markAppAsLoaded()
+            }
+
+            else -> {
+                // All stages completed
+            }
+        }
+    }
+
+    fun isAppLoaded(): Boolean {
+        return isAppLoaded
+    }
+
+    private fun markAppAsLoaded() {
+        isAppLoaded = true
     }
 
     @OnLifecycleEvent(Lifecycle.Event.ON_START)
     fun onMoveToForeground() {
-        currentActivity?.let { appOpenAdManager.showAdIfAvailable(it) }
+        currentActivity?.let { adsCoreManager.showAdIfAvailable(it) }
     }
 
+    private var currentActivity: Activity? = null
+
     override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) {}
     override fun onActivityStarted(activity: Activity) {
-        if (!appOpenAdManager.isShowingAd) {
+        if (!adsCoreManager.isShowingAd) {
             currentActivity = activity
         }
     }
@@ -60,91 +97,4 @@ class AppCoreManager : MultiDexApplication(), Application.ActivityLifecycleCallb
     override fun onActivityStopped(activity: Activity) {}
     override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) {}
     override fun onActivityDestroyed(activity: Activity) {}
-
-    interface OnShowAdCompleteListener {
-        @Suppress("EmptyMethod")
-        fun onShowAdComplete()
-    }
-
-    private inner class AppOpenAdManager {
-        private var appOpenAd: AppOpenAd? = null
-        private var isLoadingAd = false
-        var isShowingAd = false
-        private var loadTime: Long = 0
-
-        fun loadAd(context: Context) {
-            if (isLoadingAd || isAdAvailable()) {
-                return
-            }
-            isLoadingAd = true
-            val request = AdRequest.Builder().build()
-            AppOpenAd.load(context ,
-                           AdsConstants.APP_OPEN_UNIT_ID ,
-                           request ,
-                           AppOpenAd.APP_OPEN_AD_ORIENTATION_PORTRAIT ,
-                           object : AppOpenAd.AppOpenAdLoadCallback() {
-                    override fun onAdLoaded(ad: AppOpenAd) {
-                        appOpenAd = ad
-                        isLoadingAd = false
-                        loadTime = Date().time
-                    }
-
-                    override fun onAdFailedToLoad(loadAdError: LoadAdError) {
-                        isLoadingAd = false
-                    }
-                })
-        }
-
-        private fun wasLoadTimeLessThanNHoursAgo(numHours: Long): Boolean {
-            val dateDifference: Long = Date().time - loadTime
-            val numMilliSecondsPerHour: Long = 3600000
-            return dateDifference < numMilliSecondsPerHour * numHours
-        }
-
-        @Suppress("BooleanMethodIsAlwaysInverted")
-        private fun isAdAvailable(): Boolean {
-            return appOpenAd != null && wasLoadTimeLessThanNHoursAgo(4)
-        }
-
-        fun showAdIfAvailable(activity: Activity) {
-            showAdIfAvailable(activity, object : OnShowAdCompleteListener {
-                override fun onShowAdComplete() {
-                }
-            })
-        }
-
-        fun showAdIfAvailable(
-            activity: Activity, onShowAdCompleteListener: OnShowAdCompleteListener
-        ) {
-            val isAdsChecked = runBlocking { dataStore.ads.first() }
-            if (isShowingAd || !isAdsChecked) {
-                return
-            }
-            if (!isAdAvailable()) {
-                onShowAdCompleteListener.onShowAdComplete()
-                loadAd(activity)
-                return
-            }
-            appOpenAd!!.fullScreenContentCallback = object : FullScreenContentCallback() {
-                override fun onAdDismissedFullScreenContent() {
-                    appOpenAd = null
-                    isShowingAd = false
-                    onShowAdCompleteListener.onShowAdComplete()
-                    loadAd(activity)
-                }
-
-                override fun onAdFailedToShowFullScreenContent(adError: AdError) {
-                    appOpenAd = null
-                    isShowingAd = false
-                    onShowAdCompleteListener.onShowAdComplete()
-                    loadAd(activity)
-                }
-
-                override fun onAdShowedFullScreenContent() {
-                }
-            }
-            isShowingAd = true
-            appOpenAd!!.show(activity)
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/ads/AdsCoreManager.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/ads/AdsCoreManager.kt
new file mode 100644
index 0000000..c17e337
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/ads/AdsCoreManager.kt
@@ -0,0 +1,121 @@
+package com.d4rk.englishwithlidia.plus.data.core.ads
+
+import android.app.Activity
+import android.content.Context
+import com.d4rk.englishwithlidia.plus.constants.ads.AdsConstants
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.utils.interfaces.OnShowAdCompleteListener
+import com.google.android.gms.ads.AdError
+import com.google.android.gms.ads.AdRequest
+import com.google.android.gms.ads.FullScreenContentCallback
+import com.google.android.gms.ads.LoadAdError
+import com.google.android.gms.ads.MobileAds
+import com.google.android.gms.ads.appopen.AppOpenAd
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.runBlocking
+import java.util.Date
+
+open class AdsCoreManager(protected val context: Context) {
+
+    private lateinit var dataStore: DataStore
+    private var appOpenAdManager: AppOpenAdManager? = null
+    val isShowingAd: Boolean
+        get() = appOpenAdManager?.isShowingAd == true
+
+    fun initializeAds() {
+        MobileAds.initialize(context)
+        appOpenAdManager = AppOpenAdManager()
+    }
+
+    fun showAdIfAvailable(activity: Activity) {
+        appOpenAdManager?.showAdIfAvailable(activity)
+    }
+
+    fun setDataStore(dataStore: DataStore) {
+        this.dataStore = dataStore
+    }
+
+    private inner class AppOpenAdManager {
+        private var appOpenAd: AppOpenAd? = null
+        private var isLoadingAd = false
+        var isShowingAd = false
+        private var loadTime: Long = 0
+
+        fun loadAd(context: Context) {
+            if (isLoadingAd || isAdAvailable()) {
+                return
+            }
+            isLoadingAd = true
+            val request: AdRequest = AdRequest.Builder().build()
+            @Suppress("DEPRECATION")
+            AppOpenAd.load(context,
+                AdsConstants.APP_OPEN_UNIT_ID,
+                request,
+                AppOpenAd.APP_OPEN_AD_ORIENTATION_PORTRAIT,
+                object : AppOpenAd.AppOpenAdLoadCallback() {
+                    override fun onAdLoaded(ad: AppOpenAd) {
+                        appOpenAd = ad
+                        isLoadingAd = false
+                        loadTime = Date().time
+                    }
+
+                    override fun onAdFailedToLoad(loadAdError: LoadAdError) {
+                        isLoadingAd = false
+                    }
+                })
+        }
+
+        private fun wasLoadTimeLessThanNHoursAgo(): Boolean {
+            val dateDifference: Long = Date().time - loadTime
+            val numMilliSecondsPerHour: Long = 3600000
+            return dateDifference < numMilliSecondsPerHour * 4
+        }
+
+        private fun isAdAvailable(): Boolean {
+            return appOpenAd != null && wasLoadTimeLessThanNHoursAgo()
+        }
+
+        fun showAdIfAvailable(activity: Activity) {
+            showAdIfAvailable(activity, object : OnShowAdCompleteListener {
+                override fun onShowAdComplete() {
+                }
+            })
+        }
+
+        fun showAdIfAvailable(
+            activity: Activity,
+            onShowAdCompleteListener: OnShowAdCompleteListener
+        ) {
+            val isAdsChecked: Boolean =
+                runBlocking { dataStore.ads.first() }
+            if (isShowingAd || !isAdsChecked) {
+                return
+            }
+            if (!isAdAvailable()) {
+                onShowAdCompleteListener.onShowAdComplete()
+                loadAd(activity)
+                return
+            }
+            appOpenAd?.fullScreenContentCallback = object : FullScreenContentCallback() {
+                override fun onAdDismissedFullScreenContent() {
+                    appOpenAd = null
+                    isShowingAd = false
+                    onShowAdCompleteListener.onShowAdComplete()
+                    loadAd(activity)
+                }
+
+                override fun onAdFailedToShowFullScreenContent(adError: AdError) {
+                    appOpenAd = null
+                    isShowingAd = false
+                    onShowAdCompleteListener.onShowAdComplete()
+                    loadAd(activity)
+                }
+
+                override fun onAdShowedFullScreenContent() {
+                }
+            }
+            isShowingAd = true
+            appOpenAd?.show(activity)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/datastore/DataStoreCoreManager.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/datastore/DataStoreCoreManager.kt
new file mode 100644
index 0000000..ea944c4
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/core/datastore/DataStoreCoreManager.kt
@@ -0,0 +1,25 @@
+package com.d4rk.englishwithlidia.plus.data.core.datastore
+
+import android.content.Context
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.flow.firstOrNull
+
+open class DataStoreCoreManager(protected val context: Context) {
+
+    private var isDataStoreLoaded = false
+    lateinit var dataStore: DataStore
+
+    suspend fun initializeDataStore(): Boolean = coroutineScope {
+        dataStore = DataStore.getInstance(context = context.applicationContext)
+
+        listOf(
+            async { dataStore.getLanguage().firstOrNull() ?: "en" },
+        ).awaitAll()
+
+        isDataStoreLoaded = true
+        return@coroutineScope isDataStoreLoaded
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/datastore/DataStore.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/datastore/DataStore.kt
index ae8e558..8702888 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/datastore/DataStore.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/datastore/DataStore.kt
@@ -7,6 +7,7 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.longPreferencesKey
 import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
+import com.d4rk.englishwithlidia.plus.constants.datastore.DataStoreNamesConstants
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
@@ -38,7 +39,6 @@ class DataStore(context: Context) {
         }
     }
 
-
     // Startup
     private val startupKey = booleanPreferencesKey("value")
     val startup: Flow<Boolean> = dataStore.data.map { preferences ->
@@ -86,29 +86,27 @@ class DataStore(context: Context) {
         }
     }
 
-    private val languageKey = stringPreferencesKey("language")
-
-    fun getLanguage(): Flow<String> = dataStore.data.map { preferences ->
-        preferences[languageKey] ?: "en"
+    private val bouncyButtonsKey =
+            booleanPreferencesKey(name = DataStoreNamesConstants.DATA_STORE_BOUNCY_BUTTONS)
+    val bouncyButtons : Flow<Boolean> = dataStore.data.map { preferences ->
+        preferences[bouncyButtonsKey] != false
     }
 
-    suspend fun saveLanguage(language: String) {
+    suspend fun saveBouncyButtons(isChecked : Boolean) {
         dataStore.edit { preferences ->
-            preferences[languageKey] = language
+            preferences[bouncyButtonsKey] = isChecked
         }
     }
 
-    private val currencyKey = stringPreferencesKey("preferred_currency")
+    private val languageKey = stringPreferencesKey("language")
 
-    fun getCurrency(): Flow<String> {
-        return dataStore.data.map { preferences ->
-            preferences[currencyKey] ?: ""
-        }
+    fun getLanguage(): Flow<String> = dataStore.data.map { preferences ->
+        preferences[languageKey] ?: "en"
     }
 
-    suspend fun saveCurrency(currency: String) {
+    suspend fun saveLanguage(language: String) {
         dataStore.edit { preferences ->
-            preferences[currencyKey] = currency
+            preferences[languageKey] = language
         }
     }
 
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/api/ApiResponse.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/api/ApiResponse.kt
index 5ec225b..a5dcd36 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/api/ApiResponse.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/api/ApiResponse.kt
@@ -1,22 +1,25 @@
-@file:OptIn(kotlinx.serialization.ExperimentalSerializationApi::class)
-
 package com.d4rk.englishwithlidia.plus.data.model.api
 
+import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.JsonNames
 
 @Serializable
 data class ApiResponse(
-    val data: List<NetworkLesson>
+    @SerialName("data") val data: List<NetworkLesson>
 )
 
 @Serializable
 data class NetworkLesson(
-    val id: Int,
-    val title: String,
-    val banner: String,
-    @JsonNames("lessonDetails.title") val lessonDetailsTitle: String,
-    @JsonNames("lessonDetails.audioUrl") val lessonDetailsAudioUrl: String,
-    @JsonNames("lessonDetails.lessonIntro") val lessonDetailsLessonIntro: String,
-    @JsonNames("lessonDetails.lessonSummary") val lessonDetailsLessonSummary: String
+    @SerialName("lesson_id") val id: Int,
+    @SerialName("lesson_title") val title: String,
+    @SerialName("lesson_banner") val banner: String,
+    @SerialName("lesson_details") val lessonDetails: LessonDetails
+)
+
+@Serializable
+data class LessonDetails(
+    @SerialName("lesson_details_title_extension") val titleExtension: String,
+    @SerialName("lesson_details_podcast") val podcast: String,
+    @SerialName("lesson_details_intro") val intro: String,
+    @SerialName("lesson_details_summary") val summary: String
 )
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/animations/button/ButtonState.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/animations/button/ButtonState.kt
new file mode 100644
index 0000000..9a5467a
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/animations/button/ButtonState.kt
@@ -0,0 +1,3 @@
+package com.d4rk.englishwithlidia.plus.data.model.ui.animations.button
+
+enum class ButtonState { Pressed , Idle }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/error/UiErrorModel.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/error/UiErrorModel.kt
new file mode 100644
index 0000000..0d4e6fb
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/error/UiErrorModel.kt
@@ -0,0 +1,5 @@
+package com.d4rk.englishwithlidia.plus.data.model.ui.error
+
+data class UiErrorModel(
+    val showErrorDialog : Boolean = false , val errorMessage : String = ""
+)
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/lessons/UiLessonsAsset.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/lessons/UiLessonsAsset.kt
deleted file mode 100644
index 867b103..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/lessons/UiLessonsAsset.kt
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.d4rk.englishwithlidia.plus.data.model.ui.lessons
-
-import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class UiLessonsAsset(
-    val id: Int,
-    val title: String,
-    val banner: String,
-    val lessonDetails: UiLessonDetails
-) : Parcelable {
-    @Parcelize
-    data class UiLessonDetails(
-        val title: String,
-        val audioUrl: String,
-        val lessonIntro: String,
-        val lessonSummary: String
-    ) : Parcelable
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/navigation/NavigationItem.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/navigation/NavigationDrawerItem.kt
similarity index 85%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/navigation/NavigationItem.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/navigation/NavigationDrawerItem.kt
index 7b97fcf..1e5bf32 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/navigation/NavigationItem.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/navigation/NavigationDrawerItem.kt
@@ -2,6 +2,6 @@ package com.d4rk.englishwithlidia.plus.data.model.ui.navigation
 
 import androidx.compose.ui.graphics.vector.ImageVector
 
-data class NavigationItem(
+data class NavigationDrawerItem(
     val title: Int, val selectedIcon: ImageVector, val badgeCount: Int? = null
 )
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLesson.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLesson.kt
new file mode 100644
index 0000000..446087b
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLesson.kt
@@ -0,0 +1,13 @@
+package com.d4rk.englishwithlidia.plus.data.model.ui.screens
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UiLesson(
+    @SerialName("lesson_id") val lessonId: String = "" ,
+    @SerialName("lesson_title") val lessonTitle: String = "" ,
+    @SerialName("lesson_type") val lessonType: String = "",
+    @SerialName("thumbnail_image_url") var thumbnailImageUrl : String = "" ,
+    @SerialName("deep_link_path") val deepLinkPath: String = "" ,
+)
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/lessons/UiLessonDetails.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLessonDetails.kt
similarity index 72%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/lessons/UiLessonDetails.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLessonDetails.kt
index cd84dd4..ae912b4 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/lessons/UiLessonDetails.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLessonDetails.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.data.model.ui.lessons
+package com.d4rk.englishwithlidia.plus.data.model.ui.screens
 
 import android.os.Parcelable
 import kotlinx.parcelize.Parcelize
@@ -9,6 +9,4 @@ data class UiLessonDetails(
     val audioUrl: String,
     val lessonIntro: String,
     val lessonSummary: String
-) : Parcelable {
-
-}
\ No newline at end of file
+) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLessonsAsset.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLessonsAsset.kt
new file mode 100644
index 0000000..9794cd2
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/data/model/ui/screens/UiLessonsAsset.kt
@@ -0,0 +1,17 @@
+package com.d4rk.englishwithlidia.plus.data.model.ui.screens
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class UiLessonsAsset(
+    val id : Int , val title : String , val banner : String , val lessonDetails : UiLessonDetails
+) : Parcelable {
+    @Parcelize
+    data class UiLessonDetails(
+        val title : String ,
+        val audioUrl : String ,
+        val lessonIntro : String ,
+        val lessonSummary : String
+    ) : Parcelable
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/FloatingActionButton.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/FloatingActionButton.kt
new file mode 100644
index 0000000..1e34c2f
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/FloatingActionButton.kt
@@ -0,0 +1,52 @@
+package com.d4rk.englishwithlidia.plus.ui.components
+
+import androidx.compose.animation.core.AnimationSpec
+import androidx.compose.animation.core.FastOutSlowInEasing
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.material3.ExtendedFloatingActionButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.graphicsLayer
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+
+@Composable
+fun AnimatedExtendedFloatingActionButton(
+    visible : Boolean = true ,
+    onClick : () -> Unit ,
+    icon : @Composable () -> Unit ,
+    text : (@Composable () -> Unit)? = null ,
+    offsetX : Float = 50f ,
+    offsetY : Float = 50f ,
+    scale : Float = 0.8f ,
+    animationSpec : AnimationSpec<Float> = tween(
+        durationMillis = 300 , easing = FastOutSlowInEasing
+    )
+) {
+    val animatedOffsetX by animateFloatAsState(
+        targetValue = if (visible) 0f else offsetX ,
+        animationSpec = animationSpec ,
+        label = "OffsetX"
+    )
+    val animatedOffsetY by animateFloatAsState(
+        targetValue = if (visible) 0f else offsetY ,
+        animationSpec = animationSpec ,
+        label = "OffsetY"
+    )
+    val animatedScale by animateFloatAsState(
+        targetValue = if (visible) 1f else scale , animationSpec = animationSpec , label = "Scale"
+    )
+
+    ExtendedFloatingActionButton(onClick = onClick ,
+                                 icon = icon ,
+                                 text = text ?: {} ,
+                                 modifier = Modifier
+                                         .bounceClick()
+                                         .graphicsLayer {
+                                             scaleX = animatedScale
+                                             scaleY = animatedScale
+                                             translationX = animatedOffsetX
+                                             translationY = animatedOffsetY
+                                         })
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/compose/components/SettingsComposablesUtils.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/Preferences.kt
similarity index 74%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/compose/components/SettingsComposablesUtils.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/Preferences.kt
index 1fe4089..964dc74 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/compose/components/SettingsComposablesUtils.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/Preferences.kt
@@ -1,5 +1,7 @@
-package com.d4rk.englishwithlidia.plus.utils.compose.components
+package com.d4rk.englishwithlidia.plus.ui.components
 
+import android.view.SoundEffectConstants
+import android.view.View
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -27,7 +29,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 
 /**
@@ -44,39 +48,65 @@ import androidx.compose.ui.unit.dp
 fun SwitchCardComposable(
     title : String , switchState : State<Boolean> , onSwitchToggled : (Boolean) -> Unit
 ) {
+    val view : View = LocalView.current
     Card(modifier = Modifier
-        .fillMaxWidth()
-        .padding(24.dp)
-        .clip(RoundedCornerShape(28.dp))
-        .clickable {
-            onSwitchToggled(! switchState.value)
-        }) {
+            .fillMaxWidth()
+            .padding(24.dp)
+            .clip(RoundedCornerShape(28.dp))
+            .clickable {
+                view.playSoundEffect(SoundEffectConstants.CLICK)
+                onSwitchToggled(! switchState.value)
+            }) {
         Row(
             modifier = Modifier
-                .fillMaxWidth()
-                .padding(16.dp) ,
+                    .fillMaxWidth()
+                    .padding(16.dp) ,
             horizontalArrangement = Arrangement.SpaceBetween ,
             verticalAlignment = Alignment.CenterVertically
         ) {
             Text(text = title)
-            Switch(checked = switchState.value ,
-                onCheckedChange = onSwitchToggled ,
-                thumbContent = if (switchState.value) {
-                    {
-                        Icon(
-                            Icons.Filled.Check ,
-                            contentDescription = null ,
-                            modifier = Modifier.size(SwitchDefaults.IconSize) ,
-                        )
-                    }
+            Switch(checked = switchState.value , onCheckedChange = { isChecked ->
+                onSwitchToggled(isChecked)
+            } , thumbContent = if (switchState.value) {
+                {
+                    Icon(
+                        Icons.Filled.Check ,
+                        contentDescription = null ,
+                        modifier = Modifier.size(SwitchDefaults.IconSize) ,
+                    )
                 }
-                else {
-                    null
-                })
+            }
+            else {
+                null
+            })
         }
     }
 }
 
+@Composable
+fun SettingsPreferenceItem(
+    icon : ImageVector? = null ,
+    title : String? = null ,
+    summary : String? = null ,
+    rippleEffectDp : Dp = 2.dp ,
+    onClick : () -> Unit = {}
+) {
+    Card(
+        modifier = Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(2.dp)) ,
+        shape = RoundedCornerShape(2.dp) ,
+    ) {
+        PreferenceItem(rippleEffectDp = rippleEffectDp ,
+                       icon = icon ,
+                       title = title ,
+                       summary = summary ,
+                       onClick = {
+                           onClick()
+                       })
+    }
+}
+
 /**
  * Displays a category header within your app's preference screens.
  *
@@ -112,19 +142,22 @@ fun PreferenceItem(
     title : String? = null ,
     summary : String? = null ,
     enabled : Boolean = true ,
+    rippleEffectDp : Dp = 16.dp ,
     onClick : () -> Unit = {}
 ) {
+    val view : View = LocalView.current
     Row(
         modifier = Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(16.dp))
-            .clickable(enabled = enabled , onClick = onClick) ,
-        verticalAlignment = Alignment.CenterVertically
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(rippleEffectDp))
+                .clickable(enabled = enabled , onClick = {
+                    view.playSoundEffect(SoundEffectConstants.CLICK)
+                    onClick()
+                }) , verticalAlignment = Alignment.CenterVertically
     ) {
         icon?.let {
             Spacer(modifier = Modifier.width(16.dp))
             Icon(it , contentDescription = null)
-            Spacer(modifier = Modifier.width(16.dp))
         }
         Column(
             modifier = Modifier.padding(16.dp)
@@ -167,12 +200,15 @@ fun SwitchPreferenceItem(
     checked : Boolean ,
     onCheckedChange : (Boolean) -> Unit
 ) {
+    val view : View = LocalView.current
     Row(
         modifier = Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(16.dp))
-            .clickable(onClick = { onCheckedChange(! checked) }) ,
-        verticalAlignment = Alignment.CenterVertically
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(16.dp))
+                .clickable(onClick = {
+                    view.playSoundEffect(SoundEffectConstants.CLICK)
+                    onCheckedChange(! checked)
+                }) , verticalAlignment = Alignment.CenterVertically
     ) {
         icon?.let {
             Spacer(modifier = Modifier.width(16.dp))
@@ -181,19 +217,17 @@ fun SwitchPreferenceItem(
         }
         Column(
             modifier = Modifier
-                .padding(16.dp)
-                .weight(1f)
+                    .padding(16.dp)
+                    .weight(1f)
         ) {
             Text(text = title , style = MaterialTheme.typography.titleLarge)
             summary?.let {
                 Text(text = it , style = MaterialTheme.typography.bodyMedium)
             }
         }
-        Switch(
-            checked = checked ,
-            onCheckedChange = onCheckedChange ,
-            modifier = Modifier.padding(16.dp)
-        )
+        Switch(checked = checked , onCheckedChange = { isChecked ->
+            onCheckedChange(isChecked)
+        } , modifier = Modifier.padding(16.dp))
     }
 }
 
@@ -222,11 +256,15 @@ fun SwitchPreferenceItemWithDivider(
     onClick : () -> Unit ,
     onSwitchClick : (Boolean) -> Unit
 ) {
+    val view : View = LocalView.current
     Row(
         modifier = Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(16.dp))
-            .clickable(onClick = onClick) , verticalAlignment = Alignment.CenterVertically
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(16.dp))
+                .clickable(onClick = {
+                    view.playSoundEffect(SoundEffectConstants.CLICK)
+                    onClick()
+                }) , verticalAlignment = Alignment.CenterVertically
     ) {
         icon?.let {
             Spacer(modifier = Modifier.width(16.dp))
@@ -235,8 +273,8 @@ fun SwitchPreferenceItemWithDivider(
         }
         Column(
             modifier = Modifier
-                .padding(16.dp)
-                .weight(1f)
+                    .padding(16.dp)
+                    .weight(1f)
         ) {
             Text(text = title , style = MaterialTheme.typography.titleLarge)
             Text(text = summary , style = MaterialTheme.typography.bodyMedium)
@@ -244,8 +282,8 @@ fun SwitchPreferenceItemWithDivider(
 
         VerticalDivider(
             modifier = Modifier
-                .height(32.dp)
-                .align(Alignment.CenterVertically) ,
+                    .height(32.dp)
+                    .align(Alignment.CenterVertically) ,
             color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.3f) ,
             thickness = 1.dp
         )
@@ -253,6 +291,5 @@ fun SwitchPreferenceItemWithDivider(
             onCheckedChange(isChecked)
             onSwitchClick(isChecked)
         } , modifier = Modifier.padding(16.dp))
-
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/Snackbar.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/Snackbar.kt
new file mode 100644
index 0000000..7328456
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/Snackbar.kt
@@ -0,0 +1,34 @@
+package com.d4rk.englishwithlidia.plus.ui.components
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.SnackbarDuration
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+
+@Composable
+fun Snackbar(
+    message : String , showSnackbar : Boolean , onDismiss : () -> Unit
+) {
+    val snackbarHostState = remember { SnackbarHostState() }
+
+    LaunchedEffect(showSnackbar) {
+        if (showSnackbar) {
+            snackbarHostState.showSnackbar(message , duration = SnackbarDuration.Short)
+            onDismiss()
+        }
+    }
+
+    Box(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        SnackbarHost(
+            hostState = snackbarHostState , modifier = Modifier.align(Alignment.BottomCenter)
+        )
+    }
+}
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ads/BannerAdsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/ads/BannerAds.kt
similarity index 86%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ads/BannerAdsComposable.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/ads/BannerAds.kt
index ffb4d88..f7ea7cf 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ads/BannerAdsComposable.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/ads/BannerAds.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ads
+package com.d4rk.englishwithlidia.plus.ui.components.ads
 
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.runtime.Composable
@@ -13,10 +13,10 @@ import com.google.android.gms.ads.AdSize
 import com.google.android.gms.ads.AdView
 
 @Composable
-fun BannerAdsComposable(
+fun AdBanner(
     modifier: Modifier = Modifier, dataStore: DataStore
 ) {
-    val showAds by dataStore.ads.collectAsState(initial = true)
+    val showAds: Boolean by dataStore.ads.collectAsState(initial = true)
 
     if (showAds) {
         AndroidView(modifier = modifier.fillMaxWidth(), factory = { context ->
@@ -33,7 +33,7 @@ fun BannerAdsComposable(
 fun LargeBannerAdsComposable(
     modifier: Modifier = Modifier, dataStore: DataStore
 ) {
-    val showAds by dataStore.ads.collectAsState(initial = true)
+    val showAds: Boolean by dataStore.ads.collectAsState(initial = true)
 
     if (showAds) {
         AndroidView(modifier = modifier.fillMaxWidth(), factory = { context ->
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/animations/Animations.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/animations/Animations.kt
new file mode 100644
index 0000000..10f69ad
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/animations/Animations.kt
@@ -0,0 +1,129 @@
+package com.d4rk.englishwithlidia.plus.ui.components.animations
+
+import android.content.Context
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.gestures.awaitFirstDown
+import androidx.compose.foundation.gestures.waitForUpOrCancellation
+import androidx.compose.foundation.layout.offset
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.pager.PagerState
+import androidx.compose.material3.DrawerState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.composed
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.hapticfeedback.HapticFeedback
+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
+import androidx.compose.ui.input.pointer.pointerInput
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalHapticFeedback
+import androidx.compose.ui.unit.IntOffset
+import androidx.compose.ui.unit.dp
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.data.model.ui.animations.button.ButtonState
+
+@Composable
+fun Modifier.bounceClick(
+    animationEnabled : Boolean = true ,
+) : Modifier = composed {
+    var buttonState : ButtonState by remember { mutableStateOf(ButtonState.Idle) }
+    val context : Context = LocalContext.current
+    val dataStore : DataStore = DataStore.getInstance(context = context)
+    val bouncyButtonsEnabled : Boolean by dataStore.bouncyButtons.collectAsState(initial = true)
+    val scale : Float by animateFloatAsState(
+        if (buttonState == ButtonState.Pressed && animationEnabled && bouncyButtonsEnabled) 0.96f else 1f ,
+        label = "Button Press Scale Animation"
+    )
+
+    if (bouncyButtonsEnabled) {
+        return@composed this
+                .graphicsLayer {
+                    scaleX = scale
+                    scaleY = scale
+                }
+                .pointerInput(buttonState) {
+                    awaitPointerEventScope {
+                        buttonState = if (buttonState == ButtonState.Pressed) {
+                            waitForUpOrCancellation()
+                            ButtonState.Idle
+                        }
+                        else {
+                            awaitFirstDown(requireUnconsumed = false)
+                            ButtonState.Pressed
+                        }
+                    }
+                }
+    }
+    else {
+        return@composed this
+    }
+}
+
+fun Modifier.hapticDrawerSwipe(drawerState : DrawerState) : Modifier = composed {
+    val haptic : HapticFeedback = LocalHapticFeedback.current
+    var hasVibrated : Boolean by remember { mutableStateOf(value = false) }
+
+    LaunchedEffect(drawerState.currentValue , drawerState.targetValue) {
+        if (drawerState.isAnimationRunning && ! hasVibrated) {
+            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+            hasVibrated = true
+        }
+
+        if (! drawerState.isAnimationRunning) {
+            hasVibrated = false
+        }
+    }
+
+    return@composed this
+}
+
+fun Modifier.hapticPagerSwipe(pagerState : PagerState) : Modifier = composed {
+    val haptic : HapticFeedback = LocalHapticFeedback.current
+    var hasVibrated : Boolean by remember { mutableStateOf(value = false) }
+
+    LaunchedEffect(pagerState.isScrollInProgress) {
+        if (pagerState.isScrollInProgress && ! hasVibrated) {
+            haptic.performHapticFeedback(HapticFeedbackType.LongPress)
+            hasVibrated = true
+        }
+        else if (! pagerState.isScrollInProgress) {
+            hasVibrated = false
+        }
+    }
+
+    return@composed this
+}
+
+fun Modifier.animateVisibility(
+    visible : Boolean = true ,
+    index : Int = 0 ,
+    offsetY : Int = 50 ,
+    durationMillis : Int = 300 ,
+    delayPerItem : Int = 64
+) = composed {
+    val alpha = animateFloatAsState(
+        targetValue = if (visible) 1f else 0f , animationSpec = tween(
+            durationMillis = durationMillis , delayMillis = index * delayPerItem
+        ) , label = "Alpha"
+    )
+
+    val offsetYState = animateFloatAsState(
+        targetValue = if (visible) 0f else offsetY.toFloat() , animationSpec = tween(
+            durationMillis = durationMillis , delayMillis = index * delayPerItem
+        ) , label = "OffsetY"
+    )
+
+    this
+            .offset { IntOffset(x = 0 , offsetYState.value.toInt()) }
+            .graphicsLayer {
+                this.alpha = alpha.value
+            }
+            .padding(vertical = 4.dp)
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/dialogs/LanguageDialogComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/LanguageDialogComposable.kt
similarity index 98%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/dialogs/LanguageDialogComposable.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/LanguageDialogComposable.kt
index 9bf0c95..2497943 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/dialogs/LanguageDialogComposable.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/LanguageDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.dialogs
+package com.d4rk.englishwithlidia.plus.ui.components.dialogs
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/SelectLanguageAlertDialog.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/SelectLanguageAlertDialog.kt
new file mode 100644
index 0000000..df2fd58
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/SelectLanguageAlertDialog.kt
@@ -0,0 +1,112 @@
+package com.d4rk.englishwithlidia.plus.ui.components.dialogs
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.material.icons.outlined.Language
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringArrayResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import kotlinx.coroutines.flow.firstOrNull
+
+@Composable
+fun SelectLanguageAlertDialog(
+    dataStore: DataStore, onDismiss: () -> Unit, onLanguageSelected: (String) -> Unit
+) {
+    val selectedLanguage: MutableState<String> = remember { mutableStateOf(value = "") }
+    val languageEntries: List<String> =
+        stringArrayResource(R.array.preference_language_entries).toList()
+    val languageValues: List<String> =
+        stringArrayResource(R.array.preference_language_values).toList()
+
+    AlertDialog(onDismissRequest = onDismiss, text = {
+        SelectLanguageAlertDialogContent(
+            selectedLanguage, dataStore, languageEntries, languageValues
+        )
+    }, icon = {
+        Icon(Icons.Outlined.Language, contentDescription = null)
+    }, confirmButton = {
+        TextButton(onClick = {
+            onLanguageSelected(selectedLanguage.value)
+            onDismiss()
+        }) {
+            Text(text = stringResource(id = android.R.string.ok))
+        }
+    }, dismissButton = {
+        TextButton(onClick = onDismiss) {
+            Text(text = stringResource(id = android.R.string.cancel))
+        }
+    })
+}
+
+@Composable
+fun SelectLanguageAlertDialogContent(
+    selectedLanguage: MutableState<String>,
+    dataStore: DataStore,
+    languageEntries: List<String>,
+    languageValues: List<String>
+) {
+    LaunchedEffect(Unit) {
+        selectedLanguage.value = dataStore.getLanguage().firstOrNull() ?: ""
+    }
+
+    Column {
+        Text(text = stringResource(id = R.string.dialog_language_subtitle))
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f)
+        ) {
+            LazyColumn {
+                items(languageEntries.size) { index ->
+                    Row(
+                        Modifier.fillMaxWidth(),
+                        verticalAlignment = Alignment.CenterVertically,
+                        horizontalArrangement = Arrangement.Start
+                    ) {
+                        RadioButton(selected = selectedLanguage.value == languageValues[index],
+                            onClick = {
+                                selectedLanguage.value = languageValues[index]
+                            })
+                        Text(
+                            modifier = Modifier.padding(start = 8.dp),
+                            text = languageEntries[index],
+                            style = MaterialTheme.typography.bodyMedium.merge()
+                        )
+                    }
+                }
+            }
+        }
+        Spacer(modifier = Modifier.height(24.dp))
+        Icon(imageVector = Icons.Outlined.Info, contentDescription = null)
+        Spacer(modifier = Modifier.height(12.dp))
+        Text(text = stringResource(id = R.string.dialog_info_language))
+    }
+
+    LaunchedEffect(selectedLanguage.value) {
+        dataStore.saveLanguage(selectedLanguage.value)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/VersionInfoAlertDialog.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/VersionInfoAlertDialog.kt
new file mode 100644
index 0000000..05d390e
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/VersionInfoAlertDialog.kt
@@ -0,0 +1,66 @@
+package com.d4rk.englishwithlidia.plus.ui.components.dialogs
+
+import android.content.Context
+import android.graphics.drawable.Drawable
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import coil3.ImageLoader
+import coil3.compose.AsyncImage
+import com.d4rk.englishwithlidia.plus.BuildConfig
+import com.d4rk.englishwithlidia.plus.R
+
+@Composable
+fun VersionInfoAlertDialog(onDismiss : () -> Unit) {
+    AlertDialog(
+        onDismissRequest = onDismiss ,
+        text = { VersionInfoAlertDialogContent() } ,
+        confirmButton = {} ,
+    )
+}
+
+@Composable
+fun VersionInfoAlertDialogContent() {
+    val context : Context = LocalContext.current
+    val copyright : String = context.getString(R.string.copyright)
+    val appIcon : Drawable = context.packageManager.getApplicationIcon(context.packageName)
+    val imageLoader = ImageLoader.Builder(context).build()
+
+    Row(
+        modifier = Modifier.fillMaxWidth()
+    ) {
+        AsyncImage(
+            model = appIcon ,
+            contentDescription = null ,
+            modifier = Modifier.size(48.dp) ,
+            imageLoader = imageLoader
+        )
+        Spacer(modifier = Modifier.width(16.dp))
+        Column {
+            Text(
+                text = context.getString(R.string.app_name) ,
+                style = MaterialTheme.typography.titleLarge
+            )
+            Text(
+                text = stringResource(id = R.string.version , BuildConfig.VERSION_NAME) ,
+                style = MaterialTheme.typography.bodyMedium
+            )
+            Spacer(modifier = Modifier.height(16.dp))
+            Text(
+                text = copyright , style = MaterialTheme.typography.bodyMedium
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/dialogs/VersionInfoDialogComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/VersionInfoDialogComposable.kt
similarity index 94%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/dialogs/VersionInfoDialogComposable.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/VersionInfoDialogComposable.kt
index 8f05030..ba71027 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/dialogs/VersionInfoDialogComposable.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/dialogs/VersionInfoDialogComposable.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.dialogs
+package com.d4rk.englishwithlidia.plus.ui.components.dialogs
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Column
@@ -19,7 +19,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.englishwithlidia.plus.BuildConfig
 import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.utils.drawable.toBitmapDrawable
+import com.d4rk.englishwithlidia.plus.ui.components.drawable.toBitmapDrawable
 
 @Composable
 fun VersionInfoDialog(onDismiss: () -> Unit) {
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/drawable/HomeBanner.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/drawable/HomeBanner.kt
similarity index 99%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/drawable/HomeBanner.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/drawable/HomeBanner.kt
index 6021ec0..afd8725 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/drawable/HomeBanner.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/drawable/HomeBanner.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.utils.drawable
+package com.d4rk.englishwithlidia.plus.ui.components.drawable
 
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/drawable/ImageUtils.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/drawable/ImageUtils.kt
similarity index 93%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/drawable/ImageUtils.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/drawable/ImageUtils.kt
index 7c4698d..b8ba552 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/drawable/ImageUtils.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/drawable/ImageUtils.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.utils.drawable
+package com.d4rk.englishwithlidia.plus.ui.components.drawable
 
 import android.content.res.Resources
 import android.graphics.Bitmap
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/layouts/LessonContentLayout.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/layouts/LessonContentLayout.kt
new file mode 100644
index 0000000..7dc1f0b
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/layouts/LessonContentLayout.kt
@@ -0,0 +1,3 @@
+package com.d4rk.englishwithlidia.plus.ui.components.layouts
+
+class LessonContentLayout {}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/layouts/LessonListLayout.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/layouts/LessonListLayout.kt
new file mode 100644
index 0000000..c53afad
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/layouts/LessonListLayout.kt
@@ -0,0 +1,182 @@
+package com.d4rk.englishwithlidia.plus.ui.components.layouts
+
+import android.content.Context
+import android.content.Intent
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import coil3.request.ImageRequest
+import coil3.request.crossfade
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.data.model.ui.screens.UiLessonsAsset
+import com.d4rk.englishwithlidia.plus.ui.components.ads.AdBanner
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.components.drawable.homeBanner
+import com.d4rk.englishwithlidia.plus.ui.screens.lessons.LessonsActivity
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+
+@Composable
+fun LessonListLayout(context : Context, isLoading : Boolean, dataStore : DataStore, lessons: List<UiLessonsAsset>) {
+    LazyColumn(
+        modifier = Modifier.fillMaxSize()
+    ) {
+        item {
+            Image(
+                imageVector = homeBanner() ,
+                contentDescription = null ,
+                modifier = Modifier
+                        .fillMaxWidth()
+                        .wrapContentHeight() ,
+                contentScale = ContentScale.FillWidth
+            )
+            Spacer(modifier = Modifier.height(height = 16.dp))
+        }
+        item {
+            Row(
+                modifier = Modifier
+                        .fillMaxWidth()
+                        .wrapContentHeight()
+                        .padding(start = 24.dp , end = 24.dp) ,
+            ) {
+                OutlinedButton(
+                    onClick = {
+                        IntentUtils.openUrl(
+                            context , url = "https://sites.google.com/view/englishwithlidia"
+                        )
+                    } , modifier = Modifier
+                            .weight(1f)
+                            .bounceClick()
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_web) ,
+                        contentDescription = stringResource(id = R.string.tooltip_website) ,
+                        modifier = Modifier.size(ButtonDefaults.IconSize)
+                    )
+                    Spacer(Modifier.size(ButtonDefaults.IconSpacing))
+                    Text(stringResource(id = R.string.website))
+                }
+
+                Spacer(modifier = Modifier.width(24.dp))
+
+                OutlinedButton(
+                    onClick = {
+                        IntentUtils.openUrl(context , url = "https://www.facebook.com/lidia.melinte")
+                    } ,
+                    modifier = Modifier
+                            .weight(1f)
+                            .bounceClick() ,
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_find_us) ,
+                        contentDescription = stringResource(id = R.string.tooltip_facebook) ,
+                        modifier = Modifier.size(ButtonDefaults.IconSize)
+                    )
+                    Spacer(Modifier.size(ButtonDefaults.IconSpacing))
+                    Text(text = stringResource(id = R.string.find_us))
+                }
+            }
+            Spacer(modifier = Modifier.height(16.dp))
+        }
+        if (isLoading) {
+            item {
+                Box(
+                    modifier = Modifier
+                            .fillMaxWidth()
+                            .wrapContentHeight()
+                            .padding(all = 16.dp) ,
+                    contentAlignment = Alignment.Center
+                ) {
+                    CircularProgressIndicator()
+                }
+            }
+        }
+        else {
+            item {
+                AdBanner(modifier = Modifier.fillMaxWidth() , dataStore = dataStore)
+                Spacer(modifier = Modifier.height(height = 16.dp))
+            }
+            items(lessons) { lesson ->
+                LessonCard(title = lesson.title , imageResource = lesson.banner , onClick = {
+
+                    // TODO: Use Intent utils or extend the current open class function from the utils
+                    val intent = Intent(context , LessonsActivity::class.java).apply {
+                        putExtra("lessonDetails" , lesson)
+                    }
+                    context.startActivity(intent)
+                })
+            }
+        }
+        item {
+            AdBanner(modifier = Modifier.fillMaxWidth() , dataStore = dataStore)
+        }
+    }
+}
+
+@Composable
+fun LessonCard(title : String , imageResource : String , onClick : () -> Unit) {
+    val context = LocalContext.current
+    Column(
+        modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 24.dp)
+    ) {
+        Card(
+            modifier = Modifier
+                    .fillMaxWidth()
+                    .bounceClick()
+                    .clip(RoundedCornerShape(12.dp))
+                    .clickable(onClick = onClick)
+                    .aspectRatio(2.06f / 1f) ,
+        ) {
+            AsyncImage(
+                model = ImageRequest
+                        .Builder(context).data(imageResource).crossfade(enable = true).build() ,
+                contentDescription = null ,
+                modifier = Modifier.fillMaxSize() ,
+                contentScale = ContentScale.Crop ,
+            )
+        }
+        Spacer(modifier = Modifier.height(8.dp))
+        Text(
+            text = title ,
+            style = MaterialTheme.typography.headlineMedium ,
+            modifier = Modifier.fillMaxWidth()
+        )
+        Spacer(modifier = Modifier.height(16.dp))
+        HorizontalDivider()
+        Spacer(modifier = Modifier.height(16.dp))
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/navigation/NavigationDrawer.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/navigation/NavigationDrawer.kt
new file mode 100644
index 0000000..ece1fda
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/navigation/NavigationDrawer.kt
@@ -0,0 +1,139 @@
+package com.d4rk.englishwithlidia.plus.ui.components.navigation
+
+import android.content.Context
+import android.view.SoundEffectConstants
+import android.view.View
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.EventNote
+import androidx.compose.material.icons.automirrored.outlined.HelpOutline
+import androidx.compose.material.icons.outlined.Settings
+import androidx.compose.material.icons.outlined.Share
+import androidx.compose.material3.DrawerState
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ModalDrawerSheet
+import androidx.compose.material3.ModalNavigationDrawer
+import androidx.compose.material3.NavigationDrawerItem
+import androidx.compose.material3.NavigationDrawerItemDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.data.model.ui.navigation.NavigationDrawerItem
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.components.animations.hapticDrawerSwipe
+import com.d4rk.englishwithlidia.plus.ui.screens.help.HelpActivity
+import com.d4rk.englishwithlidia.plus.ui.screens.main.MainScreenContent
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.SettingsActivity
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+@Composable
+fun NavigationDrawer(
+    drawerState : DrawerState ,
+    view : View ,
+    context : Context ,
+) {
+    val coroutineScope : CoroutineScope = rememberCoroutineScope()
+    val drawerItems : List<NavigationDrawerItem> = listOf(
+        NavigationDrawerItem(
+            title = R.string.settings ,
+            selectedIcon = Icons.Outlined.Settings ,
+        ) ,
+        NavigationDrawerItem(
+            title = R.string.help_and_feedback ,
+            selectedIcon = Icons.AutoMirrored.Outlined.HelpOutline ,
+        ) ,
+        NavigationDrawerItem(
+            title = R.string.updates ,
+            selectedIcon = Icons.AutoMirrored.Outlined.EventNote ,
+        ) ,
+        NavigationDrawerItem(
+            title = R.string.share , selectedIcon = Icons.Outlined.Share
+        ) ,
+    )
+
+    val selectedItemIndex : Int by rememberSaveable { mutableIntStateOf(value = - 1) }
+
+    ModalNavigationDrawer(modifier = Modifier.hapticDrawerSwipe(drawerState) ,
+                          drawerState = drawerState ,
+                          drawerContent = {
+                              ModalDrawerSheet {
+                                  Spacer(modifier = Modifier.height(16.dp))
+                                  drawerItems.forEachIndexed { index , item ->
+                                      val title : String = stringResource(id = item.title)
+                                      NavigationDrawerItem(label = { Text(text = title) } ,
+                                                           selected = index == selectedItemIndex ,
+                                                           onClick = {
+                                                               when (item.title) {
+                                                                   R.string.settings -> {
+                                                                       view.playSoundEffect(
+                                                                           SoundEffectConstants.CLICK
+                                                                       )
+                                                                       IntentUtils.openActivity(
+                                                                           context ,
+                                                                           SettingsActivity::class.java
+                                                                       )
+                                                                   }
+
+                                                                   R.string.help_and_feedback -> {
+                                                                       view.playSoundEffect(
+                                                                           SoundEffectConstants.CLICK
+                                                                       )
+                                                                       IntentUtils.openActivity(
+                                                                           context ,
+                                                                           HelpActivity::class.java
+                                                                       )
+                                                                   }
+
+                                                                   R.string.updates -> {
+                                                                       view.playSoundEffect(
+                                                                           SoundEffectConstants.CLICK
+                                                                       )
+                                                                       IntentUtils.openUrl(
+                                                                           context ,
+                                                                           url = "https://github.com/D4rK7355608/${context.packageName}/blob/master/CHANGELOG.md"
+                                                                       )
+                                                                   }
+
+                                                                   R.string.share -> {
+                                                                       view.playSoundEffect(
+                                                                           SoundEffectConstants.CLICK
+                                                                       )
+                                                                       IntentUtils.shareApp(context)
+                                                                   }
+                                                               }
+                                                               coroutineScope.launch { drawerState.close() }
+                                                           } ,
+                                                           icon = {
+                                                               Icon(
+                                                                   item.selectedIcon ,
+                                                                   contentDescription = title
+                                                               )
+                                                           } ,
+                                                           modifier = Modifier
+                                                                   .padding(
+                                                                       NavigationDrawerItemDefaults.ItemPadding
+                                                                   )
+                                                                   .bounceClick())
+                                  }
+                              }
+                          } ,
+                          content = {
+                              MainScreenContent(
+                                  view = view ,
+                                  drawerState = drawerState ,
+                                  context = context ,
+                                  coroutineScope = coroutineScope
+                              )
+                          })
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/navigation/TopAppBar.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/navigation/TopAppBar.kt
new file mode 100644
index 0000000..423e31b
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/components/navigation/TopAppBar.kt
@@ -0,0 +1,117 @@
+package com.d4rk.englishwithlidia.plus.ui.components.navigation
+
+import android.content.Context
+import android.view.SoundEffectConstants
+import android.view.View
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Menu
+import androidx.compose.material.icons.outlined.VolunteerActivism
+import androidx.compose.material3.DrawerState
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LargeTopAppBar
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.stringResource
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.screens.support.SupportActivity
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun TopAppBarMain(
+    view : View , drawerState : DrawerState , coroutineScope : CoroutineScope , context : Context
+) {
+    TopAppBar(colors = TopAppBarDefaults.topAppBarColors(
+        containerColor = MaterialTheme.colorScheme.primary ,
+        titleContentColor = MaterialTheme.colorScheme.onPrimary ,
+        navigationIconContentColor = MaterialTheme.colorScheme.onPrimary ,
+        actionIconContentColor = MaterialTheme.colorScheme.onSecondary
+    ) , title = { Text(text = stringResource(id = R.string.app_name)) } , navigationIcon = {
+        IconButton(modifier = Modifier.bounceClick() , onClick = {
+            view.playSoundEffect(
+                SoundEffectConstants.CLICK
+            )
+            coroutineScope.launch {
+                drawerState.apply {
+                    if (isClosed) open() else close()
+                }
+            }
+        }) {
+            Icon(
+                imageVector = Icons.Default.Menu ,
+                contentDescription = stringResource(id = R.string.navigation_drawer_open)
+            )
+        }
+    } , actions = {
+        IconButton(modifier = Modifier.bounceClick() , onClick = {
+            view.playSoundEffect(
+                SoundEffectConstants.CLICK
+            )
+            IntentUtils.openActivity(
+                context , SupportActivity::class.java
+            )
+        }) {
+            Icon(
+                Icons.Outlined.VolunteerActivism ,
+                contentDescription = stringResource(id = R.string.support_us)
+            )
+        }
+    })
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun TopAppBarScaffoldWithBackButton(
+    title : String , onBackClicked : () -> Unit , content : @Composable (PaddingValues) -> Unit
+) {
+    val scrollBehaviorState : TopAppBarScrollBehavior =
+            TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
+    val view : View = LocalView.current
+
+    Scaffold(modifier = Modifier.nestedScroll(scrollBehaviorState.nestedScrollConnection) ,
+             topBar = {
+                 LargeTopAppBar(title = { Text(text = title) } , navigationIcon = {
+                     IconButton(modifier = Modifier.bounceClick() , onClick = {
+                         onBackClicked()
+                         view.playSoundEffect(SoundEffectConstants.CLICK)
+                     }) {
+                         Icon(Icons.AutoMirrored.Filled.ArrowBack , contentDescription = null)
+                     }
+                 } , scrollBehavior = scrollBehaviorState)
+             }) { paddingValues ->
+        content(paddingValues)
+    }
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun TopAppBarScaffold(
+    title : String , content : @Composable (PaddingValues) -> Unit
+) {
+    val scrollBehaviorState : TopAppBarScrollBehavior =
+            TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
+
+    Scaffold(modifier = Modifier.nestedScroll(scrollBehaviorState.nestedScrollConnection) ,
+             topBar = {
+                 LargeTopAppBar(title = { Text(text = title) } ,
+                                scrollBehavior = scrollBehaviorState)
+             }) { paddingValues ->
+        content(paddingValues)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpComposable.kt
deleted file mode 100644
index b019d17..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpComposable.kt
+++ /dev/null
@@ -1,255 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.help
-
-import androidx.compose.foundation.background
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawingPadding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.MailOutline
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.outlined.QuestionAnswer
-import androidx.compose.material3.Card
-import androidx.compose.material3.DropdownMenu
-import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExtendedFloatingActionButton
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.constraintlayout.compose.ConstraintLayout
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.ui.dialogs.VersionInfoDialog
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.bounceClick
-import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun HelpComposable(activity : HelpActivity, viewModel: HelpViewModel) {
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    var showMenu by remember { mutableStateOf(false) }
-    val context = LocalContext.current
-    val showDialog = remember { mutableStateOf(false) }
-    val reviewInfo = viewModel.reviewInfo.value
-
-    if (reviewInfo != null) {
-        LaunchedEffect(key1 = reviewInfo) {
-            viewModel.requestReviewFlow()
-        }
-    }
-
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection) , topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.help)) } , navigationIcon = {
-            IconButton(onClick = {
-                activity.finish()
-            }) {
-                Icon(Icons.AutoMirrored.Filled.ArrowBack , contentDescription = null)
-            }
-        } , actions = {
-            IconButton(onClick = { showMenu = true }) {
-                Icon(Icons.Default.MoreVert , contentDescription = "Localized description")
-            }
-            DropdownMenu(expanded = showMenu , onDismissRequest = { showMenu = false }) {
-                DropdownMenuItem(text = { Text(stringResource(R.string.view_in_google_play_store)) } ,
-                    onClick = {
-                        IntentUtils.openUrl(
-                            context ,
-                            "https://play.google.com/store/apps/details?id=${activity.packageName}"
-                        )
-                    })
-                DropdownMenuItem(text = { Text(stringResource(R.string.version_info)) } ,
-                    onClick = { showDialog.value = true })
-                DropdownMenuItem(text = { Text(stringResource(R.string.beta_program)) } ,
-                    onClick = {
-                        IntentUtils.openUrl(
-                            context ,
-                            "https://play.google.com/apps/testing/${activity.packageName}"
-                        )
-                    })
-                DropdownMenuItem(text = { Text(stringResource(R.string.terms_of_service)) } ,
-                    onClick = {
-                        IntentUtils.openUrl(
-                            context ,
-                            "https://sites.google.com/view/d4rk7355608/more/apps/terms-of-service"
-                        )
-                    })
-                DropdownMenuItem(text = { Text(stringResource(R.string.privacy_policy)) } ,
-                    onClick = {
-                        IntentUtils.openUrl(
-                            context ,
-                            "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy"
-                        )
-                    })
-                DropdownMenuItem(text = { Text(stringResource(com.google.android.gms.oss.licenses.R.string.oss_license_title)) } ,
-                    onClick = {
-                        IntentUtils.openActivity(
-                            context , OssLicensesMenuActivity::class.java
-                        )
-                    })
-            }
-            if (showDialog.value) {
-                VersionInfoDialog(onDismiss = { showDialog.value = false })
-            }
-        } , scrollBehavior = scrollBehavior)
-    }) { paddingValues ->
-        Box(
-            modifier = Modifier
-                .padding(start = 16.dp , end = 16.dp)
-                .fillMaxSize()
-                .safeDrawingPadding()
-        ) {
-            ConstraintLayout(modifier = Modifier.padding(paddingValues)) {
-                val (faqTitle , faqCard) = createRefs()
-                Text(text = stringResource(R.string.faq) ,
-                    modifier = Modifier
-                        .padding(bottom = 24.dp)
-                        .constrainAs(faqTitle) {
-                            top.linkTo(parent.top)
-                            start.linkTo(parent.start)
-                        })
-                Card(modifier = Modifier
-                    .fillMaxWidth()
-                    .constrainAs(faqCard) {
-                        top.linkTo(faqTitle.bottom)
-                        bottom.linkTo(parent.bottom)
-                    }) {
-                    FAQComposable()
-                }
-            }
-            ExtendedFloatingActionButton(
-                text = { Text(stringResource(id = R.string.feedback)) } ,
-                onClick = {
-                    viewModel.reviewInfo.value?.let { safeReviewInfo ->
-                        viewModel.launchReviewFlow(activity, safeReviewInfo)
-                    }
-                },
-                icon = {
-                    Icon(
-                        Icons.Default.MailOutline , contentDescription = null
-                    )
-                } ,
-                modifier = Modifier
-                    .bounceClick()
-                    .padding(bottom = 16.dp)
-                    .align(Alignment.BottomEnd) ,
-            )
-        }
-    }
-}
-
-@Composable
-fun FAQComposable() {
-    LazyColumn {
-        item {
-            QuestionComposable(
-                title = stringResource(R.string.question_1) ,
-                summary = stringResource(R.string.summary_preference_faq_1)
-            )
-        }
-        item {
-            QuestionComposable(
-                title = stringResource(R.string.question_2) ,
-                summary = stringResource(R.string.summary_preference_faq_2)
-            )
-        }
-        item {
-            QuestionComposable(
-                title = stringResource(R.string.question_3) ,
-                summary = stringResource(R.string.summary_preference_faq_3)
-            )
-        }
-        item {
-            QuestionComposable(
-                title = stringResource(R.string.question_4) ,
-                summary = stringResource(R.string.summary_preference_faq_4)
-            )
-        }
-        item {
-            QuestionComposable(
-                title = stringResource(R.string.question_5) ,
-                summary = stringResource(R.string.summary_preference_faq_5)
-            )
-        }
-        item {
-            QuestionComposable(
-                title = stringResource(R.string.question_6) ,
-                summary = stringResource(R.string.summary_preference_faq_6)
-            )
-        }
-        item {
-            QuestionComposable(
-                title = stringResource(R.string.question_7) ,
-                summary = stringResource(R.string.summary_preference_faq_7)
-            )
-        }
-        item {
-            QuestionComposable(
-                title = stringResource(R.string.question_8) ,
-                summary = stringResource(R.string.summary_preference_faq_8)
-            )
-        }
-        item {
-            QuestionComposable(
-                title = stringResource(R.string.question_9) ,
-                summary = stringResource(R.string.summary_preference_faq_9)
-            )
-        }
-    }
-}
-
-@Composable
-fun QuestionComposable(title : String , summary : String) {
-    Row(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(16.dp) ,
-        verticalAlignment = Alignment.CenterVertically
-    ) {
-        Icon(
-            Icons.Outlined.QuestionAnswer ,
-            contentDescription = null ,
-            modifier = Modifier
-                .size(48.dp)
-                .background(
-                    color = MaterialTheme.colorScheme.primaryContainer , shape = CircleShape
-                )
-                .padding(8.dp)
-        )
-        Spacer(modifier = Modifier.width(16.dp))
-        Column {
-            Text(
-                text = title , style = MaterialTheme.typography.titleMedium
-            )
-            Spacer(modifier = Modifier.height(4.dp))
-            Text(text = summary)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpViewModel.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpViewModel.kt
deleted file mode 100644
index 4fd4537..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpViewModel.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.help
-
-import android.app.Application
-import androidx.compose.runtime.MutableState
-import androidx.compose.runtime.State
-import androidx.compose.runtime.mutableStateOf
-import androidx.lifecycle.AndroidViewModel
-import androidx.lifecycle.viewModelScope
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.google.android.play.core.review.ReviewInfo
-import com.google.android.play.core.review.ReviewManagerFactory
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-class HelpViewModel(application: Application) : AndroidViewModel(application) {
-
-    private var _reviewInfo: MutableState<ReviewInfo?> = mutableStateOf(null)
-    val reviewInfo: State<ReviewInfo?> = _reviewInfo
-
-    fun requestReviewFlow() {
-        viewModelScope.launch(Dispatchers.IO) {
-            val reviewManager = ReviewManagerFactory.create(getApplication())
-            val request = reviewManager.requestReviewFlow()
-            val packageName = getApplication<Application>().packageName
-            request.addOnCompleteListener { task ->
-                if (task.isSuccessful) {
-                    _reviewInfo.value = task.result
-                } else {
-                    task.exception?.let {
-                        task.exception?.printStackTrace()
-                        IntentUtils.sendEmailToDeveloper(getApplication())
-                    }
-                }
-            }.addOnFailureListener {
-                IntentUtils.openUrl(
-                    getApplication(),
-                    "https://play.google.com/store/apps/details?id=$packageName&showAllReviews=true"
-                )
-            }
-        }
-    }
-
-    fun launchReviewFlow(activity: HelpActivity, reviewInfo: ReviewInfo) {
-        val reviewManager = ReviewManagerFactory.create(activity)
-        reviewManager.launchReviewFlow(activity, reviewInfo)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeComposable.kt
deleted file mode 100644
index 0244fa3..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeComposable.kt
+++ /dev/null
@@ -1,222 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.home
-
-import android.content.Intent
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.aspectRatio
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Card
-import androidx.compose.material3.CircularProgressIndicator
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedButton
-import androidx.compose.material3.Text
-import androidx.compose.material3.pulltorefresh.PullToRefreshContainer
-import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.unit.dp
-import androidx.lifecycle.viewmodel.compose.viewModel
-import coil.compose.AsyncImage
-import coil.request.ImageRequest
-import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieCompositionSpec
-import com.airbnb.lottie.compose.LottieConstants
-import com.airbnb.lottie.compose.rememberLottieComposition
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.ads.BannerAdsComposable
-import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
-import com.d4rk.englishwithlidia.plus.ui.home.repository.LessonRepository
-import com.d4rk.englishwithlidia.plus.ui.lessons.LessonsActivity
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.bounceClick
-import com.d4rk.englishwithlidia.plus.utils.drawable.homeBanner
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun HomeComposable() {
-    val context = LocalContext.current
-    val dataStore = DataStore.getInstance(context)
-    val repository = LessonRepository()
-    val viewModel: HomeViewModel = viewModel(factory = HomeViewModelFactory(repository))
-    val lessons by viewModel.lessons.collectAsState()
-    val isLoading by viewModel.isLoading.collectAsState()
-    val state = rememberPullToRefreshState()
-
-    if (state.isRefreshing) {
-        LaunchedEffect(true) {
-            viewModel.getLessons()
-            state.endRefresh()
-        }
-    }
-
-    Box(Modifier.nestedScroll(state.nestedScrollConnection)) {
-        LazyColumn(
-            modifier = Modifier.fillMaxSize()
-        ) {
-            item {
-                Image(
-                    imageVector = homeBanner(),
-                    contentDescription = null,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .wrapContentHeight(),
-                    contentScale = ContentScale.FillWidth
-                )
-                Spacer(modifier = Modifier.height(16.dp))
-            }
-            item {
-                Row(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .wrapContentHeight()
-                        .padding(start = 24.dp, end = 24.dp),
-                ) {
-                    OutlinedButton(
-                        onClick = {
-                            IntentUtils.openUrl(
-                                context, "https://sites.google.com/view/englishwithlidia"
-                            )
-                        }, modifier = Modifier
-                            .weight(1f)
-                            .bounceClick()
-                    ) {
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_web),
-                            contentDescription = stringResource(id = R.string.tooltip_website),
-                            modifier = Modifier.size(ButtonDefaults.IconSize)
-                        )
-                        Spacer(Modifier.size(ButtonDefaults.IconSpacing))
-                        Text(stringResource(id = R.string.website))
-                    }
-
-                    Spacer(modifier = Modifier.width(24.dp))
-
-                    OutlinedButton(
-                        onClick = {
-                            IntentUtils.openUrl(context, "https://www.facebook.com/lidia.melinte")
-                        },
-                        modifier = Modifier
-                            .weight(1f)
-                            .bounceClick(),
-                    ) {
-                        Icon(
-                            painter = painterResource(id = R.drawable.ic_find_us),
-                            contentDescription = stringResource(id = R.string.tooltip_facebook),
-                            modifier = Modifier.size(ButtonDefaults.IconSize)
-                        )
-                        Spacer(Modifier.size(ButtonDefaults.IconSpacing))
-                        Text(stringResource(id = R.string.find_us))
-                    }
-                }
-                Spacer(modifier = Modifier.height(16.dp))
-            }
-            if (isLoading) {
-                item {
-                    Box(
-                        modifier = Modifier
-                            .fillMaxWidth()
-                            .wrapContentHeight()
-                            .padding(16.dp),
-                        contentAlignment = Alignment.Center
-                    ) {
-                        CircularProgressIndicator()
-                    }
-                }
-            } else {
-                item {
-                    BannerAdsComposable(modifier = Modifier.fillMaxWidth(), dataStore = dataStore)
-                    Spacer(modifier = Modifier.height(16.dp))
-                }
-                items(lessons) { lesson ->
-                    LessonCard(title = lesson.title, imageResource = lesson.banner, onClick = {
-                        val intent = Intent(context, LessonsActivity::class.java).apply {
-                            putExtra("lessonDetails", lesson)
-                        }
-                        context.startActivity(intent)
-                    })
-                }
-            }
-            item {
-                BannerAdsComposable(modifier = Modifier.fillMaxWidth(), dataStore = dataStore)
-            }
-            item {
-                Box(
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .wrapContentHeight()
-                        .padding(start = 16.dp, end = 16.dp, bottom = 8.dp),
-                    contentAlignment = Alignment.Center
-                ) {
-                    LottieAnimation(
-                        composition = rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.anim_learn)).value,
-                        iterations = LottieConstants.IterateForever,
-                        modifier = Modifier.size(260.dp)
-                    )
-                }
-            }
-        }
-        PullToRefreshContainer(state = state, modifier = Modifier.align(Alignment.TopCenter))
-    }
-}
-
-@Composable
-fun LessonCard(title: String, imageResource: String, onClick: () -> Unit) {
-    val context = LocalContext.current
-    Column(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(horizontal = 24.dp)
-    ) {
-        Card(
-            modifier = Modifier
-                .fillMaxWidth()
-                .bounceClick()
-                .clip(RoundedCornerShape(12.dp))
-                .clickable(onClick = onClick)
-                .aspectRatio(2.06f / 1f),
-        ) {
-            AsyncImage(
-                model = ImageRequest.Builder(context).data(imageResource).crossfade(true).build(),
-                contentDescription = null,
-                modifier = Modifier.fillMaxSize(),
-                contentScale = ContentScale.Crop,
-            )
-        }
-        Spacer(modifier = Modifier.height(8.dp))
-        Text(
-            text = title,
-            style = MaterialTheme.typography.headlineMedium,
-            modifier = Modifier.fillMaxWidth()
-        )
-        Spacer(modifier = Modifier.height(16.dp))
-        HorizontalDivider()
-        Spacer(modifier = Modifier.height(16.dp))
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeViewModel.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeViewModel.kt
deleted file mode 100644
index 2507fef..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeViewModel.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.home
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.d4rk.englishwithlidia.plus.data.model.ui.lessons.UiLessonsAsset
-import com.d4rk.englishwithlidia.plus.ui.home.repository.LessonRepository
-import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.asStateFlow
-import kotlinx.coroutines.launch
-
-class HomeViewModel(private val repository: LessonRepository) : ViewModel() {
-    private val _lessons = MutableStateFlow<List<UiLessonsAsset>>(emptyList())
-    val lessons: StateFlow<List<UiLessonsAsset>> = _lessons
-
-    private val _isLoading = MutableStateFlow(false)
-    val isLoading: StateFlow<Boolean> = _isLoading.asStateFlow()
-
-    init {
-        getLessons()
-    }
-
-    fun getLessons() {
-        viewModelScope.launch {
-            _isLoading.value = true
-            _lessons.value = repository.getLessonData()
-            _isLoading.value = false
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeViewModelFactory.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeViewModelFactory.kt
deleted file mode 100644
index 16b182e..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/HomeViewModelFactory.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.home
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.ViewModelProvider
-import com.d4rk.englishwithlidia.plus.ui.home.repository.LessonRepository
-
-class HomeViewModelFactory(private val repository: LessonRepository) : ViewModelProvider.Factory {
-
-    override fun <T : ViewModel> create(modelClass: Class<T>): T {
-        if (modelClass.isAssignableFrom(HomeViewModel::class.java)) {
-            @Suppress("UNCHECKED_CAST")
-            return HomeViewModel(repository) as T
-        }
-        throw IllegalArgumentException("Unknown ViewModel class")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/repository/LessonRepository.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/repository/LessonRepository.kt
deleted file mode 100644
index 53d7e47..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/home/repository/LessonRepository.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.home.repository
-
-import com.d4rk.englishwithlidia.plus.data.model.api.ApiResponse
-import com.d4rk.englishwithlidia.plus.data.model.ui.lessons.UiLessonDetails
-import com.d4rk.englishwithlidia.plus.data.model.ui.lessons.UiLessonsAsset
-import io.ktor.client.HttpClient
-import io.ktor.client.call.body
-import io.ktor.client.engine.cio.CIO
-import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
-import io.ktor.client.request.get
-import io.ktor.serialization.kotlinx.json.json
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-
-class LessonRepository {
-    private val client = HttpClient(CIO) {
-        install(ContentNegotiation) {
-            json()
-        }
-    }
-
-    suspend fun getLessonData(): List<UiLessonsAsset> = withContext(Dispatchers.IO) {
-        val url =
-                "https://script.googleusercontent.com/macros/echo?user_content_key=IqfXaaMa5_xVh9PXgCkTSSvJ5oXI2E6ovHb-xZ-9oeDNzYVvgbAQub1KyRTJ8iBLSdRQS9gDeA6vYWII3idMI7fMbNijCwsvm5_BxDlH2jW0nuo2oDemN9CCS2h10ox_1xSncGQajx_ryfhECjZEnJ73NK6pJWSpPRfbuzxijC-yIhItdrlA4B3P1J--f1LjXLtmxSn7AD8ey3pHscewS7Oo7Ec-OFT-mp7LnhIc8L9DWUmcQiBQTNz9Jw9Md8uu&lib=MSUzLTgsn65WMd0y5_jDbxNmCwTyR-I_G"
-        return@withContext try {
-            val response: ApiResponse = client.get(url).body()
-            response.data.map { networkLesson ->
-                UiLessonsAsset(
-                    id = networkLesson.id,
-                    title = networkLesson.title,
-                    banner = networkLesson.banner,
-                    lessonDetails = UiLessonDetails(
-                        title = networkLesson.lessonDetailsTitle,
-                        audioUrl = networkLesson.lessonDetailsAudioUrl,
-                        lessonIntro = networkLesson.lessonDetailsLessonIntro,
-                        lessonSummary = networkLesson.lessonDetailsLessonSummary
-                    )
-                )
-            }
-        } catch (e: Exception) {
-            emptyList()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsComposable.kt
deleted file mode 100644
index d68794c..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsComposable.kt
+++ /dev/null
@@ -1,246 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.lessons
-
-import androidx.appcompat.app.AppCompatActivity
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.foundation.layout.wrapContentHeight
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Pause
-import androidx.compose.material.icons.filled.PlayArrow
-import androidx.compose.material3.Card
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.HorizontalDivider
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedCard
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Slider
-import androidx.compose.material3.SliderDefaults
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.layout.ContentScale
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
-import coil.request.ImageRequest
-import com.airbnb.lottie.compose.LottieAnimation
-import com.airbnb.lottie.compose.LottieCompositionSpec
-import com.airbnb.lottie.compose.LottieConstants
-import com.airbnb.lottie.compose.rememberLottieComposition
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.ads.BannerAdsComposable
-import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
-import com.d4rk.englishwithlidia.plus.data.model.ui.lessons.UiLessonsAsset
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.annotatedStringHtmlParser
-import com.d4rk.englishwithlidia.plus.utils.compose.bounceClick
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun LessonsComposable(viewModel: LessonsViewModel) {
-    val context = LocalContext.current
-    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
-
-    Scaffold(
-        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
-        topBar = {
-            LargeTopAppBar(
-                title = {
-                    Text(viewModel.lessonDetails?.title ?: "")
-                },
-                navigationIcon = {
-                    IconButton(onClick = {
-                        (context as? AppCompatActivity)?.finish()
-                    }) {
-                        Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
-                    }
-                },
-                scrollBehavior = scrollBehavior
-            )
-        }
-    ) { paddingValues ->
-        LazyColumn(
-            modifier = Modifier
-                .padding(paddingValues)
-                .fillMaxSize(),
-            verticalArrangement = Arrangement.spacedBy(16.dp)
-        ) {
-            item {
-                viewModel.lessonDetails?.let {
-                    viewModel.lessonDetails = it
-                    LessonContent(Modifier.padding(16.dp), it, viewModel)
-                }
-            }
-        }
-    }
-}
-
-@Composable
-fun LessonContent(
-    modifier: Modifier = Modifier,
-    lessonDetails: UiLessonsAsset,
-    viewModel: LessonsViewModel,
-) {
-    val sliderPosition by viewModel.playbackPosition.collectAsState()
-    val playbackDuration by viewModel.playbackDuration.collectAsState()
-    val isPlaying by viewModel.isPlaying.collectAsState()
-    val context = LocalContext.current
-    val dataStore = DataStore.getInstance(context)
-
-    LaunchedEffect(key1 = lessonDetails) {
-        viewModel.preparePlayer(lessonDetails.lessonDetails.audioUrl)
-    }
-
-    Column(
-        modifier = modifier
-    ) {
-        AudioCardView(
-            onPlayClick = { viewModel.playPause() },
-            onSeekChange = { newPosition ->
-                viewModel.seekTo((newPosition * 1000).toLong())
-            },
-            sliderPosition = sliderPosition.toFloat() / 1000f,
-            playbackDuration = playbackDuration.toFloat() / 1000f,
-            isPlaying = isPlaying
-        )
-
-        HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
-
-        Text(
-            text = lessonDetails.lessonDetails.lessonIntro.annotatedStringHtmlParser(),
-            style = MaterialTheme.typography.bodyLarge,
-            modifier = Modifier.padding(bottom = 8.dp)
-        )
-
-        ImageCardView(imageResource = lessonDetails.banner)
-
-        Spacer(modifier = Modifier.height(8.dp))
-        BannerAdsComposable(modifier = Modifier.fillMaxWidth(), dataStore = dataStore)
-        Spacer(modifier = Modifier.height(8.dp))
-
-        Text(
-            text = lessonDetails.lessonDetails.lessonSummary.annotatedStringHtmlParser(),
-            modifier = Modifier.padding(bottom = 8.dp)
-        )
-
-        Box(
-            modifier = Modifier
-                .fillMaxWidth()
-                .wrapContentHeight()
-                .padding(start = 16.dp, end = 16.dp, bottom = 8.dp),
-            contentAlignment = Alignment.Center
-        ) {
-            LottieAnimation(
-                composition = rememberLottieComposition(LottieCompositionSpec.RawRes(R.raw.anim_plant)).value,
-                iterations = LottieConstants.IterateForever,
-                modifier = Modifier.size(260.dp)
-            )
-        }
-
-        Spacer(modifier = Modifier.height(8.dp))
-        BannerAdsComposable(modifier = Modifier.fillMaxWidth(), dataStore = dataStore)
-    }
-}
-
-@Composable
-fun AudioCardView(
-    onPlayClick: () -> Unit,
-    onSeekChange: (Float) -> Unit,
-    sliderPosition: Float,
-    playbackDuration: Float,
-    isPlaying: Boolean,
-) {
-    val cornerRadius = animateFloatAsState(
-        targetValue = if (isPlaying) 16f else 28f,
-        animationSpec = tween(durationMillis = 200), label = ""
-    ).value
-
-    OutlinedCard(
-        modifier = Modifier
-            .fillMaxWidth()
-            .padding(8.dp),
-        shape = RoundedCornerShape(28.dp)
-    ) {
-        Column(
-            modifier = Modifier
-                .padding(16.dp)
-                .fillMaxWidth()
-        ) {
-            Row(
-                modifier = Modifier
-                    .fillMaxWidth(),
-                verticalAlignment = Alignment.CenterVertically,
-                horizontalArrangement = Arrangement.SpaceBetween
-            ) {
-                FloatingActionButton(
-                    onClick = onPlayClick,
-                    modifier = Modifier
-                        .weight(1f)
-                        .bounceClick(),
-                    shape = RoundedCornerShape(cornerRadius.dp)
-                ) {
-                    Icon(
-                        imageVector = if (isPlaying) Icons.Filled.Pause else Icons.Filled.PlayArrow,
-                        contentDescription = if (isPlaying) "Pause" else "Play"
-                    )
-                }
-
-                Spacer(modifier = Modifier.width(16.dp))
-
-                Slider(
-                    value = sliderPosition,
-                    onValueChange = { newValue ->
-                        onSeekChange(newValue)
-                    },
-                    colors = SliderDefaults.colors(),
-                    valueRange = 0f..playbackDuration,
-                    modifier = Modifier
-                        .fillMaxWidth()
-                        .weight(4f)
-                )
-            }
-        }
-    }
-}
-
-@Composable
-fun ImageCardView(modifier: Modifier = Modifier, imageResource: String) {
-    Card(
-        modifier = modifier
-            .fillMaxSize()
-            .padding(8.dp),
-    ) {
-        AsyncImage(
-            model = ImageRequest.Builder(LocalContext.current)
-                .data(imageResource)
-                .crossfade(true)
-                .build(),
-            contentDescription = "Lesson Illustration",
-            modifier = Modifier.fillMaxSize(),
-            contentScale = ContentScale.Crop
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpActivity.kt
similarity index 74%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpActivity.kt
index 2863a92..344bf01 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/help/HelpActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.help
+package com.d4rk.englishwithlidia.plus.ui.screens.help
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -9,10 +9,10 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class HelpActivity : AppCompatActivity() {
-    private val viewModel: HelpViewModel by viewModels()
+    private val viewModel : HelpViewModel by viewModels()
     override fun onCreate(savedInstanceState : Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
@@ -21,7 +21,7 @@ class HelpActivity : AppCompatActivity() {
                 Surface(
                     modifier = Modifier.fillMaxSize() , color = MaterialTheme.colorScheme.background
                 ) {
-                    HelpComposable(this@HelpActivity, viewModel)
+                    HelpScreen(activity = this@HelpActivity , viewModel)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpScreen.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpScreen.kt
new file mode 100644
index 0000000..50bfcd8
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpScreen.kt
@@ -0,0 +1,296 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.help
+
+import android.content.Context
+import android.view.SoundEffectConstants
+import android.view.View
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.MailOutline
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material.icons.outlined.QuestionAnswer
+import androidx.compose.material3.Card
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LargeTopAppBar
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.TopAppBarScrollBehavior
+import androidx.compose.material3.rememberTopAppBarState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.ui.components.AnimatedExtendedFloatingActionButton
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.components.dialogs.VersionInfoAlertDialog
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import com.d4rk.englishwithlidia.plus.utils.rememberHtmlData
+import com.google.android.play.core.review.ReviewInfo
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun HelpScreen(activity : HelpActivity , viewModel : HelpViewModel) {
+    val scrollBehavior : TopAppBarScrollBehavior =
+            TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
+    var showMenu : Boolean by remember { mutableStateOf(value = false) }
+    val context : Context = LocalContext.current
+    val view : View = LocalView.current
+    val isFabVisible by viewModel.isFabVisible.collectAsState()
+    val showDialog : MutableState<Boolean> = remember { mutableStateOf(value = false) }
+    val reviewInfo : ReviewInfo? = viewModel.reviewInfo.value
+
+    val htmlData = rememberHtmlData()
+    val changelogHtmlString = htmlData.value.first
+    val eulaHtmlString = htmlData.value.second
+
+    if (reviewInfo != null) {
+        LaunchedEffect(key1 = reviewInfo) {
+            viewModel.requestReviewFlow()
+        }
+    }
+
+    Scaffold(
+        modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection) ,
+        topBar = {
+            LargeTopAppBar(
+                title = { Text(text = stringResource(id = R.string.help)) } ,
+                navigationIcon = {
+                    IconButton(modifier = Modifier.bounceClick() , onClick = {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
+                        activity.finish()
+                    }) {
+                        Icon(
+                            Icons.AutoMirrored.Filled.ArrowBack , contentDescription = null
+                        )
+                    }
+                } ,
+
+
+                actions = {
+                    IconButton(modifier = Modifier.bounceClick() , onClick = {
+                        view.playSoundEffect(SoundEffectConstants.CLICK)
+                        showMenu = true
+                    }) {
+                        Icon(
+                            Icons.Default.MoreVert , contentDescription = "Localized description"
+                        )
+                    }
+                    DropdownMenu(expanded = showMenu , onDismissRequest = {
+                        showMenu = false
+                    }) {
+                        DropdownMenuItem(modifier = Modifier.bounceClick() ,
+                                         text = { Text(text = stringResource(id = R.string.view_in_google_play_store)) } ,
+                                         onClick = {
+                                             view.playSoundEffect(SoundEffectConstants.CLICK)
+                                             IntentUtils.openUrl(
+                                                 context ,
+                                                 url = "https://play.google.com/store/apps/details?id=${activity.packageName}"
+                                             )
+                                         })
+                        DropdownMenuItem(modifier = Modifier.bounceClick() ,
+                                         text = { Text(text = stringResource(id = R.string.version_info)) } ,
+                                         onClick = {
+                                             view.playSoundEffect(SoundEffectConstants.CLICK)
+                                             showDialog.value = true
+                                         })
+                        DropdownMenuItem(modifier = Modifier.bounceClick() ,
+                                         text = { Text(text = stringResource(id = R.string.beta_program)) } ,
+                                         onClick = {
+                                             view.playSoundEffect(SoundEffectConstants.CLICK)
+                                             IntentUtils.openUrl(
+                                                 context ,
+                                                 url = "https://play.google.com/apps/testing/${activity.packageName}"
+                                             )
+                                         })
+                        DropdownMenuItem(modifier = Modifier.bounceClick() ,
+                                         text = { Text(text = stringResource(id = R.string.terms_of_service)) } ,
+                                         onClick = {
+                                             view.playSoundEffect(SoundEffectConstants.CLICK)
+                                             IntentUtils.openUrl(
+                                                 context ,
+                                                 url = "https://sites.google.com/view/d4rk7355608/more/apps/terms-of-service"
+                                             )
+                                         })
+                        DropdownMenuItem(modifier = Modifier.bounceClick() ,
+                                         text = { Text(text = stringResource(id = R.string.privacy_policy)) } ,
+                                         onClick = {
+                                             view.playSoundEffect(SoundEffectConstants.CLICK)
+                                             IntentUtils.openUrl(
+                                                 context ,
+                                                 url = "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy"
+                                             )
+                                         })
+                        DropdownMenuItem(modifier = Modifier.bounceClick() ,
+                                         text = { Text(text = stringResource(id = R.string.oss_license_title)) } ,
+                                         onClick = {
+                                             view.playSoundEffect(SoundEffectConstants.CLICK)
+                                             IntentUtils.openLicensesScreen(
+                                                 context = context ,
+                                                 eulaHtmlString = eulaHtmlString ,
+                                                 changelogHtmlString = changelogHtmlString
+                                             )
+                                         })
+                    }
+                    if (showDialog.value) {
+                        VersionInfoAlertDialog(onDismiss = { showDialog.value = false })
+                    }
+                } ,
+
+                scrollBehavior = scrollBehavior ,
+
+
+                )
+        } ,
+        floatingActionButton = {
+            AnimatedExtendedFloatingActionButton(visible = isFabVisible , onClick = {
+                view.playSoundEffect(SoundEffectConstants.CLICK)
+                viewModel.reviewInfo.value?.let { safeReviewInfo ->
+                    viewModel.launchReviewFlow(
+                        activity , safeReviewInfo
+                    )
+                }
+            } , text = { Text(text = stringResource(id = R.string.feedback)) } , icon = {
+                Icon(
+                    Icons.Default.MailOutline , contentDescription = null
+                )
+            })
+        } ,
+    ) { paddingValues ->
+        Box(
+            modifier = Modifier
+                    .padding(start = 16.dp , end = 16.dp)
+                    .fillMaxSize()
+                    .safeDrawingPadding()
+        ) {
+            Column(modifier = Modifier.padding(paddingValues)) {
+                Text(
+                    text = stringResource(id = R.string.faq) ,
+                    modifier = Modifier.padding(bottom = 24.dp)
+                )
+                Card(modifier = Modifier.fillMaxWidth()) {
+                    FAQComposable()
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun FAQComposable() {
+    LazyColumn {
+        item {
+            QuestionComposable(
+                title = stringResource(id = R.string.question_1) ,
+                summary = stringResource(id = R.string.summary_preference_faq_1)
+            )
+        }
+        item {
+            QuestionComposable(
+                title = stringResource(id = R.string.question_2) ,
+                summary = stringResource(id = R.string.summary_preference_faq_2)
+            )
+        }
+        item {
+            QuestionComposable(
+                title = stringResource(id = R.string.question_3) ,
+                summary = stringResource(id = R.string.summary_preference_faq_3)
+            )
+        }
+        item {
+            QuestionComposable(
+                title = stringResource(id = R.string.question_4) ,
+                summary = stringResource(id = R.string.summary_preference_faq_4)
+            )
+        }
+        item {
+            QuestionComposable(
+                title = stringResource(id = R.string.question_5) ,
+                summary = stringResource(id = R.string.summary_preference_faq_5)
+            )
+        }
+        item {
+            QuestionComposable(
+                title = stringResource(id = R.string.question_6) ,
+                summary = stringResource(id = R.string.summary_preference_faq_6)
+            )
+        }
+        item {
+            QuestionComposable(
+                title = stringResource(id = R.string.question_7) ,
+                summary = stringResource(id = R.string.summary_preference_faq_7)
+            )
+        }
+        item {
+            QuestionComposable(
+                title = stringResource(id = R.string.question_8) ,
+                summary = stringResource(id = R.string.summary_preference_faq_8)
+            )
+        }
+        item {
+            QuestionComposable(
+                title = stringResource(id = R.string.question_9) ,
+                summary = stringResource(id = R.string.summary_preference_faq_9)
+            )
+        }
+    }
+}
+
+@Composable
+fun QuestionComposable(title : String , summary : String) {
+    Row(
+        modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp) ,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Icon(
+            Icons.Outlined.QuestionAnswer ,
+            contentDescription = null ,
+            modifier = Modifier
+                    .size(48.dp)
+                    .background(
+                        color = MaterialTheme.colorScheme.primaryContainer , shape = CircleShape
+                    )
+                    .padding(8.dp)
+        )
+        Spacer(modifier = Modifier.width(16.dp))
+        Column {
+            Text(
+                text = title , style = MaterialTheme.typography.titleMedium
+            )
+            Spacer(modifier = Modifier.height(4.dp))
+            Text(text = summary)
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpViewModel.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpViewModel.kt
new file mode 100644
index 0000000..34de0a2
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/help/HelpViewModel.kt
@@ -0,0 +1,62 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.help
+
+import android.app.Application
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.viewModelScope
+import com.d4rk.englishwithlidia.plus.ui.viewmodel.BaseViewModel
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import com.google.android.gms.tasks.Task
+import com.google.android.play.core.review.ReviewInfo
+import com.google.android.play.core.review.ReviewManager
+import com.google.android.play.core.review.ReviewManagerFactory
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+
+class HelpViewModel(application : Application) : BaseViewModel(application) {
+
+    private var _reviewInfo : MutableState<ReviewInfo?> = mutableStateOf(value = null)
+    val reviewInfo : State<ReviewInfo?> = _reviewInfo
+
+    init {
+        initializeVisibilityStates()
+    }
+
+    private fun initializeVisibilityStates() {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            delay(timeMillis = 100L)
+            showFab()
+        }
+    }
+
+    fun requestReviewFlow() {
+        viewModelScope.launch(Dispatchers.IO) {
+            val reviewManager : ReviewManager = ReviewManagerFactory.create(getApplication())
+            val request : Task<ReviewInfo> = reviewManager.requestReviewFlow()
+            val packageName : String = getApplication<Application>().packageName
+            request.addOnCompleteListener { task ->
+                if (task.isSuccessful) {
+                    _reviewInfo.value = task.result
+                }
+                else {
+                    task.exception?.let {
+                        task.exception?.printStackTrace()
+                        IntentUtils.sendEmailToDeveloper(getApplication())
+                    }
+                }
+            }.addOnFailureListener {
+                IntentUtils.openUrl(
+                    getApplication() ,
+                    url = "https://play.google.com/store/apps/details?id=$packageName&showAllReviews=true"
+                )
+            }
+        }
+    }
+
+    fun launchReviewFlow(activity : HelpActivity , reviewInfo : ReviewInfo) {
+        val reviewManager : ReviewManager = ReviewManagerFactory.create(activity)
+        reviewManager.launchReviewFlow(activity , reviewInfo)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/HomeScreen.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/HomeScreen.kt
new file mode 100644
index 0000000..184e2fd
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/HomeScreen.kt
@@ -0,0 +1,66 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.home
+
+import android.content.Context
+import android.content.Intent
+import android.view.View
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.aspectRatio
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import coil3.request.ImageRequest
+import coil3.request.crossfade
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.ui.components.ads.AdBanner
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.screens.lessons.LessonsActivity
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import com.d4rk.englishwithlidia.plus.ui.components.drawable.homeBanner
+
+@Composable
+fun HomeScreen(
+    context : Context ,
+    view : View ,
+    viewModel : HomeViewModel ,
+    snackbarHostState : SnackbarHostState
+) {
+    val dataStore = DataStore.getInstance(context)
+    val lessons by viewModel.lessons.collectAsState()
+    val isLoading by viewModel.isLoading.collectAsState()
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/HomeViewModel.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/HomeViewModel.kt
new file mode 100644
index 0000000..963f5fa
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/HomeViewModel.kt
@@ -0,0 +1,47 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.home
+
+import android.app.Application
+import androidx.lifecycle.viewModelScope
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.data.model.ui.screens.UiLessonsAsset
+import com.d4rk.englishwithlidia.plus.ui.screens.home.repository.LessonRepository
+import com.d4rk.englishwithlidia.plus.ui.viewmodel.BaseViewModel
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+
+class HomeViewModel(application : Application) : BaseViewModel(application) {
+    private val repository = LessonRepository(DataStore(application) , application)
+
+    private val _lessons = MutableStateFlow<List<UiLessonsAsset>>(emptyList())
+    val lessons : StateFlow<List<UiLessonsAsset>> = _lessons
+
+    init {
+        getHomeLessons()
+    }
+
+    private fun getHomeLessons() {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            showLoading()
+            repository.getHomeLessonsRepository { fetchedLessons ->
+                _lessons.value = fetchedLessons
+            }
+            hideLoading()
+            initializeVisibilityStates()
+        }
+    }
+
+    private fun initializeVisibilityStates() {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            delay(timeMillis = 50L)
+            _visibilityStates.value = List(_lessons.value.size) { false }
+            _lessons.value.indices.forEach { index ->
+                delay(timeMillis = index * 8L)
+                _visibilityStates.value = List(_visibilityStates.value.size) { lessonIndex ->
+                    lessonIndex == index || _visibilityStates.value[lessonIndex]
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/repository/LessonRepository.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/repository/LessonRepository.kt
new file mode 100644
index 0000000..1ae3177
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/repository/LessonRepository.kt
@@ -0,0 +1,21 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.home.repository
+
+import android.app.Application
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.data.model.ui.screens.UiLessonsAsset
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+
+class LessonRepository(
+    dataStore : DataStore , application : Application ,
+) : LessonRepositoryImplementation(application , dataStore) {
+
+    suspend fun getHomeLessonsRepository(onSuccess : (List<UiLessonsAsset>) -> Unit) {
+        withContext(Dispatchers.IO) {
+            val lessons = getHomeLessonsImplementation()
+            withContext(Dispatchers.Main) {
+                onSuccess(lessons)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/repository/LessonRepositoryImplementation.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/repository/LessonRepositoryImplementation.kt
new file mode 100644
index 0000000..c3a6b13
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/home/repository/LessonRepositoryImplementation.kt
@@ -0,0 +1,60 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.home.repository
+
+import android.app.Application
+import com.d4rk.englishwithlidia.plus.BuildConfig
+import com.d4rk.englishwithlidia.plus.constants.api.ApiConstants
+import com.d4rk.englishwithlidia.plus.data.core.AppCoreManager
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.data.model.api.ApiResponse
+import com.d4rk.englishwithlidia.plus.data.model.ui.screens.UiLessonsAsset
+import io.ktor.client.HttpClient
+import io.ktor.client.request.get
+import io.ktor.client.statement.bodyAsText
+import kotlinx.serialization.json.Json
+
+abstract class LessonRepositoryImplementation(
+    val application : Application ,
+    val dataStore : DataStore ,
+) {
+    private val client : HttpClient = AppCoreManager.ktorClient
+
+    private val baseUrl = BuildConfig.DEBUG.let { isDebug ->
+        val environment = if (isDebug) "debug" else "release"
+        "${ApiConstants.BASE_REPOSITORY_URL}/$environment/ro/home/api_get_lessons.json"
+    }
+
+    private val jsonParser = Json {
+        ignoreUnknownKeys = true
+        isLenient = true
+    }
+
+    suspend fun getHomeLessonsImplementation() : List<UiLessonsAsset> {
+        return runCatching {
+            val response = client.get(baseUrl)
+            val jsonString = response.bodyAsText()
+
+            jsonString.takeUnless { it.isBlank() }
+                    ?.let { jsonParser.decodeFromString<ApiResponse>(it) }
+                    ?.takeIf { it.data.isNotEmpty() }?.data?.mapNotNull { networkLesson ->
+                        runCatching {
+                            UiLessonsAsset(
+                                id = networkLesson.id ,
+                                title = networkLesson.title ,
+                                banner = networkLesson.banner ,
+                                lessonDetails = UiLessonsAsset.UiLessonDetails(
+                                    title = networkLesson.lessonDetails.titleExtension ,
+                                    audioUrl = networkLesson.lessonDetails.podcast ,
+                                    lessonIntro = networkLesson.lessonDetails.intro ,
+                                    lessonSummary = networkLesson.lessonDetails.summary
+                                )
+                            )
+                        }.getOrNull()
+                    }?.also { lessons ->
+                        println("English with Lidia Plus -> Fetched ${lessons.size} lessons")
+                    } ?: emptyList()
+        }.getOrElse { exception ->
+            println("English with Lidia Plus -> Error: ${exception.message}")
+            emptyList()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsActivity.kt
similarity index 87%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsActivity.kt
index 4c7f18d..d3f514b 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.lessons
+package com.d4rk.englishwithlidia.plus.ui.screens.lessons
 
 import android.os.Build
 import android.os.Bundle
@@ -10,8 +10,8 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.d4rk.englishwithlidia.plus.data.model.ui.lessons.UiLessonsAsset
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.data.model.ui.screens.UiLessonsAsset
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class LessonsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsComposable.kt
new file mode 100644
index 0000000..9a7163e
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsComposable.kt
@@ -0,0 +1,224 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.lessons
+
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.animation.core.animateFloatAsState
+import androidx.compose.animation.core.tween
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Pause
+import androidx.compose.material.icons.filled.PlayArrow
+import androidx.compose.material3.Card
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.LargeTopAppBar
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedCard
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.fromHtml
+import androidx.compose.ui.unit.dp
+import androidx.core.text.htmlEncode
+import coil3.compose.AsyncImage
+import coil3.request.ImageRequest
+import coil3.request.crossfade
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.data.model.ui.screens.UiLessonsAsset
+import com.d4rk.englishwithlidia.plus.ui.components.ads.AdBanner
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import ir.mahozad.multiplatform.wavyslider.WaveDirection
+import ir.mahozad.multiplatform.wavyslider.material3.WavySlider
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun LessonsComposable(viewModel : LessonsViewModel) {
+    val context = LocalContext.current
+    val scrollBehavior = TopAppBarDefaults.pinnedScrollBehavior()
+
+    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection) , topBar = {
+        LargeTopAppBar(title = {
+            Text(text = viewModel.lessonDetails?.title ?: "")
+        } , navigationIcon = {
+            IconButton(onClick = {
+                (context as? AppCompatActivity)?.finish()
+            }) {
+                Icon(Icons.AutoMirrored.Filled.ArrowBack , contentDescription = null)
+            }
+        } , scrollBehavior = scrollBehavior)
+    }) { paddingValues ->
+        LazyColumn(
+            modifier = Modifier
+                    .padding(paddingValues)
+                    .fillMaxSize() ,
+            verticalArrangement = Arrangement.spacedBy(16.dp)
+        ) {
+            item {
+                viewModel.lessonDetails?.let {
+                    viewModel.lessonDetails = it
+                    LessonContent(Modifier.padding(16.dp) , it , viewModel)
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun LessonContent(
+    modifier : Modifier = Modifier ,
+    lessonDetails : UiLessonsAsset ,
+    viewModel : LessonsViewModel ,
+) {
+    val sliderPosition by viewModel.playbackPosition.collectAsState()
+    val playbackDuration by viewModel.playbackDuration.collectAsState()
+    val isPlaying by viewModel.isPlaying.collectAsState()
+    val context = LocalContext.current
+    val dataStore = DataStore.getInstance(context)
+
+    val annotatedLessonSummary = AnnotatedString.fromHtml(lessonDetails.lessonDetails.lessonSummary)
+
+    LaunchedEffect(key1 = lessonDetails) {
+        viewModel.preparePlayer(lessonDetails.lessonDetails.audioUrl)
+    }
+
+    Column(
+        modifier = modifier
+    ) {
+        AudioCardView(onPlayClick = { viewModel.playPause() } ,
+                      onSeekChange = { newPosition ->
+                          viewModel.seekTo((newPosition * 1000).toLong())
+                      } ,
+                      sliderPosition = sliderPosition.toFloat() / 1000f ,
+                      playbackDuration = playbackDuration.toFloat() / 1000f ,
+                      isPlaying = isPlaying)
+
+        HorizontalDivider(modifier = Modifier.padding(vertical = 8.dp))
+
+        Text(
+            text = lessonDetails.lessonDetails.lessonIntro.htmlEncode() ,
+            style = MaterialTheme.typography.bodyLarge ,
+            modifier = Modifier.padding(bottom = 8.dp)
+        )
+
+        ImageCardView(imageResource = lessonDetails.banner)
+
+        Spacer(modifier = Modifier.height(8.dp))
+        AdBanner(modifier = Modifier.fillMaxWidth() , dataStore = dataStore)
+        Spacer(modifier = Modifier.height(8.dp))
+
+        Text(
+            text = annotatedLessonSummary , modifier = Modifier.padding(bottom = 8.dp)
+        )
+
+        Spacer(modifier = Modifier.height(8.dp))
+        AdBanner(modifier = Modifier.fillMaxWidth() , dataStore = dataStore)
+    }
+}
+
+@Composable
+fun AudioCardView(
+    onPlayClick : () -> Unit ,
+    onSeekChange : (Float) -> Unit ,
+    sliderPosition : Float ,
+    playbackDuration : Float ,
+    isPlaying : Boolean ,
+) {
+    val cornerRadius = animateFloatAsState(
+        targetValue = if (isPlaying) 16f else 28f ,
+        animationSpec = tween(durationMillis = 200) ,
+        label = ""
+    ).value
+
+    var sliderValue = if (playbackDuration > 0f) sliderPosition / playbackDuration else 0f
+
+    OutlinedCard(
+        modifier = Modifier
+                .fillMaxWidth()
+                .padding(8.dp) , shape = RoundedCornerShape(28.dp)
+    ) {
+        Column(
+            modifier = Modifier
+                    .padding(16.dp)
+                    .fillMaxWidth()
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth() ,
+                verticalAlignment = Alignment.CenterVertically ,
+                horizontalArrangement = Arrangement.SpaceBetween
+            ) {
+                FloatingActionButton(
+                    onClick = onPlayClick ,
+                    modifier = Modifier
+                            .weight(1f)
+                            .bounceClick() ,
+                    shape = RoundedCornerShape(cornerRadius.dp)
+                ) {
+                    Icon(
+                        imageVector = if (isPlaying) Icons.Filled.Pause else Icons.Filled.PlayArrow ,
+                        contentDescription = if (isPlaying) "Pause" else "Play"
+                    )
+                }
+
+                Spacer(modifier = Modifier.width(16.dp))
+
+                WavySlider(value = sliderValue ,
+                           onValueChange = { newValue ->
+                               sliderValue = newValue
+                               if (playbackDuration > 0f) {
+                                   val newPosition = newValue * playbackDuration
+                                   onSeekChange(newPosition)
+                               }
+                           } ,
+                           waveLength = 24.dp ,
+                           waveHeight = 4.dp ,
+                           waveVelocity = 4.dp to WaveDirection.HEAD ,
+                           waveThickness = 4.dp ,
+                           trackThickness = 4.dp ,
+                           incremental = false ,
+                           modifier = Modifier
+                                   .fillMaxWidth()
+                                   .weight(weight = 4f))
+            }
+        }
+    }
+}
+
+@Composable
+fun ImageCardView(modifier : Modifier = Modifier , imageResource : String) {
+    Card(
+        modifier = modifier
+                .fillMaxSize()
+                .padding(8.dp) ,
+    ) {
+        AsyncImage(
+            model = ImageRequest.Builder(LocalContext.current).data(imageResource)
+                    .crossfade(enable = true).build() ,
+            contentDescription = "Lesson Illustration" ,
+            modifier = Modifier.fillMaxSize() ,
+            contentScale = ContentScale.Crop
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsViewModel.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsViewModel.kt
similarity index 96%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsViewModel.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsViewModel.kt
index 39e599b..7cfe573 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsViewModel.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsViewModel.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.lessons
+package com.d4rk.englishwithlidia.plus.ui.screens.lessons
 
 import android.app.Application
 import android.net.Uri
@@ -10,7 +10,7 @@ import androidx.lifecycle.viewModelScope
 import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
 import androidx.media3.exoplayer.ExoPlayer
-import com.d4rk.englishwithlidia.plus.data.model.ui.lessons.UiLessonsAsset
+import com.d4rk.englishwithlidia.plus.data.model.ui.screens.UiLessonsAsset
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsViewModelFactory.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsViewModelFactory.kt
similarity index 83%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsViewModelFactory.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsViewModelFactory.kt
index f2a8b1f..1d7e247 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/lessons/LessonsViewModelFactory.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/lessons/LessonsViewModelFactory.kt
@@ -1,9 +1,9 @@
-package com.d4rk.englishwithlidia.plus.ui.lessons
+package com.d4rk.englishwithlidia.plus.ui.screens.lessons
 
 import android.app.Application
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
-import com.d4rk.englishwithlidia.plus.data.model.ui.lessons.UiLessonsAsset
+import com.d4rk.englishwithlidia.plus.data.model.ui.screens.UiLessonsAsset
 
 class LessonsViewModelFactory(
     private val application: Application,
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainActivity.kt
new file mode 100644
index 0000000..2bef6ba
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainActivity.kt
@@ -0,0 +1,147 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.main
+
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import androidx.activity.compose.setContent
+import androidx.activity.enableEdgeToEdge
+import androidx.activity.viewModels
+import androidx.annotation.RequiresApi
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.ui.Modifier
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.data.core.AppCoreManager
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.notifications.managers.AppUpdateNotificationsManager
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
+import com.google.android.gms.ads.MobileAds
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.snackbar.Snackbar
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.appupdate.AppUpdateManagerFactory
+import com.google.android.play.core.install.model.ActivityResult
+
+class MainActivity : AppCompatActivity() {
+    private lateinit var dataStore : DataStore
+    private val viewModel : MainViewModel by viewModels()
+    private lateinit var appUpdateManager : AppUpdateManager
+    private lateinit var appUpdateNotificationsManager : AppUpdateNotificationsManager
+
+    override fun onCreate(savedInstanceState : Bundle?) {
+        super.onCreate(savedInstanceState)
+        installSplashScreen().apply {
+            setKeepOnScreenCondition {
+                ! (application as AppCoreManager).isAppLoaded()
+            }
+        }
+        enableEdgeToEdge()
+        initializeActivityComponents()
+        setContent {
+            AppTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize() , color = MaterialTheme.colorScheme.background
+                ) {
+                    MainScreen()
+                }
+            }
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    override fun onResume() {
+        super.onResume()
+        with(viewModel) {
+            checkAndHandleStartup()
+            configureSettings()
+            checkForUpdates(activity = this@MainActivity , appUpdateManager = appUpdateManager)
+            checkAndScheduleUpdateNotifications(appUpdateNotificationsManager)
+            checkAppUsageNotifications()
+        }
+    }
+
+    /**
+     * This method overrides the `onBackPressed()` method **(deprecated in Java)** to display a confirmation dialog
+     * before closing the activity. While this method might work, it's recommended to use more modern approaches
+     * for handling back button presses, such as using Navigation components or Activity lifecycles.
+     *
+     * This method is annotated with `@Deprecated` and `@Suppress("DEPRECATION")` to explicitly mark it as deprecated
+     * and suppress compiler warnings during its usage.
+     *
+     * Consider utilizing alternative approaches for handling back button events.
+     */
+    @Deprecated("Deprecated in Java")
+    @Suppress("DEPRECATION")
+    override fun onBackPressed() {
+        MaterialAlertDialogBuilder(this).setTitle(R.string.close).setMessage(R.string.summary_close)
+                .setPositiveButton(android.R.string.yes) { _ , _ ->
+                    super.onBackPressed()
+                    moveTaskToBack(true)
+                }.setNegativeButton(android.R.string.no , null).apply { show() }
+    }
+
+    /**
+     * Overrides the `onActivityResult` method to handle the result of an activity launched for result.
+     *
+     * This function is specifically designed to handle the result of a request code (1)
+     * which is used for in-app updates. It checks the `resultCode` to determine the outcome of the update process.
+     * Depending on the `resultCode`, it either displays a Snackbar message indicating a successful update or
+     * calls a function to show a Snackbar message indicating that the update failed.
+     *
+     * @param requestCode The integer request code originally supplied to startActivityForResult(),
+     * allowing you to identify who this result came from.
+     * @param resultCode The integer result code returned by the child activity through its setResult().
+     * @param data An Intent, which can return result data to the caller (various data can be attached to Intent "extras").
+     */
+    @Deprecated("Deprecated in Java")
+    override fun onActivityResult(requestCode : Int , resultCode : Int , data : Intent?) {
+        super.onActivityResult(requestCode , resultCode , data)
+        println("Cleaner for Android -> Play Update: onActivityResult: requestCode=$requestCode, resultCode=$resultCode")
+        if (requestCode == 1) {
+            when (resultCode) {
+                RESULT_OK -> {
+                    showUpdateSuccessfulSnackbar()
+                }
+
+                ActivityResult.RESULT_IN_APP_UPDATE_FAILED -> {
+                    showUpdateFailedSnackbar()
+                }
+            }
+        }
+    }
+
+    private fun initializeActivityComponents() {
+        MobileAds.initialize(this@MainActivity)
+        dataStore = DataStore.getInstance(context = this@MainActivity)
+        appUpdateManager = AppUpdateManagerFactory.create(this@MainActivity)
+        appUpdateNotificationsManager = AppUpdateNotificationsManager(this)
+    }
+
+    private fun showUpdateSuccessfulSnackbar() {
+        val snackbar : Snackbar = Snackbar.make(
+            findViewById(android.R.id.content) , R.string.snack_app_updated , Snackbar.LENGTH_LONG
+        ).setAction(android.R.string.ok , null)
+        snackbar.show()
+    }
+
+    /**
+     * Displays a Snackbar message indicating that the update process has failed.
+     *
+     * This function creates a Snackbar with a message indicating that the update process has failed.
+     * The Snackbar includes a "Try Again" action which, when clicked, triggers the `checkForFlexibleUpdate` function
+     * to check for updates and initiate the appropriate update flow if conditions are met.
+     */
+    private fun showUpdateFailedSnackbar() {
+        val snackbar : Snackbar = Snackbar.make(
+            findViewById(android.R.id.content) , R.string.snack_update_failed , Snackbar.LENGTH_LONG
+        ).setAction(R.string.try_again) {
+            viewModel.checkForUpdates(
+                activity = this@MainActivity , appUpdateManager = appUpdateManager
+            )
+        }
+        snackbar.show()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainScreen.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainScreen.kt
new file mode 100644
index 0000000..50ad76e
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainScreen.kt
@@ -0,0 +1,66 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.main
+
+import android.content.Context
+import android.view.View
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.DrawerState
+import androidx.compose.material3.DrawerValue
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.rememberDrawerState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.NavigationDrawer
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarMain
+import com.d4rk.englishwithlidia.plus.ui.screens.home.HomeScreen
+import com.d4rk.englishwithlidia.plus.ui.screens.home.HomeViewModel
+import kotlinx.coroutines.CoroutineScope
+
+@Composable
+fun MainScreen() {
+    val drawerState : DrawerState = rememberDrawerState(initialValue = DrawerValue.Closed)
+    val context : Context = LocalContext.current
+    val view : View = LocalView.current
+
+    NavigationDrawer(
+        drawerState = drawerState ,
+        view = view ,
+        context = context ,
+    )
+}
+
+@Composable
+fun MainScreenContent(
+    view : View , drawerState : DrawerState , context : Context , coroutineScope : CoroutineScope
+) {
+    val viewModel : HomeViewModel = viewModel()
+    val snackbarHostState = remember { SnackbarHostState() }
+
+    Scaffold(topBar = {
+        TopAppBarMain(
+            view = view ,
+            drawerState = drawerState ,
+            context = context ,
+            coroutineScope = coroutineScope
+        )
+    } , snackbarHost = {
+        SnackbarHost(hostState = snackbarHostState)
+    }) { paddingValues ->
+        Box(
+            modifier = Modifier.padding(paddingValues)
+        ) {
+            HomeScreen(
+                context = context ,
+                view = view ,
+                viewModel = viewModel ,
+                snackbarHostState = snackbarHostState
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainViewModel.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainViewModel.kt
new file mode 100644
index 0000000..99e2201
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/MainViewModel.kt
@@ -0,0 +1,56 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.main
+
+import android.app.Activity
+import android.app.Application
+import android.os.Build
+import androidx.annotation.RequiresApi
+import androidx.lifecycle.viewModelScope
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.notifications.managers.AppUpdateNotificationsManager
+import com.d4rk.englishwithlidia.plus.ui.screens.main.repository.MainRepository
+import com.d4rk.englishwithlidia.plus.ui.screens.startup.StartupActivity
+import com.d4rk.englishwithlidia.plus.ui.viewmodel.BaseViewModel
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import com.google.android.play.core.appupdate.AppUpdateManager
+import kotlinx.coroutines.launch
+
+class MainViewModel(application : Application) : BaseViewModel(application) {
+    private val repository = MainRepository(DataStore(application) , application)
+
+    fun checkForUpdates(activity : Activity , appUpdateManager : AppUpdateManager) {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            repository.checkForUpdates(
+                appUpdateManager = appUpdateManager , activity = activity
+            )
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    fun checkAndScheduleUpdateNotifications(appUpdateNotificationsManager : AppUpdateNotificationsManager) {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            repository.checkAndScheduleUpdateNotifications(appUpdateNotificationsManager)
+        }
+    }
+
+    fun checkAppUsageNotifications() {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            repository.checkAppUsageNotifications()
+        }
+    }
+
+    fun checkAndHandleStartup() {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            repository.checkAndHandleStartup { isFirstTime ->
+                if (isFirstTime) {
+                    IntentUtils.openActivity(getApplication() , StartupActivity::class.java)
+                }
+            }
+        }
+    }
+
+    fun configureSettings() {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            repository.setupSettings()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/repository/MainRepository.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/repository/MainRepository.kt
new file mode 100644
index 0000000..9cf751c
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/repository/MainRepository.kt
@@ -0,0 +1,76 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.main.repository
+
+import android.app.Activity
+import android.app.Application
+import android.os.Build
+import androidx.annotation.RequiresApi
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.notifications.managers.AppUpdateNotificationsManager
+import com.google.android.play.core.appupdate.AppUpdateManager
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.withContext
+
+/**
+ * Concrete implementation of the main repository for managing application settings and startup state.
+ *
+ * @property dataStore The data store used to persist settings and startup information.
+ * @property application The application context.
+ */
+class MainRepository(val dataStore : DataStore , application : Application) :
+    MainRepositoryImplementation(application) {
+
+    suspend fun checkForUpdates(
+        activity : Activity ,
+        appUpdateManager : AppUpdateManager ,
+    ) {
+        withContext(Dispatchers.IO) {
+            checkForUpdatesLogic(activity , appUpdateManager)
+        }
+    }
+
+    /**
+     * Checks the application startup state and performs actions based on whether it's the first launch.
+     *
+     * This function checks if the app is launched for the first time and invokes the `onSuccess` callback
+     * with the result on the main thread.
+     *
+     * @param onSuccess A callback function that receives a boolean indicating if it's the first launch.
+     */
+    suspend fun checkAndHandleStartup(onSuccess : (Boolean) -> Unit) {
+        withContext(Dispatchers.IO) {
+            val isFirstTime : Boolean = checkStartup()
+            withContext(Dispatchers.Main) {
+                onSuccess(isFirstTime)
+            }
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    suspend fun checkAndScheduleUpdateNotifications(appUpdateNotificationsManager : AppUpdateNotificationsManager) {
+        withContext(Dispatchers.IO) {
+            checkAndScheduleUpdateNotificationsLogic(appUpdateNotificationsManager)
+        }
+    }
+
+    suspend fun checkAppUsageNotifications() {
+        withContext(Dispatchers.IO) {
+            checkAppUsageNotificationsManager()
+        }
+    }
+
+    /**
+     * Sets up Firebase Analytics and Crashlytics based on stored settings.
+     *
+     * This function retrieves the "usageAndDiagnostics" setting from the data store and configures
+     * Firebase Analytics and Crashlytics accordingly.
+     */
+    suspend fun setupSettings() {
+        withContext(Dispatchers.IO) {
+            val isEnabled : Boolean = dataStore.usageAndDiagnostics.first()
+            withContext(Dispatchers.Main) {
+                setupDiagnosticSettings(isEnabled)
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/repository/MainRepositoryImplementation.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/repository/MainRepositoryImplementation.kt
new file mode 100644
index 0000000..1347663
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/main/repository/MainRepositoryImplementation.kt
@@ -0,0 +1,92 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.main.repository
+
+import android.app.Activity
+import android.app.Application
+import android.os.Build
+import androidx.annotation.RequiresApi
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.notifications.managers.AppUpdateNotificationsManager
+import com.d4rk.englishwithlidia.plus.notifications.managers.AppUsageNotificationsManager
+import com.google.android.play.core.appupdate.AppUpdateManager
+import com.google.android.play.core.install.model.ActivityResult
+import com.google.android.play.core.install.model.AppUpdateType
+import com.google.android.play.core.install.model.UpdateAvailability
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.crashlytics.FirebaseCrashlytics
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.tasks.await
+
+/**
+ * Abstract base class for repository implementations related to main application functionality.
+ *
+ * This class provides common functionality for managing application startup state.
+ *
+ * @property application The application context.
+ */
+abstract class MainRepositoryImplementation(val application : Application) {
+
+    /**
+     * Checks if the application is being launched for the first time.
+     *
+     * This function retrieves the startup state from a data store and updates it if it's the first launch.
+     *
+     * @return `true` if it's the first launch, `false` otherwise.
+     */
+    suspend fun checkStartup() : Boolean {
+        val dataStore : DataStore = DataStore.getInstance(application)
+        val isFirstTime : Boolean = dataStore.startup.first()
+        if (isFirstTime) {
+            dataStore.saveStartup(isFirstTime = false)
+        }
+        return isFirstTime
+    }
+
+    /**
+     * Configures Firebase Analytics and Crashlytics data collection.
+     *
+     * Enables or disables data collection for both Firebase Analytics and Crashlytics
+     * based on the provided flag.
+     *
+     * @param isEnabled `true` to enable data collection, `false` to disable.
+     */
+    fun setupDiagnosticSettings(isEnabled : Boolean) {
+        FirebaseAnalytics.getInstance(application).setAnalyticsCollectionEnabled(isEnabled)
+        FirebaseCrashlytics.getInstance().isCrashlyticsCollectionEnabled = isEnabled
+    }
+
+    suspend fun checkForUpdatesLogic(activity : Activity, appUpdateManager : AppUpdateManager) : Int {
+
+        try {
+            var updateResult = Activity.RESULT_CANCELED
+            val appUpdateInfo = appUpdateManager.appUpdateInfo.await()
+
+            if (appUpdateInfo.updateAvailability() == UpdateAvailability.UPDATE_AVAILABLE && appUpdateInfo.isUpdateTypeAllowed(
+                    AppUpdateType.IMMEDIATE
+                ) && appUpdateInfo.updateAvailability() != UpdateAvailability.DEVELOPER_TRIGGERED_UPDATE_IN_PROGRESS
+            ) {
+                appUpdateInfo.clientVersionStalenessDays()?.let { stalenessDays ->
+                    val updateType =
+                            if (stalenessDays > 90) AppUpdateType.IMMEDIATE else AppUpdateType.FLEXIBLE
+                    @Suppress("DEPRECATION") appUpdateManager.startUpdateFlowForResult(
+                        appUpdateInfo , updateType , activity , 1
+                    )
+                    updateResult = Activity.RESULT_OK
+                }
+            }
+            return updateResult
+
+        } catch (e : Exception) {
+            return ActivityResult.RESULT_IN_APP_UPDATE_FAILED
+        }
+    }
+
+    @RequiresApi(Build.VERSION_CODES.O)
+    fun checkAndScheduleUpdateNotificationsLogic(appUpdateNotificationsManager : AppUpdateNotificationsManager) {
+        appUpdateNotificationsManager.checkAndSendUpdateNotification()
+    }
+
+    fun checkAppUsageNotificationsManager() {
+        val appUsageNotificationsManager = AppUsageNotificationsManager(application)
+        appUsageNotificationsManager.scheduleAppUsageCheck()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/SettingsActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/SettingsActivity.kt
similarity index 73%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/SettingsActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/SettingsActivity.kt
index 544dcd3..1f7f431 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/SettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.settings
+package com.d4rk.englishwithlidia.plus.ui.screens.settings
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class SettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -19,7 +19,9 @@ class SettingsActivity : AppCompatActivity() {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
-                    SettingsComposable(this@SettingsActivity)
+                    SettingsComposable(
+                        activity = this@SettingsActivity
+                    )
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/SettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/SettingsComposable.kt
new file mode 100644
index 0000000..5c246fc
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/SettingsComposable.kt
@@ -0,0 +1,106 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.settings
+
+import android.content.Context
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Build
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.material.icons.outlined.Notifications
+import androidx.compose.material.icons.outlined.Palette
+import androidx.compose.material.icons.outlined.SafetyCheck
+import androidx.compose.material.icons.outlined.ShoppingCart
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.ui.components.SettingsPreferenceItem
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffoldWithBackButton
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.about.AboutSettingsActivity
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.advanced.AdvancedSettingsActivity
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.DisplaySettingsActivity
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy.PrivacySettingsActivity
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+
+@Composable
+fun SettingsComposable(activity: SettingsActivity) {
+    val context: Context = LocalContext.current
+
+    TopAppBarScaffoldWithBackButton(
+        title = stringResource(id = R.string.settings),
+        onBackClicked = { activity.finish() }) { paddingValues ->
+        LazyColumn(
+            modifier = Modifier
+                    .fillMaxHeight()
+                    .padding(paddingValues),
+        ) {
+            item {
+                Spacer(modifier = Modifier.height(24.dp))
+                Column(
+                    modifier = Modifier
+                            .padding(start = 16.dp, end = 16.dp)
+                            .clip(RoundedCornerShape(24.dp))
+                ) {
+                    SettingsPreferenceItem(Icons.Outlined.Notifications,
+                                           title = stringResource(id = R.string.notifications),
+                                           summary = stringResource(id = R.string.summary_preference_settings_notifications),
+                                           onClick = {
+                                               IntentUtils.openAppNotificationSettings(context)
+                                           })
+                    Spacer(modifier = Modifier.height(2.dp))
+                    SettingsPreferenceItem(Icons.Outlined.Palette,
+                                           title = stringResource(id = R.string.display),
+                                           summary = stringResource(id = R.string.summary_preference_settings_display),
+                                           onClick = {
+                                               IntentUtils.openActivity(
+                                                   context, DisplaySettingsActivity::class.java
+                                               )
+                                           })
+                }
+                Spacer(modifier = Modifier.height(24.dp))
+            }
+            item {
+                Column(
+                    modifier = Modifier
+                            .padding(start = 16.dp, end = 16.dp)
+                            .clip(RoundedCornerShape(24.dp))
+                ) {
+                    SettingsPreferenceItem(Icons.Outlined.SafetyCheck,
+                                           title = stringResource(id = R.string.security_and_privacy),
+                                           summary = stringResource(id = R.string.summary_preference_settings_privacy_and_security),
+                                           onClick = {
+                                               IntentUtils.openActivity(
+                                                   context, PrivacySettingsActivity::class.java
+                                               )
+                                           })
+                    Spacer(modifier = Modifier.height(2.dp))
+                    SettingsPreferenceItem(Icons.Outlined.Build,
+                                           title = stringResource(id = R.string.advanced),
+                                           summary = stringResource(id = R.string.summary_preference_settings_advanced),
+                                           onClick = {
+                                               IntentUtils.openActivity(
+                                                   context, AdvancedSettingsActivity::class.java
+                                               )
+                                           })
+                    Spacer(modifier = Modifier.height(2.dp))
+                    SettingsPreferenceItem(Icons.Outlined.Info,
+                                           title = stringResource(id = R.string.about),
+                                           summary = stringResource(id = R.string.summary_preference_settings_about),
+                                           onClick = {
+                                               IntentUtils.openActivity(
+                                                   context, AboutSettingsActivity::class.java
+                                               )
+                                           })
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/about/AboutSettingsActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/about/AboutSettingsActivity.kt
similarity index 76%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/about/AboutSettingsActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/about/AboutSettingsActivity.kt
index 12119dc..88c8b43 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/about/AboutSettingsActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/about/AboutSettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.about
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.about
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class AboutSettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -19,7 +19,7 @@ class AboutSettingsActivity : AppCompatActivity() {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
-                    AboutSettingsComposable(this@AboutSettingsActivity)
+                    AboutSettingsComposable(activity = this@AboutSettingsActivity)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/about/AboutSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/about/AboutSettingsComposable.kt
new file mode 100644
index 0000000..7d348bd
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/about/AboutSettingsComposable.kt
@@ -0,0 +1,102 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.about
+
+import android.content.Context
+import android.os.Build
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.d4rk.englishwithlidia.plus.BuildConfig
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceCategoryItem
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceItem
+import com.d4rk.englishwithlidia.plus.ui.components.Snackbar
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffoldWithBackButton
+import com.d4rk.englishwithlidia.plus.utils.ClipboardUtil
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import com.d4rk.englishwithlidia.plus.utils.rememberHtmlData
+
+@Composable
+fun AboutSettingsComposable(activity : AboutSettingsActivity) {
+    val context : Context = LocalContext.current
+
+    var showSnackbar : Boolean by remember { mutableStateOf(value = false) }
+
+    val htmlData = rememberHtmlData()
+    val changelogHtmlString = htmlData.value.first
+    val eulaHtmlString = htmlData.value.second
+
+    TopAppBarScaffoldWithBackButton(
+        title = stringResource(id = R.string.about) ,
+        onBackClicked = { activity.finish() }) { paddingValues ->
+        Box(modifier = Modifier.padding(paddingValues)) {
+            LazyColumn(
+                modifier = Modifier.fillMaxHeight()
+            ) {
+                item(key = "app_info_category") {
+                    PreferenceCategoryItem(title = stringResource(id = R.string.app_info))
+                }
+                item(key = "app_name") {
+                    PreferenceItem(
+                        title = stringResource(id = R.string.app_name) ,
+                        summary = stringResource(id = R.string.copyright) ,
+                    )
+                }
+                item(key = "app_build_version") {
+                    PreferenceItem(
+                        title = stringResource(id = R.string.app_build_version) ,
+                        summary = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
+                    )
+                }
+                item(key = "oss_licenses") {
+                    PreferenceItem(title = stringResource(id= R.string.oss_license_title) ,
+                                   summary = stringResource(id = R.string.summary_preference_settings_oss) ,
+                                   onClick = {
+                                       IntentUtils.openLicensesScreen(
+                                           context = context ,
+                                           eulaHtmlString = eulaHtmlString ,
+                                           changelogHtmlString = changelogHtmlString
+                                       )
+                                   })
+                }
+                item(key = "device_info_category") {
+                    PreferenceCategoryItem(title = stringResource(id = R.string.device_info))
+                }
+                item(key = "device_info") {
+                    val version : String = stringResource(
+                        id = R.string.app_build ,
+                        "${stringResource(id = R.string.manufacturer)} ${Build.MANUFACTURER}" ,
+                        "${stringResource(id = R.string.device_model)} ${Build.MODEL}" ,
+                        "${stringResource(id = R.string.android_version)} ${Build.VERSION.RELEASE}" ,
+                        "${stringResource(id = R.string.api_level)} ${Build.VERSION.SDK_INT}" ,
+                        "${stringResource(id = R.string.arch)} ${Build.SUPPORTED_ABIS.joinToString()}" ,
+                        if (BuildConfig.DEBUG) stringResource(id = R.string.debug)
+                        else stringResource(id = R.string.release)
+                    )
+
+                    PreferenceItem(title = stringResource(id = R.string.device_info) ,
+                                   summary = version ,
+                                   onClick = {
+                                       ClipboardUtil.copyTextToClipboard(context = context ,
+                                                                         label = "Device Info" ,
+                                                                         text = version ,
+                                                                         onShowSnackbar = {
+                                                                             showSnackbar = true
+                                                                         })
+                                   })
+                }
+            }
+            Snackbar(message = stringResource(id = R.string.snack_device_info_copied) ,
+                     showSnackbar = showSnackbar ,
+                     onDismiss = { showSnackbar = false })
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/advanced/AdvancedSettingsActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/advanced/AdvancedSettingsActivity.kt
similarity index 75%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/advanced/AdvancedSettingsActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/advanced/AdvancedSettingsActivity.kt
index 4127019..7b104dd 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/advanced/AdvancedSettingsActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/advanced/AdvancedSettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.advanced
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.advanced
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class AdvancedSettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -19,7 +19,7 @@ class AdvancedSettingsActivity : AppCompatActivity() {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
-                    AdvancedSettingsComposable(this@AdvancedSettingsActivity)
+                    AdvancedSettingsComposable(activity = this@AdvancedSettingsActivity)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/advanced/AdvancedSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/advanced/AdvancedSettingsComposable.kt
new file mode 100644
index 0000000..a339f8a
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/advanced/AdvancedSettingsComposable.kt
@@ -0,0 +1,45 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.advanced
+
+import android.content.Context
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceCategoryItem
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceItem
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffoldWithBackButton
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+
+@Composable
+fun AdvancedSettingsComposable(activity: AdvancedSettingsActivity) {
+    val context: Context = LocalContext.current
+    TopAppBarScaffoldWithBackButton(
+        title = stringResource(id = R.string.advanced),
+        onBackClicked = { activity.finish() }) { paddingValues ->
+        LazyColumn(
+            modifier = Modifier
+                    .fillMaxHeight()
+                    .padding(paddingValues),
+        ) {
+            item(key = "error_reporting_category") {
+                PreferenceCategoryItem(title = stringResource(id = R.string.error_reporting))
+            }
+            item(key = "bug_report") {
+                PreferenceItem(
+                    title = stringResource(id = R.string.bug_report),
+                    summary = stringResource(id = R.string.summary_preference_settings_bug_report),
+                    onClick = {
+                        IntentUtils.openUrl(
+                            context,
+                            url = "https://github.com/D4rK7355608/${context.packageName}/issues/new"
+                        )
+                    }
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/DisplaySettingsActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/DisplaySettingsActivity.kt
similarity index 75%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/DisplaySettingsActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/DisplaySettingsActivity.kt
index c73ea90..7fb53c7 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/DisplaySettingsActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/DisplaySettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.display
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.display
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class DisplaySettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -19,7 +19,7 @@ class DisplaySettingsActivity : AppCompatActivity() {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
-                    DisplaySettingsComposable(this@DisplaySettingsActivity)
+                    DisplaySettingsComposable(activity = this@DisplaySettingsActivity)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/DisplaySettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/DisplaySettingsComposable.kt
new file mode 100644
index 0000000..14be3d9
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/DisplaySettingsComposable.kt
@@ -0,0 +1,169 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.display
+
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.os.Build
+import android.provider.Settings
+import androidx.appcompat.app.AppCompatDelegate
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.core.os.LocaleListCompat
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceCategoryItem
+import com.d4rk.englishwithlidia.plus.ui.components.dialogs.SelectLanguageAlertDialog
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceItem
+import com.d4rk.englishwithlidia.plus.ui.components.SwitchPreferenceItem
+import com.d4rk.englishwithlidia.plus.ui.components.SwitchPreferenceItemWithDivider
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffoldWithBackButton
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.ThemeSettingsActivity
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@Composable
+fun DisplaySettingsComposable(activity: DisplaySettingsActivity) {
+    val context: Context = LocalContext.current
+    val dataStore: DataStore = DataStore.getInstance(context = context)
+    var showLanguageDialog: Boolean by remember { mutableStateOf(value = false) }
+    val themeMode: String = dataStore.themeMode.collectAsState(initial = "follow_system").value
+    val darkModeString: String = stringResource(id = R.string.dark_mode)
+    val lightModeString: String = stringResource(id = R.string.light_mode)
+    val themeSummary: String = when (themeMode) {
+        darkModeString, lightModeString -> stringResource(id = R.string.will_never_turn_on_automatically)
+        else -> stringResource(id = R.string.will_turn_on_automatically_by_system)
+    }
+    val switchState: MutableState<Boolean> =
+            remember { mutableStateOf(value = themeMode == darkModeString) }
+    val bouncyButtons: Boolean by dataStore.bouncyButtons.collectAsState(initial = true)
+
+
+    val isDynamicColors: State<Boolean> = dataStore.dynamicColors.collectAsState(initial = true)
+    val scope: CoroutineScope = rememberCoroutineScope()
+
+    TopAppBarScaffoldWithBackButton(
+        title = stringResource(id = R.string.display),
+        onBackClicked = { activity.finish() }) { paddingValues ->
+        LazyColumn(
+            modifier = Modifier
+                    .fillMaxHeight()
+                    .padding(paddingValues),
+        ) {
+            item {
+                PreferenceCategoryItem(title = stringResource(id = R.string.appearance))
+                SwitchPreferenceItemWithDivider(
+                    title = stringResource(id = R.string.dark_theme),
+                    summary = themeSummary,
+                    checked = switchState.value,
+                    onCheckedChange = { isChecked ->
+                        switchState.value = isChecked
+                    },
+                    onSwitchClick = { isChecked ->
+                        scope.launch(Dispatchers.IO) {
+                            if (isChecked) {
+                                dataStore.saveThemeMode(darkModeString)
+                                dataStore.themeModeState.value =
+                                        darkModeString
+                            } else {
+                                dataStore.saveThemeMode(lightModeString)
+                                dataStore.themeModeState.value =
+                                        lightModeString
+                            }
+                        }
+                    },
+                    onClick = {
+                        IntentUtils.openActivity(
+                            context, ThemeSettingsActivity::class.java
+                        )
+                    })
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                    SwitchPreferenceItem(
+                        title = stringResource(id = R.string.dynamic_colors),
+                        summary = stringResource(id = R.string.summary_preference_settings_dynamic_colors),
+                        checked = isDynamicColors.value,
+                    ) { isChecked ->
+                        CoroutineScope(Dispatchers.IO).launch {
+                            dataStore.saveDynamicColors(isChecked)
+                        }
+                    }
+                }
+            }
+            item {
+                PreferenceCategoryItem(title = stringResource(id = R.string.app_behavior))
+                SwitchPreferenceItem(
+                    title = stringResource(id = R.string.bounce_buttons),
+                    summary = stringResource(id = R.string.summary_preference_settings_bounce_buttons),
+                    checked = bouncyButtons,
+                ) { isChecked ->
+                    CoroutineScope(Dispatchers.IO).launch {
+                        dataStore.saveBouncyButtons(isChecked)
+                    }
+                }
+            }
+            item {
+                PreferenceCategoryItem(title = stringResource(id = R.string.language))
+                PreferenceItem(
+                    title = stringResource(id = R.string.language),
+                    summary = stringResource(id = R.string.summary_preference_settings_language),
+                    onClick = {
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+                            val localeIntent: Intent =
+                                    Intent(Settings.ACTION_APP_LOCALE_SETTINGS).setData(
+                                        Uri.fromParts(
+                                            "package", context.packageName, null
+                                        )
+                                    )
+                            val detailsIntent: Intent =
+                                    Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).setData(
+                                        Uri.fromParts(
+                                            "package", context.packageName, null
+                                        )
+                                    )
+                            when {
+                                context.packageManager.resolveActivity(
+                                    localeIntent, 0
+                                ) != null -> context.startActivity(localeIntent)
+
+                                context.packageManager.resolveActivity(
+                                    detailsIntent, 0
+                                ) != null -> context.startActivity(detailsIntent)
+
+                                else -> {
+                                    showLanguageDialog = true
+                                }
+                            }
+                        } else {
+                            showLanguageDialog = true
+                        }
+                    })
+                if (showLanguageDialog) {
+                    SelectLanguageAlertDialog(dataStore = dataStore ,
+                                              onDismiss = { showLanguageDialog = false } ,
+                                              onLanguageSelected = { newLanguageCode ->
+                                                  AppCompatDelegate.setApplicationLocales(
+                                                      LocaleListCompat.forLanguageTags(
+                                                          newLanguageCode
+                                                      )
+                                                  )
+                                              })
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/ThemeSettingsActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/ThemeSettingsActivity.kt
similarity index 75%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/ThemeSettingsActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/ThemeSettingsActivity.kt
index 2f91539..f907d51 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/ThemeSettingsActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/ThemeSettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.display.theme
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class ThemeSettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -19,7 +19,7 @@ class ThemeSettingsActivity : AppCompatActivity() {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
-                    ThemeSettingsComposable(this@ThemeSettingsActivity)
+                    ThemeSettingsComposable(activity = this@ThemeSettingsActivity)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/ThemeSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/ThemeSettingsComposable.kt
similarity index 53%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/ThemeSettingsComposable.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/ThemeSettingsComposable.kt
index d883471..61dacd0 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/ThemeSettingsComposable.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/ThemeSettingsComposable.kt
@@ -1,5 +1,6 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.display.theme
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme
 
+import android.content.Context
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -10,68 +11,55 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.RadioButton
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.d4rk.englishwithlidia.plus.R
 import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
-import com.d4rk.englishwithlidia.plus.utils.compose.components.SwitchCardComposable
+import com.d4rk.englishwithlidia.plus.ui.components.SwitchCardComposable
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffoldWithBackButton
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun ThemeSettingsComposable(activity: ThemeSettingsActivity) {
-    val context = LocalContext.current
-    val dataStore = DataStore.getInstance(context)
-    val scope = rememberCoroutineScope()
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    val themeMode = dataStore.themeMode.collectAsState(initial = "follow_system").value
-    val isAmoledMode = dataStore.amoledMode.collectAsState(initial = false)
+    val context: Context = LocalContext.current
+    val dataStore: DataStore = DataStore.getInstance(context = context)
+    val scope: CoroutineScope = rememberCoroutineScope()
+    val themeMode: String = dataStore.themeMode.collectAsState(initial = "follow_system").value
+    val isAmoledMode: State<Boolean> = dataStore.amoledMode.collectAsState(initial = false)
 
-    val themeOptions = listOf(
-        stringResource(R.string.follow_system),
-        stringResource(R.string.dark_mode),
-        stringResource(R.string.light_mode),
+    val themeOptions: List<String> = listOf(
+        stringResource(id = R.string.follow_system),
+        stringResource(id = R.string.dark_mode),
+        stringResource(id = R.string.light_mode),
     )
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.dark_theme)) }, navigationIcon = {
-            IconButton(onClick = {
-                activity.finish()
-            }) {
-                Icon(
-                    Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null
-                )
-            }
-        }, scrollBehavior = scrollBehavior)
-    }) { paddingValues ->
+    TopAppBarScaffoldWithBackButton(
+        title = stringResource(id = R.string.dark_theme),
+        onBackClicked = { activity.finish() }) { paddingValues ->
         Box(modifier = Modifier.fillMaxSize()) {
             LazyColumn(
                 modifier = Modifier
-                    .fillMaxSize()
-                    .padding(paddingValues),
+                        .fillMaxSize()
+                        .padding(paddingValues),
             ) {
                 item {
                     SwitchCardComposable(
-                        title = stringResource(R.string.amoled_mode), switchState = isAmoledMode
+                        title = stringResource(id = R.string.amoled_mode),
+                        switchState = isAmoledMode
                     ) { isChecked ->
                         scope.launch(Dispatchers.IO) {
                             dataStore.saveAmoledMode(isChecked)
@@ -81,20 +69,23 @@ fun ThemeSettingsComposable(activity: ThemeSettingsActivity) {
                 item {
                     Column(
                         modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(24.dp)
+                                .fillMaxWidth()
+                                .padding(24.dp)
                     ) {
                         themeOptions.forEach { text ->
                             Row(
                                 Modifier.fillMaxWidth(),
                                 verticalAlignment = Alignment.CenterVertically
                             ) {
-                                RadioButton(selected = (text == themeMode), onClick = {
-                                    scope.launch(Dispatchers.IO) {
-                                        dataStore.saveThemeMode(text)
-                                        dataStore.themeModeState.value = text
-                                    }
-                                })
+                                RadioButton(
+                                    modifier = Modifier.bounceClick(),
+                                    selected = (text == themeMode),
+                                    onClick = {
+                                        scope.launch(Dispatchers.IO) {
+                                            dataStore.saveThemeMode(text)
+                                            dataStore.themeModeState.value = text
+                                        }
+                                    })
                                 Text(
                                     text = text,
                                     style = MaterialTheme.typography.bodyMedium.merge(),
@@ -107,12 +98,12 @@ fun ThemeSettingsComposable(activity: ThemeSettingsActivity) {
                 item {
                     Column(
                         modifier = Modifier
-                            .fillMaxWidth()
-                            .padding(24.dp)
+                                .fillMaxWidth()
+                                .padding(24.dp)
                     ) {
                         Icon(imageVector = Icons.Outlined.Info, contentDescription = null)
                         Spacer(modifier = Modifier.height(24.dp))
-                        Text(stringResource(R.string.summary_dark_theme))
+                        Text(text = stringResource(id = R.string.summary_dark_theme))
                     }
                 }
             }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/style/Color.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/style/Color.kt
new file mode 100644
index 0000000..d816dca
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/style/Color.kt
@@ -0,0 +1,75 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style
+
+import androidx.compose.ui.graphics.Color
+
+val primaryLight = Color(color = 0xFF904A41)
+val onPrimaryLight = Color(color = 0xFFFFFFFF)
+val primaryContainerLight = Color(color = 0xFFFFDAD5)
+val onPrimaryContainerLight = Color(color = 0xFF3B0906)
+val secondaryLight = Color(color = 0xFF775652)
+val onSecondaryLight = Color(color = 0xFFFFFFFF)
+val secondaryContainerLight = Color(color = 0xFFFFDAD5)
+val onSecondaryContainerLight = Color(color = 0xFF2C1512)
+val tertiaryLight = Color(color = 0xFF705C2E)
+val onTertiaryLight = Color(color = 0xFFFFFFFF)
+val tertiaryContainerLight = Color(color = 0xFFFCDFA6)
+val onTertiaryContainerLight = Color(color = 0xFF251A00)
+val errorLight = Color(color = 0xFFBA1A1A)
+val onErrorLight = Color(color = 0xFFFFFFFF)
+val errorContainerLight = Color(color = 0xFFFFDAD6)
+val onErrorContainerLight = Color(color = 0xFF410002)
+val backgroundLight = Color(color = 0xFFFFF8F7)
+val onBackgroundLight = Color(color = 0xFF231918)
+val surfaceLight = Color(color = 0xFFFFF8F7)
+val onSurfaceLight = Color(color = 0xFF231918)
+val surfaceVariantLight = Color(color = 0xFFF5DDDA)
+val onSurfaceVariantLight = Color(color = 0xFF534341)
+val outlineLight = Color(color = 0xFF857370)
+val outlineVariantLight = Color(color = 0xFFD8C2BE)
+val scrimLight = Color(color = 0xFF000000)
+val inverseSurfaceLight = Color(color = 0xFF392E2C)
+val inverseOnSurfaceLight = Color(color = 0xFFFFEDEA)
+val inversePrimaryLight = Color(color = 0xFFFFB4A9)
+val surfaceDimLight = Color(color = 0xFFE8D6D3)
+val surfaceBrightLight = Color(color = 0xFFFFF8F7)
+val surfaceContainerLowestLight = Color(color = 0xFFFFFFFF)
+val surfaceContainerLowLight = Color(color = 0xFFFFF0EE)
+val surfaceContainerLight = Color(color = 0xFFFCEAE7)
+val surfaceContainerHighLight = Color(color = 0xFFF7E4E1)
+val surfaceContainerHighestLight = Color(color = 0xFFF1DEDC)
+
+val primaryDark = Color(color = 0xFFFFB4A9)
+val onPrimaryDark = Color(color = 0xFF561E18)
+val primaryContainerDark = Color(color = 0xFF73342C)
+val onPrimaryContainerDark = Color(color = 0xFFFFDAD5)
+val secondaryDark = Color(color = 0xFFE7BDB7)
+val onSecondaryDark = Color(color = 0xFF442926)
+val secondaryContainerDark = Color(color = 0xFF5D3F3B)
+val onSecondaryContainerDark = Color(color = 0xFFFFDAD5)
+val tertiaryDark = Color(color = 0xFFDFC38C)
+val onTertiaryDark = Color(color = 0xFF3E2E04)
+val tertiaryContainerDark = Color(color = 0xFF574419)
+val onTertiaryContainerDark = Color(color = 0xFFFCDFA6)
+val errorDark = Color(color = 0xFFFFB4AB)
+val onErrorDark = Color(color = 0xFF690005)
+val errorContainerDark = Color(color = 0xFF93000A)
+val onErrorContainerDark = Color(color = 0xFFFFDAD6)
+val backgroundDark = Color(color = 0xFF1A1110)
+val onBackgroundDark = Color(color = 0xFFF1DEDC)
+val surfaceDark = Color(color = 0xFF1A1110)
+val onSurfaceDark = Color(color = 0xFFF1DEDC)
+val surfaceVariantDark = Color(color = 0xFF534341)
+val onSurfaceVariantDark = Color(color = 0xFFD8C2BE)
+val outlineDark = Color(color = 0xFFA08C89)
+val outlineVariantDark = Color(color = 0xFF534341)
+val scrimDark = Color(color = 0xFF000000)
+val inverseSurfaceDark = Color(color = 0xFFF1DEDC)
+val inverseOnSurfaceDark = Color(color = 0xFF392E2C)
+val inversePrimaryDark = Color(color = 0xFF904A41)
+val surfaceDimDark = Color(color = 0xFF1A1110)
+val surfaceBrightDark = Color(color = 0xFF423735)
+val surfaceContainerLowestDark = Color(color = 0xFF140C0B)
+val surfaceContainerLowDark = Color(color = 0xFF231918)
+val surfaceContainerDark = Color(color = 0xFF271D1C)
+val surfaceContainerHighDark = Color(color = 0xFF322826)
+val surfaceContainerHighestDark = Color(color = 0xFF3D3231)
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Theme.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/style/Theme.kt
similarity index 80%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Theme.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/style/Theme.kt
index da2432b..06165ed 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Theme.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/display/theme/style/Theme.kt
@@ -1,8 +1,10 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style
 
 import android.app.Activity
 import android.content.Context
 import android.os.Build
+import android.view.View
+import android.view.Window
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.ColorScheme
 import androidx.compose.material3.MaterialTheme
@@ -117,10 +119,10 @@ private val darkScheme = darkColorScheme(
 private fun getColorScheme(
     isDarkTheme: Boolean, isAmoledMode: Boolean, isDynamicColors: Boolean, context: Context
 ): ColorScheme {
-    val dynamicDark =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) dynamicDarkColorScheme(context) else darkScheme
-    val dynamicLight =
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) dynamicLightColorScheme(context) else lightScheme
+    val dynamicDark: ColorScheme =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) dynamicDarkColorScheme(context) else darkScheme
+    val dynamicLight: ColorScheme =
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) dynamicLightColorScheme(context) else lightScheme
 
     return when {
         isAmoledMode && isDarkTheme && isDynamicColors -> dynamicDark.copy(
@@ -142,32 +144,33 @@ private fun getColorScheme(
 fun AppTheme(
     content: @Composable () -> Unit
 ) {
-    val context = LocalContext.current
-    val dataStore = DataStore.getInstance(context)
-    val themeMode = dataStore.themeMode.collectAsState(initial = "follow_system").value
-    val isDynamicColors = dataStore.dynamicColors.collectAsState(initial = true).value
-    val isAmoledMode = dataStore.amoledMode.collectAsState(initial = false).value
+    val context: Context = LocalContext.current
+    val dataStore: DataStore = DataStore.getInstance(context = context)
+    val themeMode: String = dataStore.themeMode.collectAsState(initial = "follow_system").value
+    val isDynamicColors: Boolean = dataStore.dynamicColors.collectAsState(initial = true).value
+    val isAmoledMode: Boolean = dataStore.amoledMode.collectAsState(initial = false).value
 
-    val isSystemDarkTheme = isSystemInDarkTheme()
-    val isDarkTheme = when (themeMode) {
-        stringResource(R.string.dark_mode) -> true
-        stringResource(R.string.light_mode) -> false
+    val isSystemDarkTheme: Boolean = isSystemInDarkTheme()
+    val isDarkTheme: Boolean = when (themeMode) {
+        stringResource(id = R.string.dark_mode) -> true
+        stringResource(id = R.string.light_mode) -> false
         else -> isSystemDarkTheme
     }
 
-    val colorScheme = getColorScheme(isDarkTheme, isAmoledMode, isDynamicColors, context)
+    val colorScheme: ColorScheme =
+            getColorScheme(isDarkTheme, isAmoledMode, isDynamicColors, context)
 
-    val view = LocalView.current
+    val view: View = LocalView.current
     if (!view.isInEditMode) {
         SideEffect {
-            val window = (view.context as Activity).window
+            val window: Window = (view.context as Activity).window
             window.statusBarColor = Color.Transparent.toArgb()
             WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars =
-                !isDarkTheme
+                    !isDarkTheme
         }
     }
 
     MaterialTheme(
-        colorScheme = colorScheme, typography = Typography, content = content
+        colorScheme = colorScheme, content = content
     )
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/PrivacySettingsActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/PrivacySettingsActivity.kt
similarity index 75%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/PrivacySettingsActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/PrivacySettingsActivity.kt
index c9fcfc1..599090a 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/PrivacySettingsActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/PrivacySettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.privacy
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class PrivacySettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -19,7 +19,7 @@ class PrivacySettingsActivity : AppCompatActivity() {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
-                    PrivacySettingsComposable(this@PrivacySettingsActivity)
+                    PrivacySettingsComposable(activity = this@PrivacySettingsActivity)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/PrivacySettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/PrivacySettingsComposable.kt
new file mode 100644
index 0000000..c1a1909
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/PrivacySettingsComposable.kt
@@ -0,0 +1,107 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy
+
+import android.content.Context
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceCategoryItem
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceItem
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffoldWithBackButton
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy.ads.AdsSettingsActivity
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy.permissions.PermissionsSettingsActivity
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy.usage.UsageAndDiagnosticsActivity
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+
+@Composable
+fun PrivacySettingsComposable(activity: PrivacySettingsActivity) {
+    val context: Context = LocalContext.current
+    TopAppBarScaffoldWithBackButton(
+        title = stringResource(id = R.string.security_and_privacy),
+        onBackClicked = { activity.finish() }) { paddingValues ->
+        LazyColumn(
+            modifier = Modifier
+                    .fillMaxHeight()
+                    .padding(paddingValues),
+        ) {
+            item {
+                PreferenceCategoryItem(title = stringResource(id = R.string.privacy))
+                PreferenceItem(
+                    title = stringResource(id = R.string.privacy_policy),
+                    summary = stringResource(id = R.string.summary_preference_settings_privacy_policy),
+                    onClick = {
+                        IntentUtils.openUrl(
+                            context,
+                            url = "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy"
+                        )
+                    })
+                PreferenceItem(
+                    title = stringResource(id = R.string.terms_of_service),
+                    summary = stringResource(id = R.string.summary_preference_settings_terms_of_service),
+                    onClick = {
+                        IntentUtils.openUrl(
+                            context,
+                            url = "https://sites.google.com/view/d4rk7355608/more/apps/terms-of-service"
+                        )
+                    })
+                PreferenceItem(
+                    title = stringResource(id = R.string.code_of_conduct),
+                    summary = stringResource(id = R.string.summary_preference_settings_code_of_conduct),
+                    onClick = {
+                        IntentUtils.openUrl(
+                            context,
+                            url = "https://sites.google.com/view/d4rk7355608/more/code-of-conduct"
+                        )
+                    })
+                PreferenceItem(
+                    title = stringResource(id = R.string.permissions),
+                    summary = stringResource(id = R.string.summary_preference_settings_permissions),
+                    onClick = {
+                        IntentUtils.openActivity(
+                            context, PermissionsSettingsActivity::class.java
+                        )
+                    })
+                PreferenceItem(
+                    title = stringResource(id = R.string.ads),
+                    summary = stringResource(id = R.string.summary_preference_settings_ads),
+                    onClick = {
+                        IntentUtils.openActivity(
+                            context, AdsSettingsActivity::class.java
+                        )
+                    })
+                PreferenceItem(
+                    title = stringResource(id = R.string.usage_and_diagnostics),
+                    summary = stringResource(id = R.string.summary_preference_settings_usage_and_diagnostics),
+                    onClick = {
+                        IntentUtils.openActivity(
+                            context, UsageAndDiagnosticsActivity::class.java
+                        )
+                    })
+            }
+            item {
+                PreferenceCategoryItem(title = stringResource(id = R.string.legal))
+                PreferenceItem(
+                    title = stringResource(id = R.string.legal_notices),
+                    summary = stringResource(id = R.string.summary_preference_settings_legal_notices),
+                    onClick = {
+                        IntentUtils.openUrl(
+                            context,
+                            url = "https://sites.google.com/view/d4rk7355608/more/apps/legal-notices"
+                        )
+                    })
+                PreferenceItem(
+                    title = stringResource(id = R.string.license),
+                    summary = stringResource(id = R.string.summary_preference_settings_license),
+                    onClick = {
+                        IntentUtils.openUrl(
+                            context, url = "https://www.gnu.org/licenses/gpl-3.0"
+                        )
+                    })
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/ads/AdsSettingsActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/ads/AdsSettingsActivity.kt
similarity index 67%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/ads/AdsSettingsActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/ads/AdsSettingsActivity.kt
index c381ed9..97434e9 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/ads/AdsSettingsActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/ads/AdsSettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.privacy.ads
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy.ads
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -8,47 +8,48 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 import com.google.android.ump.ConsentForm
 import com.google.android.ump.ConsentInformation
 import com.google.android.ump.ConsentRequestParameters
 import com.google.android.ump.UserMessagingPlatform
 
 class AdsSettingsActivity : AppCompatActivity() {
-    private lateinit var consentInformation : ConsentInformation
-    private val isPrivacyOptionsRequired : Boolean
+    private lateinit var consentInformation: ConsentInformation
+    private val isPrivacyOptionsRequired: Boolean
         get() = consentInformation.privacyOptionsRequirementStatus == ConsentInformation.PrivacyOptionsRequirementStatus.REQUIRED
-    private lateinit var consentForm : ConsentForm
+    private lateinit var consentForm: ConsentForm
 
-    override fun onCreate(savedInstanceState : Bundle?) {
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         consentInformation = UserMessagingPlatform.getConsentInformation(this@AdsSettingsActivity)
         setContent {
             AppTheme {
                 Surface(
-                    modifier = Modifier.fillMaxSize() , color = MaterialTheme.colorScheme.background
+                    modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
-                    AdsSettingsComposable(this@AdsSettingsActivity)
+                    AdsSettingsComposable(activity = this@AdsSettingsActivity)
                 }
             }
         }
     }
 
     fun openForm() {
-        UserMessagingPlatform.loadConsentForm(this , { consentForm ->
+        UserMessagingPlatform.loadConsentForm(this, { consentForm ->
             this.consentForm = consentForm
             if (consentInformation.consentStatus == ConsentInformation.ConsentStatus.REQUIRED || consentInformation.consentStatus == ConsentInformation.ConsentStatus.OBTAINED) {
                 consentForm.show(this) {
                     loadForm()
                 }
             }
-        } , {})
+        }, {})
     }
 
     private fun loadForm() {
-        val params = ConsentRequestParameters.Builder().setTagForUnderAgeOfConsent(false).build()
-        consentInformation.requestConsentInfoUpdate(this@AdsSettingsActivity , params , {
+        val params: ConsentRequestParameters =
+                ConsentRequestParameters.Builder().setTagForUnderAgeOfConsent(false).build()
+        consentInformation.requestConsentInfoUpdate(this@AdsSettingsActivity, params, {
             UserMessagingPlatform.loadAndShowConsentFormIfRequired(
                 this@AdsSettingsActivity
             ) {
@@ -56,6 +57,6 @@ class AdsSettingsActivity : AppCompatActivity() {
                     invalidateOptionsMenu()
                 }
             }
-        } , {})
+        }, {})
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/ads/AdsSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/ads/AdsSettingsComposable.kt
new file mode 100644
index 0000000..f0c3122
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/ads/AdsSettingsComposable.kt
@@ -0,0 +1,143 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy.ads
+
+import android.content.Context
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
+import com.d4rk.englishwithlidia.plus.BuildConfig
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceItem
+import com.d4rk.englishwithlidia.plus.ui.components.SwitchCardComposable
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffoldWithBackButton
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import com.google.android.ump.ConsentInformation
+import com.google.android.ump.ConsentRequestParameters
+import com.google.android.ump.UserMessagingPlatform
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@Composable
+fun AdsSettingsComposable(activity: AdsSettingsActivity) {
+    val context: Context = LocalContext.current
+    val dataStore: DataStore = DataStore.getInstance(context = context)
+    val switchState: State<Boolean> = dataStore.ads.collectAsState(initial = ! BuildConfig.DEBUG)
+    val scope: CoroutineScope = rememberCoroutineScope()
+    TopAppBarScaffoldWithBackButton(
+        title = stringResource(id = R.string.ads),
+        onBackClicked = { activity.finish() }) { paddingValues ->
+        Box(modifier = Modifier.fillMaxSize()) {
+            LazyColumn(
+                modifier = Modifier
+                        .fillMaxSize()
+                        .padding(paddingValues),
+            ) {
+                item(key = "display_ads") {
+                    SwitchCardComposable(
+                        title = stringResource(id = R.string.display_ads), switchState = switchState
+                    ) { isChecked ->
+                        scope.launch(Dispatchers.IO) {
+                            dataStore.saveAds(isChecked)
+                        }
+                    }
+                }
+                item(key = "personalized_ads") {
+                    Box(modifier = Modifier.padding(horizontal = 8.dp)) {
+                        PreferenceItem(
+                            title = stringResource(id = R.string.personalized_ads),
+                            enabled = switchState.value,
+                            summary = stringResource(id = R.string.summary_ads_personalized_ads),
+                            onClick = {
+                                val params: ConsentRequestParameters =
+                                        ConsentRequestParameters.Builder()
+                                                .setTagForUnderAgeOfConsent(false)
+                                                .build()
+                                val consentInformation: ConsentInformation =
+                                        UserMessagingPlatform.getConsentInformation(
+                                            context
+                                        )
+                                consentInformation.requestConsentInfoUpdate(activity,
+                                                                            params,
+                                                                            {
+                                                                                activity.openForm()
+                                                                            },
+                                                                            {})
+                            })
+                    }
+                }
+                item(key = "ads_info") {
+                    Column(
+                        modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(24.dp)
+                    ) {
+                        Icon(imageVector = Icons.Outlined.Info, contentDescription = null)
+                        Spacer(modifier = Modifier.height(24.dp))
+                        Text(text = stringResource(id = R.string.summary_ads))
+
+                        val annotatedString: AnnotatedString = buildAnnotatedString {
+                            val startIndex: Int = length
+                            withStyle(
+                                style = SpanStyle(
+                                    color = MaterialTheme.colorScheme.primary,
+                                    textDecoration = TextDecoration.Underline
+                                )
+                            ) {
+                                append(stringResource(id = R.string.learn_more))
+                            }
+                            val endIndex: Int = length
+
+                            addStringAnnotation(
+                                tag = "URL",
+                                annotation = "https://sites.google.com/view/d4rk7355608/more/apps/ads-help-center",
+                                start = startIndex,
+                                end = endIndex
+                            )
+                        }
+
+                        Text(text = annotatedString, modifier = Modifier
+                                .bounceClick()
+                                .clickable {
+                                    annotatedString
+                                            .getStringAnnotations(
+                                                tag = "URL",
+                                                start = 0,
+                                                end = annotatedString.length
+                                            )
+                                            .firstOrNull()
+                                            ?.let { annotation ->
+                                                IntentUtils.openUrl(context, annotation.item)
+                                            }
+                                })
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/permissions/PermissionsSettingsActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/permissions/PermissionsSettingsActivity.kt
similarity index 74%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/permissions/PermissionsSettingsActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/permissions/PermissionsSettingsActivity.kt
index 65a7437..0974623 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/permissions/PermissionsSettingsActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/permissions/PermissionsSettingsActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.privacy.permissions
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy.permissions
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class PermissionsSettingsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -19,7 +19,7 @@ class PermissionsSettingsActivity : AppCompatActivity() {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
-                    PermissionsSettingsComposable(this@PermissionsSettingsActivity)
+                    PermissionsSettingsComposable(activity = this@PermissionsSettingsActivity)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/permissions/PermissionsSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/permissions/PermissionsSettingsComposable.kt
new file mode 100644
index 0000000..6bd42d0
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/permissions/PermissionsSettingsComposable.kt
@@ -0,0 +1,64 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy.permissions
+
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceCategoryItem
+import com.d4rk.englishwithlidia.plus.ui.components.PreferenceItem
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffoldWithBackButton
+
+@Composable
+fun PermissionsSettingsComposable(activity: PermissionsSettingsActivity) {
+    TopAppBarScaffoldWithBackButton(
+        title = stringResource(id = R.string.permissions),
+        onBackClicked = { activity.finish() }) { paddingValues ->
+        LazyColumn(
+            modifier = Modifier
+                    .fillMaxHeight()
+                    .padding(paddingValues),
+        ) {
+            item {
+                PreferenceCategoryItem(title = stringResource(id = R.string.normal))
+                PreferenceItem(
+                    title = stringResource(id = R.string.ad_id),
+                    summary = stringResource(id = R.string.summary_preference_permissions_ad_id),
+                )
+                PreferenceItem(
+                    title = stringResource(id = R.string.internet),
+                    summary = stringResource(id = R.string.summary_preference_permissions_internet),
+                )
+                PreferenceItem(
+                    title = stringResource(id = R.string.post_notifications),
+                    summary = stringResource(id = R.string.summary_preference_permissions_post_notifications),
+                )
+            }
+            item {
+                PreferenceCategoryItem(title = stringResource(id = R.string.runtime))
+                PreferenceItem(
+                    title = stringResource(id = R.string.access_network_state),
+                    summary = stringResource(id = R.string.summary_preference_permissions_access_network_state),
+                )
+                PreferenceItem(
+                    title = stringResource(id = R.string.access_notification_policy),
+                    summary = stringResource(id = R.string.summary_preference_permissions_access_notification_policy),
+                )
+                PreferenceItem(
+                    title = stringResource(id = R.string.billing),
+                    summary = stringResource(id = R.string.summary_preference_permissions_billing),
+                )
+                PreferenceItem(
+                    title = stringResource(id = R.string.check_license),
+                    summary = stringResource(id = R.string.summary_preference_permissions_check_license),
+                )
+                PreferenceItem(
+                    title = stringResource(id = R.string.foreground_service),
+                    summary = stringResource(id = R.string.summary_preference_permissions_foreground_service),
+                )
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/usage/UsageAndDiagnosticsActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/usage/UsageAndDiagnosticsActivity.kt
similarity index 74%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/usage/UsageAndDiagnosticsActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/usage/UsageAndDiagnosticsActivity.kt
index 019b010..4076d18 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/usage/UsageAndDiagnosticsActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/usage/UsageAndDiagnosticsActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.privacy.usage
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy.usage
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class UsageAndDiagnosticsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -19,7 +19,7 @@ class UsageAndDiagnosticsActivity : AppCompatActivity() {
                 Surface(
                     modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
-                    UsageAndDiagnosticsComposable(this@UsageAndDiagnosticsActivity)
+                    UsageAndDiagnosticsComposable(activity = this@UsageAndDiagnosticsActivity)
                 }
             }
         }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/usage/UsageAndDiagnosticsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/usage/UsageAndDiagnosticsComposable.kt
new file mode 100644
index 0000000..973c13a
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/settings/privacy/usage/UsageAndDiagnosticsComposable.kt
@@ -0,0 +1,114 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.settings.privacy.usage
+
+import android.content.Context
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
+import com.d4rk.englishwithlidia.plus.BuildConfig
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
+import com.d4rk.englishwithlidia.plus.ui.components.SwitchCardComposable
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffoldWithBackButton
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+@Composable
+fun UsageAndDiagnosticsComposable(activity: UsageAndDiagnosticsActivity) {
+    val context: Context = LocalContext.current
+    val dataStore: DataStore = DataStore.getInstance(context = context)
+    val switchState: State<Boolean> = dataStore.usageAndDiagnostics.collectAsState(initial = ! BuildConfig.DEBUG)
+    val scope: CoroutineScope = rememberCoroutineScope()
+    TopAppBarScaffoldWithBackButton(
+        title = stringResource(id = R.string.usage_and_diagnostics),
+        onBackClicked = { activity.finish() }) { paddingValues ->
+        Box(modifier = Modifier.fillMaxSize()) {
+            LazyColumn(
+                modifier = Modifier
+                        .fillMaxSize()
+                        .padding(paddingValues),
+            ) {
+                item {
+                    SwitchCardComposable(
+                        title = stringResource(id = R.string.usage_and_diagnostics),
+                        switchState = switchState
+                    ) { isChecked ->
+                        scope.launch(Dispatchers.IO) {
+                            dataStore.saveUsageAndDiagnostics(isChecked)
+                        }
+                    }
+                }
+                item {
+                    Column(
+                        modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(24.dp)
+                    ) {
+                        Icon(imageVector = Icons.Outlined.Info, contentDescription = null)
+                        Spacer(modifier = Modifier.height(24.dp))
+                        Text(text = stringResource(id = R.string.summary_usage_and_diagnostics))
+                        val annotatedString: AnnotatedString = buildAnnotatedString {
+                            val startIndex: Int = length
+                            withStyle(
+                                style = SpanStyle(
+                                    color = MaterialTheme.colorScheme.primary,
+                                    textDecoration = TextDecoration.Underline
+                                )
+                            ) {
+                                append(stringResource(id = R.string.learn_more))
+                            }
+                            val endIndex: Int = length
+
+                            addStringAnnotation(
+                                tag = "URL",
+                                annotation = "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy",
+                                start = startIndex,
+                                end = endIndex
+                            )
+                        }
+                        Text(text = annotatedString, modifier = Modifier
+                                .bounceClick()
+                                .clickable {
+                                    annotatedString
+                                            .getStringAnnotations(
+                                                tag = "URL",
+                                                start = 0,
+                                                end = annotatedString.length
+                                            )
+                                            .firstOrNull()
+                                            ?.let { annotation ->
+                                                IntentUtils.openUrl(context, annotation.item)
+                                            }
+                                })
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/startup/StartupActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/startup/StartupActivity.kt
similarity index 69%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/startup/StartupActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/startup/StartupActivity.kt
index 8b79562..7364979 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/startup/StartupActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/startup/StartupActivity.kt
@@ -1,4 +1,4 @@
-package com.d4rk.englishwithlidia.plus.ui.startup
+package com.d4rk.englishwithlidia.plus.ui.screens.startup
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 import com.google.android.ump.ConsentForm
 import com.google.android.ump.ConsentInformation
 import com.google.android.ump.ConsentRequestParameters
@@ -16,28 +16,29 @@ import com.google.android.ump.UserMessagingPlatform
 import kotlinx.coroutines.flow.MutableStateFlow
 
 class StartupActivity : AppCompatActivity() {
-    private lateinit var consentInformation : ConsentInformation
-    private lateinit var consentForm : ConsentForm
-    val consentFormShown = MutableStateFlow(false)
-    override fun onCreate(savedInstanceState : Bundle?) {
+    private lateinit var consentInformation: ConsentInformation
+    private lateinit var consentForm: ConsentForm
+    val consentFormShown = MutableStateFlow(value = false)
+    override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
             AppTheme {
                 Surface(
-                    modifier = Modifier.fillMaxSize() , color = MaterialTheme.colorScheme.background
+                    modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background
                 ) {
-                    StartupComposable(this@StartupActivity)
+                    StartupComposable(activity = this@StartupActivity)
                 }
             }
         }
-        val params = ConsentRequestParameters.Builder().setTagForUnderAgeOfConsent(false).build()
+        val params: ConsentRequestParameters =
+                ConsentRequestParameters.Builder().setTagForUnderAgeOfConsent(false).build()
         consentInformation = UserMessagingPlatform.getConsentInformation(this)
-        consentInformation.requestConsentInfoUpdate(this , params , {
+        consentInformation.requestConsentInfoUpdate(this, params, {
             if (consentInformation.isConsentFormAvailable) {
                 loadForm()
             }
-        } , {})
+        }, {})
     }
 
     /**
@@ -52,7 +53,7 @@ class StartupActivity : AppCompatActivity() {
      * @see com.google.ads.consent.ConsentInformation
      */
     private fun loadForm() {
-        UserMessagingPlatform.loadConsentForm(this , { consentForm ->
+        UserMessagingPlatform.loadConsentForm(this@StartupActivity, { consentForm ->
             this.consentForm = consentForm
             if (consentInformation.consentStatus == ConsentInformation.ConsentStatus.REQUIRED) {
                 consentFormShown.value = true
@@ -60,6 +61,6 @@ class StartupActivity : AppCompatActivity() {
                     loadForm()
                 }
             }
-        } , {})
+        }, {})
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/startup/StartupComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/startup/StartupComposable.kt
new file mode 100644
index 0000000..9a10a9a
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/startup/StartupComposable.kt
@@ -0,0 +1,139 @@
+package com.d4rk.englishwithlidia.plus.ui.screens.startup
+
+import android.app.Activity
+import android.content.Context
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.safeDrawingPadding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.CheckCircle
+import androidx.compose.material.icons.outlined.Info
+import androidx.compose.material3.ExtendedFloatingActionButton
+import androidx.compose.material3.FloatingActionButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color.Companion.Gray
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.SpanStyle
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.style.TextDecoration
+import androidx.compose.ui.text.withStyle
+import androidx.compose.ui.unit.dp
+import coil3.compose.AsyncImage
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffold
+import com.d4rk.englishwithlidia.plus.ui.screens.main.MainActivity
+import com.d4rk.englishwithlidia.plus.utils.IntentUtils
+import com.d4rk.englishwithlidia.plus.utils.PermissionsUtils
+
+@Composable
+fun StartupComposable(activity: StartupActivity) {
+    val context: Context = LocalContext.current
+    val fabEnabled: MutableState<Boolean> = remember { mutableStateOf(value = false) }
+    LaunchedEffect(context) {
+        if (!PermissionsUtils.hasNotificationPermission(context)) {
+            PermissionsUtils.requestNotificationPermission(context as Activity)
+        }
+        activity.consentFormShown.collect { shown ->
+            fabEnabled.value = shown
+        }
+    }
+
+    TopAppBarScaffold(
+        title = stringResource(id = R.string.welcome),
+    ) { paddingValues ->
+        Box(
+            modifier = Modifier
+                    .fillMaxSize()
+                    .padding(24.dp)
+                    .safeDrawingPadding()
+        ) {
+            LazyColumn(
+                modifier = Modifier
+                        .fillMaxSize()
+                        .padding(paddingValues),
+            ) {
+                item {
+                    AsyncImage(
+                        model = R.drawable.il_startup,
+                        contentDescription = null,
+                    )
+                    Icon(
+                        Icons.Outlined.Info, contentDescription = null
+                    )
+                }
+                item {
+                    Text(
+                        text = stringResource(id = R.string.summary_browse_terms_of_service_and_privacy_policy),
+                        modifier = Modifier.padding(top = 24.dp, bottom = 24.dp)
+                    )
+                    val annotatedString: AnnotatedString = buildAnnotatedString {
+                        val startIndex: Int = length
+                        withStyle(
+                            style = SpanStyle(
+                                color = MaterialTheme.colorScheme.primary,
+                                textDecoration = TextDecoration.Underline
+                            )
+                        ) {
+                            append(stringResource(id = R.string.learn_more))
+                        }
+                        val endIndex: Int = length
+
+                        addStringAnnotation(
+                            tag = "URL",
+                            annotation = "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy",
+                            start = startIndex,
+                            end = endIndex
+                        )
+                    }
+                    Text(text = annotatedString, modifier = Modifier
+                            .bounceClick()
+                            .clickable {
+                                annotatedString
+                                        .getStringAnnotations(
+                                            tag = "URL", start = 0, end = annotatedString.length
+                                        )
+                                        .firstOrNull()
+                                        ?.let { annotation ->
+                                            IntentUtils.openUrl(context, annotation.item)
+                                        }
+                            })
+                }
+            }
+
+            ExtendedFloatingActionButton(modifier = Modifier
+                    .align(Alignment.BottomEnd)
+                    .bounceClick(),
+                                         containerColor = if (fabEnabled.value) {
+                                             FloatingActionButtonDefaults.containerColor
+                                         } else {
+                                             Gray
+                                         },
+                                         text = { Text(text = stringResource(id = R.string.agree)) },
+                                         onClick = {
+                                             IntentUtils.openActivity(
+                                                 context, MainActivity::class.java
+                                             )
+                                         },
+                                         icon = {
+                                             Icon(
+                                                 Icons.Outlined.CheckCircle, contentDescription = null
+                                             )
+                                         })
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/support/SupportActivity.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/support/SupportActivity.kt
similarity index 62%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/support/SupportActivity.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/support/SupportActivity.kt
index adf050f..b3b55cc 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/support/SupportActivity.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/support/SupportActivity.kt
@@ -1,6 +1,6 @@
 @file:Suppress("DEPRECATION")
 
-package com.d4rk.englishwithlidia.plus.ui.support
+package com.d4rk.englishwithlidia.plus.ui.screens.support
 
 import android.os.Bundle
 import androidx.activity.compose.setContent
@@ -14,21 +14,20 @@ import androidx.compose.ui.Modifier
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingFlowParams
 import com.android.billingclient.api.SkuDetails
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style.AppTheme
+import com.d4rk.englishwithlidia.plus.ui.screens.settings.display.theme.style.AppTheme
 
 class SupportActivity : AppCompatActivity() {
-    private val viewModel: SupportViewModel by viewModels()
+    private val viewModel : SupportViewModel by viewModels()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    override fun onCreate(savedInstanceState : Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
         setContent {
             AppTheme {
                 Surface(
-                    modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background
+                    modifier = Modifier.fillMaxSize() , color = MaterialTheme.colorScheme.background
                 ) {
-                    SupportComposable(viewModel, this@SupportActivity)
+                    SupportComposable(viewModel , activity = this@SupportActivity)
                 }
             }
         }
@@ -37,9 +36,10 @@ class SupportActivity : AppCompatActivity() {
     fun initiatePurchase(
         sku : String , skuDetailsMap : Map<String , SkuDetails> , billingClient : BillingClient
     ) {
-        val skuDetails = skuDetailsMap[sku]
+        val skuDetails : SkuDetails? = skuDetailsMap[sku]
         if (skuDetails != null) {
-            val flowParams = BillingFlowParams.newBuilder().setSkuDetails(skuDetails).build()
+            val flowParams : BillingFlowParams =
+                    BillingFlowParams.newBuilder().setSkuDetails(skuDetails).build()
             billingClient.launchBillingFlow(this , flowParams)
         }
     }
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/support/SupportComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/support/SupportScreen.kt
similarity index 75%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/support/SupportComposable.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/support/SupportScreen.kt
index b93f0a9..889a8a2 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/support/SupportComposable.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/support/SupportScreen.kt
@@ -1,8 +1,10 @@
 @file:Suppress("DEPRECATION")
 
-package com.d4rk.englishwithlidia.plus.ui.support
+package com.d4rk.englishwithlidia.plus.ui.screens.support
 
 import android.content.Context
+import android.view.SoundEffectConstants
+import android.view.View
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -14,55 +16,40 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyRow
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.outlined.Paid
 import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
-import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.android.billingclient.api.BillingClient
 import com.android.billingclient.api.BillingClientStateListener
 import com.android.billingclient.api.BillingResult
 import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.ads.LargeBannerAdsComposable
+import com.d4rk.englishwithlidia.plus.ui.components.ads.LargeBannerAdsComposable
 import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
 import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.components.animations.bounceClick
+import com.d4rk.englishwithlidia.plus.ui.components.navigation.TopAppBarScaffoldWithBackButton
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
-    val context = LocalContext.current
-    val dataStore = DataStore.getInstance(context)
-    val billingClient = rememberBillingClient(context, viewModel)
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.support_us)) }, navigationIcon = {
-            IconButton(onClick = {
-                activity.finish()
-            }) {
-                Icon(
-                    Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null
-                )
-            }
-        }, scrollBehavior = scrollBehavior)
-    }) { paddingValues ->
+fun SupportComposable(viewModel: SupportViewModel , activity: SupportActivity) {
+    val context: Context = LocalContext.current
+    val view: View = LocalView.current
+    val dataStore: DataStore = DataStore.getInstance(context = context)
+    val billingClient: BillingClient = rememberBillingClient(context, viewModel)
+    TopAppBarScaffoldWithBackButton(
+        title = stringResource(id = R.string.support_us),
+        onBackClicked = { activity.finish() }) { paddingValues ->
         Box(
             modifier = Modifier
                 .padding(paddingValues)
@@ -71,7 +58,7 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
             LazyColumn {
                 item {
                     Text(
-                        text = stringResource(R.string.paid_support),
+                        text = stringResource(id = R.string.paid_support),
                         modifier = Modifier.padding(start = 16.dp, top = 16.dp),
                         style = MaterialTheme.typography.titleLarge,
                     )
@@ -84,7 +71,7 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                     ) {
                         Column {
                             Text(
-                                text = stringResource(R.string.summary_donations),
+                                text = stringResource(id = R.string.summary_donations),
                                 modifier = Modifier.padding(16.dp)
                             )
                             LazyRow(
@@ -99,8 +86,9 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                                             .fillMaxWidth()
                                             .bounceClick(),
                                         onClick = {
+                                            view.playSoundEffect(SoundEffectConstants.CLICK)
                                             activity.initiatePurchase(
-                                                "low_donation",
+                                                sku = "low_donation",
                                                 viewModel.skuDetails,
                                                 billingClient,
                                             )
@@ -112,7 +100,9 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                                             modifier = Modifier.size(ButtonDefaults.IconSize)
                                         )
                                         Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
-                                        Text(viewModel.skuDetails["low_donation"]?.price ?: "")
+                                        Text(
+                                            text = viewModel.skuDetails["low_donation"]?.price ?: ""
+                                        )
                                     }
                                 }
                                 item {
@@ -121,8 +111,9 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                                             .fillMaxWidth()
                                             .bounceClick(),
                                         onClick = {
+                                            view.playSoundEffect(SoundEffectConstants.CLICK)
                                             activity.initiatePurchase(
-                                                "normal_donation",
+                                                sku = "normal_donation",
                                                 viewModel.skuDetails,
                                                 billingClient,
                                             )
@@ -134,7 +125,10 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                                             modifier = Modifier.size(ButtonDefaults.IconSize)
                                         )
                                         Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
-                                        Text(viewModel.skuDetails["normal_donation"]?.price ?: "")
+                                        Text(
+                                            text = viewModel.skuDetails["normal_donation"]?.price
+                                                ?: ""
+                                        )
                                     }
                                 }
                             }
@@ -150,8 +144,9 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                                             .fillMaxWidth()
                                             .bounceClick(),
                                         onClick = {
+                                            view.playSoundEffect(SoundEffectConstants.CLICK)
                                             activity.initiatePurchase(
-                                                "high_donation",
+                                                sku = "high_donation",
                                                 viewModel.skuDetails,
                                                 billingClient,
                                             )
@@ -163,7 +158,10 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                                             modifier = Modifier.size(ButtonDefaults.IconSize)
                                         )
                                         Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
-                                        Text(viewModel.skuDetails["high_donation"]?.price ?: "")
+                                        Text(
+                                            text = viewModel.skuDetails["high_donation"]?.price
+                                                ?: ""
+                                        )
                                     }
                                 }
                                 item {
@@ -173,8 +171,9 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                                             .fillMaxWidth()
                                             .bounceClick(),
                                         onClick = {
+                                            view.playSoundEffect(SoundEffectConstants.CLICK)
                                             activity.initiatePurchase(
-                                                "extreme_donation",
+                                                sku = "extreme_donation",
                                                 viewModel.skuDetails,
                                                 billingClient,
                                             )
@@ -186,7 +185,10 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                                             modifier = Modifier.size(ButtonDefaults.IconSize)
                                         )
                                         Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
-                                        Text(viewModel.skuDetails["extreme_donation"]?.price ?: "")
+                                        Text(
+                                            text = viewModel.skuDetails["extreme_donation"]?.price
+                                                ?: ""
+                                        )
                                     }
                                 }
                             }
@@ -195,7 +197,7 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                 }
                 item {
                     Text(
-                        text = stringResource(R.string.non_paid_support),
+                        text = stringResource(id = R.string.non_paid_support),
                         modifier = Modifier.padding(start = 16.dp),
                         style = MaterialTheme.typography.titleLarge,
                     )
@@ -203,8 +205,9 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                 item {
                     FilledTonalButton(
                         onClick = {
+                            view.playSoundEffect(SoundEffectConstants.CLICK)
                             IntentUtils.openUrl(
-                                context, "https://direct-link.net/548212/agOqI7123501341"
+                                context, url = "https://direct-link.net/548212/agOqI7123501341"
                             )
                         },
                         modifier = Modifier
@@ -218,7 +221,7 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
                             modifier = Modifier.size(ButtonDefaults.IconSize)
                         )
                         Spacer(modifier = Modifier.size(ButtonDefaults.IconSpacing))
-                        Text(text = stringResource(R.string.web_ad))
+                        Text(text = stringResource(id = R.string.web_ad))
                     }
                 }
                 item {
@@ -233,14 +236,10 @@ fun SupportComposable(viewModel: SupportViewModel, activity: SupportActivity) {
 
 @Composable
 fun rememberBillingClient(
-    context: Context,
-    viewModel: SupportViewModel
+    context: Context, viewModel: SupportViewModel
 ): BillingClient {
-    val billingClient = remember {
-        BillingClient.newBuilder(context)
-            .setListener { _, _ -> }
-            .enablePendingPurchases()
-            .build()
+    val billingClient: BillingClient = remember {
+        BillingClient.newBuilder(context).setListener { _, _ -> }.enablePendingPurchases().build()
     }
 
     DisposableEffect(billingClient) {
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/support/SupportViewModel.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/support/SupportViewModel.kt
similarity index 81%
rename from app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/support/SupportViewModel.kt
rename to app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/support/SupportViewModel.kt
index b6b665b..b1f81c2 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/support/SupportViewModel.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/screens/support/SupportViewModel.kt
@@ -1,6 +1,6 @@
 @file:Suppress("DEPRECATION")
 
-package com.d4rk.englishwithlidia.plus.ui.support
+package com.d4rk.englishwithlidia.plus.ui.screens.support
 
 import androidx.compose.runtime.mutableStateMapOf
 import androidx.lifecycle.ViewModel
@@ -17,13 +17,11 @@ class SupportViewModel : ViewModel() {
 
     fun querySkuDetails(billingClient: BillingClient) {
         viewModelScope.launch(Dispatchers.IO) {
-            val skuList = listOf(
+            val skuList : List<String> = listOf(
                 "low_donation", "normal_donation", "high_donation", "extreme_donation"
             )
-            val params = SkuDetailsParams.newBuilder()
-                .setSkusList(skuList)
-                .setType(BillingClient.SkuType.INAPP)
-                .build()
+            val params : SkuDetailsParams = SkuDetailsParams.newBuilder().setSkusList(skuList)
+                    .setType(BillingClient.SkuType.INAPP).build()
 
             billingClient.querySkuDetailsAsync(params) { billingResult, skuDetailsList ->
                 if (billingResult.responseCode == BillingClient.BillingResponseCode.OK && skuDetailsList != null) {
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/SettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/SettingsComposable.kt
deleted file mode 100644
index e1da44c..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/SettingsComposable.kt
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.settings
-
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.outlined.Build
-import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material.icons.outlined.Notifications
-import androidx.compose.material.icons.outlined.Palette
-import androidx.compose.material.icons.outlined.SafetyCheck
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.ui.settings.about.AboutSettingsActivity
-import com.d4rk.englishwithlidia.plus.ui.settings.advanced.AdvancedSettingsActivity
-import com.d4rk.englishwithlidia.plus.ui.settings.display.DisplaySettingsActivity
-import com.d4rk.englishwithlidia.plus.ui.settings.privacy.PrivacySettingsActivity
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceItem
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun SettingsComposable(activity: SettingsActivity) {
-    val context = LocalContext.current
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.settings)) }, navigationIcon = {
-            IconButton(onClick = {
-                activity.finish()
-            }) {
-                Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
-            }
-        }, scrollBehavior = scrollBehavior)
-    }) { paddingValues ->
-        LazyColumn(
-            modifier = Modifier
-                .fillMaxHeight()
-                .padding(paddingValues),
-        ) {
-            item {
-                PreferenceItem(Icons.Outlined.Palette,
-                    title = stringResource(R.string.display),
-                    summary = stringResource(R.string.summary_preference_settings_display),
-                    onClick = {
-                        IntentUtils.openActivity(context, DisplaySettingsActivity::class.java)
-                    })
-            }
-            item {
-                PreferenceItem(Icons.Outlined.Notifications,
-                    title = stringResource(R.string.notifications),
-                    summary = stringResource(R.string.summary_preference_settings_notifications),
-                    onClick = {
-                        IntentUtils.openAppNotificationSettings(context)
-                    })
-            }
-            item {
-                PreferenceItem(Icons.Outlined.Build,
-                    title = stringResource(R.string.advanced),
-                    summary = stringResource(R.string.summary_preference_settings_advanced),
-                    onClick = {
-                        IntentUtils.openActivity(
-                            context, AdvancedSettingsActivity::class.java
-                        )
-                    })
-            }
-            item {
-                PreferenceItem(Icons.Outlined.SafetyCheck,
-                    title = stringResource(R.string.security_and_privacy),
-                    summary = stringResource(R.string.summary_preference_settings_privacy_and_security),
-                    onClick = {
-                        IntentUtils.openActivity(context, PrivacySettingsActivity::class.java)
-                    })
-            }
-            item {
-                PreferenceItem(Icons.Outlined.Info,
-                    title = stringResource(R.string.about),
-                    summary = stringResource(R.string.summary_preference_settings_about),
-                    onClick = {
-                        IntentUtils.openActivity(context, AboutSettingsActivity::class.java)
-                    })
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/about/AboutSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/about/AboutSettingsComposable.kt
deleted file mode 100644
index 93716dc..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/about/AboutSettingsComposable.kt
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.about
-
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
-import android.os.Build
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import com.d4rk.englishwithlidia.plus.BuildConfig
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceCategoryItem
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceItem
-import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AboutSettingsComposable(activity: AboutSettingsActivity) {
-    val context = LocalContext.current
-    val clipboardManager = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.about)) }, navigationIcon = {
-            IconButton(onClick = {
-                activity.finish()
-            }) {
-                Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
-            }
-        }, scrollBehavior = scrollBehavior)
-    }) { paddingValues ->
-        LazyColumn(
-            modifier = Modifier
-                .fillMaxHeight()
-                .padding(paddingValues),
-        ) {
-            item {
-                PreferenceCategoryItem(title = stringResource(R.string.app_info))
-                PreferenceItem(
-                    title = stringResource(R.string.app_name),
-                    summary = stringResource(R.string.copyright),
-                )
-                PreferenceItem(
-                    title = stringResource(R.string.app_build_version),
-                    summary = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})"
-                )
-                PreferenceItem(title = stringResource(com.google.android.gms.oss.licenses.R.string.oss_license_title),
-                    summary = stringResource(R.string.summary_preference_settings_oss),
-                    onClick = {
-                        IntentUtils.openActivity(context , OssLicensesMenuActivity::class.java)
-                    })
-            }
-            item {
-                PreferenceCategoryItem(title = stringResource(R.string.device_info))
-                val version = stringResource(
-                    id = R.string.app_build,
-                    "${stringResource(R.string.manufacturer)} ${Build.MANUFACTURER}",
-                    "${stringResource(R.string.device_model)} ${Build.MODEL}",
-                    "${stringResource(R.string.android_version)} ${Build.VERSION.RELEASE}",
-                    "${stringResource(R.string.api_level)} ${Build.VERSION.SDK_INT}",
-                    "${stringResource(R.string.arch)} ${Build.SUPPORTED_ABIS.joinToString()}"
-                )
-
-                PreferenceItem(title = stringResource(id = R.string.device_info),
-                    summary = version,
-                    onClick = {
-                        val clip = ClipData.newPlainText("text", version)
-                        clipboardManager.setPrimaryClip(clip)
-                        // Show snackbar
-                    })
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/advanced/AdvancedSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/advanced/AdvancedSettingsComposable.kt
deleted file mode 100644
index c3e6a0d..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/advanced/AdvancedSettingsComposable.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.advanced
-
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceCategoryItem
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceItem
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AdvancedSettingsComposable(activity: AdvancedSettingsActivity) {
-    val context = LocalContext.current
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.advanced)) }, navigationIcon = {
-            IconButton(onClick = {
-                activity.finish()
-            }) {
-                Icon(
-                    Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null
-                )
-            }
-        }, scrollBehavior = scrollBehavior)
-    }) { paddingValues ->
-        LazyColumn(
-            modifier = Modifier
-                .fillMaxHeight()
-                .padding(paddingValues),
-        ) {
-            item {
-                PreferenceCategoryItem(title = stringResource(R.string.error_reporting))
-                PreferenceItem(title = stringResource(R.string.bug_report),
-                    summary = stringResource(R.string.summary_preference_settings_bug_report),
-                    onClick = {
-                        IntentUtils.openUrl(
-                            context,
-                            "https://github.com/D4rK7355608/${context.packageName}/issues/new"
-                        )
-                    })
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/DisplaySettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/DisplaySettingsComposable.kt
deleted file mode 100644
index c77fa60..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/DisplaySettingsComposable.kt
+++ /dev/null
@@ -1,159 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.display
-
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.provider.Settings
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.core.os.LocaleListCompat
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
-import com.d4rk.englishwithlidia.plus.ui.dialogs.LanguageDialog
-import com.d4rk.englishwithlidia.plus.ui.settings.display.theme.ThemeSettingsActivity
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceCategoryItem
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceItem
-import com.d4rk.englishwithlidia.plus.utils.compose.components.SwitchPreferenceItem
-import com.d4rk.englishwithlidia.plus.utils.compose.components.SwitchPreferenceItemWithDivider
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun DisplaySettingsComposable(activity: DisplaySettingsActivity) {
-    val context = LocalContext.current
-    val dataStore = DataStore.getInstance(context)
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    var showLanguageDialog by remember { mutableStateOf(false) }
-    val themeMode = dataStore.themeMode.collectAsState(initial = "follow_system").value
-    val darkModeString = stringResource(R.string.dark_mode)
-    val lightModeString = stringResource(R.string.light_mode)
-    val themeSummary = when (themeMode) {
-        darkModeString, lightModeString -> stringResource(R.string.will_never_turn_on_automatically)
-        else -> stringResource(R.string.will_turn_on_automatically_by_system)
-    }
-    val switchState = remember { mutableStateOf(themeMode == darkModeString) }
-
-    val isDynamicColors = dataStore.dynamicColors.collectAsState(initial = true)
-    val scope = rememberCoroutineScope()
-
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.display)) }, navigationIcon = {
-            IconButton(onClick = {
-                activity.finish()
-            }) {
-                Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null)
-            }
-        }, scrollBehavior = scrollBehavior)
-    }) { paddingValues ->
-        LazyColumn(
-            modifier = Modifier
-                .fillMaxHeight()
-                .padding(paddingValues),
-        ) {
-            item {
-                PreferenceCategoryItem(title = stringResource(R.string.appearance))
-                SwitchPreferenceItemWithDivider(title = stringResource(R.string.dark_theme),
-                    summary = themeSummary,
-                    checked = switchState.value,
-                    onCheckedChange = { isChecked ->
-                        switchState.value = isChecked
-                    },
-                    onSwitchClick = { isChecked ->
-                        scope.launch(Dispatchers.IO) {
-                            if (isChecked) {
-                                dataStore.saveThemeMode(darkModeString)
-                                dataStore.themeModeState.value =
-                                    darkModeString
-                            } else {
-                                dataStore.saveThemeMode(lightModeString)
-                                dataStore.themeModeState.value =
-                                    lightModeString
-                            }
-                        }
-                    },
-                    onClick = {
-                        IntentUtils.openActivity(
-                            context, ThemeSettingsActivity::class.java
-                        )
-                    })
-
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-                    SwitchPreferenceItem(
-                        title = stringResource(R.string.dynamic_colors),
-                        summary = stringResource(R.string.summary_preference_settings_dynamic_colors),
-                        checked = isDynamicColors.value,
-                    ) { isChecked ->
-                        CoroutineScope(Dispatchers.IO).launch {
-                            dataStore.saveDynamicColors(isChecked)
-                        }
-                    }
-                }
-            }
-            item {
-                PreferenceCategoryItem(title = stringResource(R.string.language))
-                PreferenceItem(title = stringResource(R.string.language),
-                    summary = stringResource(id = R.string.summary_preference_settings_language),
-                    onClick = {
-                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-                            val localeIntent = Intent(Settings.ACTION_APP_LOCALE_SETTINGS).setData(
-                                Uri.fromParts("package", context.packageName, null)
-                            )
-                            val detailsIntent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).setData(
-                                Uri.fromParts("package", context.packageName, null)
-                            )
-                            when {
-                                context.packageManager.resolveActivity(
-                                    localeIntent, 0
-                                ) != null -> context.startActivity(localeIntent)
-
-                                context.packageManager.resolveActivity(
-                                    detailsIntent, 0
-                                ) != null -> context.startActivity(detailsIntent)
-
-                                else -> {
-                                    showLanguageDialog = true
-                                }
-                            }
-                        } else {
-                            showLanguageDialog = true
-                        }
-                    })
-                if (showLanguageDialog) {
-                    LanguageDialog(
-                        dataStore = dataStore,
-                        onDismiss = { showLanguageDialog = false },
-                        onLanguageSelected = { newLanguageCode ->
-                            AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(newLanguageCode))
-                        }
-                    )
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Color.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Color.kt
deleted file mode 100644
index 8f13c4a..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Color.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style
-
-import androidx.compose.ui.graphics.Color
-
-val primaryLight = Color(0xFF775A00)
-val onPrimaryLight = Color(0xFFFFFFFF)
-val primaryContainerLight = Color(0xFFFFC71D)
-val onPrimaryContainerLight = Color(0xFF4C3900)
-val secondaryLight = Color(0xFF725B1F)
-val onSecondaryLight = Color(0xFFFFFFFF)
-val secondaryContainerLight = Color(0xFFFFE19E)
-val onSecondaryContainerLight = Color(0xFF5B460A)
-val tertiaryLight = Color(0xFF526600)
-val onTertiaryLight = Color(0xFFFFFFFF)
-val tertiaryContainerLight = Color(0xFFBDDD50)
-val onTertiaryContainerLight = Color(0xFF344200)
-val errorLight = Color(0xFFBA1A1A)
-val onErrorLight = Color(0xFFFFFFFF)
-val errorContainerLight = Color(0xFFFFDAD6)
-val onErrorContainerLight = Color(0xFF410002)
-val backgroundLight = Color(0xFFFFF8F1)
-val onBackgroundLight = Color(0xFF201B11)
-val surfaceLight = Color(0xFFFFF8F1)
-val onSurfaceLight = Color(0xFF201B11)
-val surfaceVariantLight = Color(0xFFEFE1C6)
-val onSurfaceVariantLight = Color(0xFF4F4632)
-val outlineLight = Color(0xFF817660)
-val outlineVariantLight = Color(0xFFD3C5AB)
-val scrimLight = Color(0xFF000000)
-val inverseSurfaceLight = Color(0xFF353024)
-val inverseOnSurfaceLight = Color(0xFFFAEFDE)
-val inversePrimaryLight = Color(0xFFF6BF00)
-val surfaceDimLight = Color(0xFFE3D9C8)
-val surfaceBrightLight = Color(0xFFFFF8F1)
-val surfaceContainerLowestLight = Color(0xFFFFFFFF)
-val surfaceContainerLowLight = Color(0xFFFDF2E1)
-val surfaceContainerLight = Color(0xFFF7EDDB)
-val surfaceContainerHighLight = Color(0xFFF2E7D6)
-val surfaceContainerHighestLight = Color(0xFFECE1D0)
-
-val primaryDark = Color(0xFFFFEBC3)
-val onPrimaryDark = Color(0xFF3E2E00)
-val primaryContainerDark = Color(0xFFF2BB00)
-val onPrimaryContainerDark = Color(0xFF423100)
-val secondaryDark = Color(0xFFE2C37C)
-val onSecondaryDark = Color(0xFF3E2E00)
-val secondaryContainerDark = Color(0xFF4E3B00)
-val onSecondaryContainerDark = Color(0xFFEDCE86)
-val tertiaryDark = Color(0xFFD9FA6A)
-val onTertiaryDark = Color(0xFF293500)
-val tertiaryContainerDark = Color(0xFFAFCF44)
-val onTertiaryContainerDark = Color(0xFF2C3800)
-val errorDark = Color(0xFFFFB4AB)
-val onErrorDark = Color(0xFF690005)
-val errorContainerDark = Color(0xFF93000A)
-val onErrorContainerDark = Color(0xFFFFDAD6)
-val backgroundDark = Color(0xFF171309)
-val onBackgroundDark = Color(0xFFECE1D0)
-val surfaceDark = Color(0xFF171309)
-val onSurfaceDark = Color(0xFFECE1D0)
-val surfaceVariantDark = Color(0xFF4F4632)
-val onSurfaceVariantDark = Color(0xFFD3C5AB)
-val outlineDark = Color(0xFF9B8F78)
-val outlineVariantDark = Color(0xFF4F4632)
-val scrimDark = Color(0xFF000000)
-val inverseSurfaceDark = Color(0xFFECE1D0)
-val inverseOnSurfaceDark = Color(0xFF353024)
-val inversePrimaryDark = Color(0xFF775A00)
-val surfaceDimDark = Color(0xFF171309)
-val surfaceBrightDark = Color(0xFF3E392D)
-val surfaceContainerLowestDark = Color(0xFF120E05)
-val surfaceContainerLowDark = Color(0xFF201B11)
-val surfaceContainerDark = Color(0xFF241F14)
-val surfaceContainerHighDark = Color(0xFF2F291E)
-val surfaceContainerHighestDark = Color(0xFF3A3428)
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Type.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Type.kt
deleted file mode 100644
index f24c247..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/display/theme/style/Type.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.display.theme.style
-
-import androidx.compose.material3.Typography
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.font.FontFamily
-import androidx.compose.ui.text.font.FontStyle
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.unit.sp
-
-val Typography = Typography(
-    bodyLarge = TextStyle(
-        fontFamily = FontFamily.Default,
-        fontWeight = FontWeight.Normal,
-        fontSize = 16.sp,
-        lineHeight = 24.sp,
-        letterSpacing = 0.5.sp
-    )
-)
-
-fun String.annotatedStringHtmlParser(
-    boldTag: String = "<b>",
-    underlineTag: String = "<u>",
-    italicTag: String = "<i>",
-): AnnotatedString = buildAnnotatedString {
-    val pattern =
-        "(${Regex.escape(boldTag)}|${Regex.escape(underlineTag)}|${Regex.escape(italicTag)})(.*?)(\\1|$)".toRegex()
-    var lastIndex = 0
-    val text = this@annotatedStringHtmlParser.replace("\\n", "\n")
-
-    pattern.findAll(text).forEach { result ->
-        val (tag, content) = result.destructured
-        append(text.substring(lastIndex, result.range.first))
-
-        val start = length
-        append(content)
-        val end = length
-
-        when (tag) {
-            boldTag -> addStyle(SpanStyle(fontWeight = FontWeight.Bold), start, end)
-            underlineTag -> addStyle(
-                SpanStyle(textDecoration = TextDecoration.Underline),
-                start,
-                end
-            )
-
-            italicTag -> addStyle(SpanStyle(fontStyle = FontStyle.Italic), start, end)
-        }
-
-        lastIndex = result.range.last + 1
-        if (tag != italicTag && lastIndex < text.length && text[lastIndex] == '\n') {
-            lastIndex++
-        }
-    }
-
-    append(text.substring(lastIndex, text.length))
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/PrivacySettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/PrivacySettingsComposable.kt
deleted file mode 100644
index 53cab25..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/PrivacySettingsComposable.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.privacy
-
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.ui.settings.privacy.ads.AdsSettingsActivity
-import com.d4rk.englishwithlidia.plus.ui.settings.privacy.permissions.PermissionsSettingsActivity
-import com.d4rk.englishwithlidia.plus.ui.settings.privacy.usage.UsageAndDiagnosticsActivity
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceCategoryItem
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceItem
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun PrivacySettingsComposable(activity: PrivacySettingsActivity) {
-    val context = LocalContext.current
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.security_and_privacy)) },
-            navigationIcon = {
-                IconButton(onClick = {
-                    activity.finish()
-                }) {
-                    Icon(
-                        Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null
-                    )
-                }
-            },
-            scrollBehavior = scrollBehavior
-        )
-    }) { paddingValues ->
-        LazyColumn(
-            modifier = Modifier
-                    .fillMaxHeight()
-                    .padding(paddingValues),
-        ) {
-            item {
-                PreferenceCategoryItem(title = stringResource(R.string.privacy))
-                PreferenceItem(title = stringResource(R.string.privacy_policy),
-                    summary = stringResource(id = R.string.summary_preference_settings_privacy_policy),
-                    onClick = {
-                        IntentUtils.openUrl(
-                            context,
-                            "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy"
-                        )
-                    })
-                PreferenceItem(title = stringResource(R.string.terms_of_service),
-                    summary = stringResource(id = R.string.summary_preference_settings_terms_of_service),
-                    onClick = {
-                        IntentUtils.openUrl(
-                            context,
-                            "https://sites.google.com/view/d4rk7355608/more/apps/terms-of-service"
-                        )
-                    })
-                PreferenceItem(title = stringResource(R.string.code_of_conduct),
-                    summary = stringResource(id = R.string.summary_preference_settings_code_of_conduct),
-                    onClick = {
-                        IntentUtils.openUrl(
-                            context,
-                            "https://sites.google.com/view/d4rk7355608/more/code-of-conduct"
-                        )
-                    })
-                PreferenceItem(title = stringResource(R.string.permissions),
-                    summary = stringResource(id = R.string.summary_preference_settings_permissions),
-                    onClick = {
-                        IntentUtils.openActivity(
-                            context, PermissionsSettingsActivity::class.java
-                        )
-                    })
-                PreferenceItem(title = stringResource(R.string.ads),
-                    summary = stringResource(id = R.string.summary_preference_settings_ads),
-                    onClick = {
-                        IntentUtils.openActivity(
-                            context, AdsSettingsActivity::class.java
-                        )
-                    })
-                PreferenceItem(title = stringResource(R.string.usage_and_diagnostics),
-                    summary = stringResource(id = R.string.summary_preference_settings_usage_and_diagnostics),
-                    onClick = {
-                        IntentUtils.openActivity(
-                            context, UsageAndDiagnosticsActivity::class.java
-                        )
-                    })
-            }
-            item {
-                PreferenceCategoryItem(title = stringResource(R.string.legal))
-                PreferenceItem(title = stringResource(R.string.legal_notices),
-                    summary = stringResource(id = R.string.summary_preference_settings_legal_notices),
-                    onClick = {
-                        IntentUtils.openUrl(
-                            context,
-                            "https://sites.google.com/view/d4rk7355608/more/apps/legal-notices"
-                        )
-                    })
-                PreferenceItem(title = stringResource(R.string.license),
-                    summary = stringResource(R.string.summary_preference_settings_license),
-                    onClick = {
-                        IntentUtils.openUrl(context, "https://www.gnu.org/licenses/gpl-3.0")
-                    })
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/ads/AdsSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/ads/AdsSettingsComposable.kt
deleted file mode 100644
index a4b1192..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/ads/AdsSettingsComposable.kt
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.privacy.ads
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.text.withStyle
-import androidx.compose.ui.unit.dp
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceItem
-import com.d4rk.englishwithlidia.plus.utils.compose.components.SwitchCardComposable
-import com.google.android.ump.ConsentRequestParameters
-import com.google.android.ump.UserMessagingPlatform
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun AdsSettingsComposable(activity : AdsSettingsActivity) {
-    val context = LocalContext.current
-    val dataStore = DataStore.getInstance(context)
-    val switchState = dataStore.ads.collectAsState(initial = true)
-    val scope = rememberCoroutineScope()
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection) , topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.ads)) } , navigationIcon = {
-            IconButton(onClick = {
-                activity.finish()
-            }) {
-                Icon(
-                    Icons.AutoMirrored.Filled.ArrowBack , contentDescription = null
-                )
-            }
-        } , scrollBehavior = scrollBehavior)
-    }) { innerPadding ->
-        Box(modifier = Modifier.fillMaxSize()) {
-            LazyColumn(
-                modifier = Modifier
-                        .fillMaxSize()
-                        .padding(innerPadding) ,
-            ) {
-                item {
-                    SwitchCardComposable(
-                        title = stringResource(R.string.display_ads) , switchState = switchState
-                    ) { isChecked ->
-                        scope.launch(Dispatchers.IO) {
-                            dataStore.saveAds(isChecked)
-                        }
-                    }
-                }
-                item {
-                    Box(modifier = Modifier.padding(horizontal = 8.dp)) {
-                        PreferenceItem(title = stringResource(R.string.personalized_ads) ,
-                                       enabled = switchState.value ,
-                                       summary = stringResource(id = R.string.summary_ads_personalized_ads) ,
-                                       onClick = {
-                                           val params = ConsentRequestParameters.Builder()
-                                                   .setTagForUnderAgeOfConsent(false).build()
-                                           val consentInformation =
-                                                   UserMessagingPlatform.getConsentInformation(
-                                                       context
-                                                   )
-                                           consentInformation.requestConsentInfoUpdate(activity ,
-                                                                                       params ,
-                                                                                       {
-                                                                                           activity.openForm()
-                                                                                       } ,
-                                                                                       {})
-                                       })
-                    }
-                }
-                item {
-                    Column(
-                        modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(24.dp)
-                    ) {
-                        Icon(imageVector = Icons.Outlined.Info , contentDescription = null)
-                        Spacer(modifier = Modifier.height(24.dp))
-                        Text(stringResource(R.string.summary_ads))
-                        val annotatedString = buildAnnotatedString {
-                            withStyle(
-                                style = SpanStyle(
-                                    color = MaterialTheme.colorScheme.primary ,
-                                    textDecoration = TextDecoration.Underline
-                                )
-                            ) {
-                                append(stringResource(R.string.learn_more))
-                            }
-                            addStringAnnotation(
-                                tag = "URL" ,
-                                annotation = "https://sites.google.com/view/d4rk7355608/more/apps/ads-help-center" ,
-                                start = 0 ,
-                                end = stringResource(R.string.learn_more).length
-                            )
-                        }
-                        ClickableText(text = annotatedString , onClick = { offset ->
-                            annotatedString.getStringAnnotations("URL" , offset , offset)
-                                    .firstOrNull()?.let { annotation ->
-                                        IntentUtils.openUrl(context , annotation.item)
-                                    }
-                        })
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/permissions/PermissionsSettingsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/permissions/PermissionsSettingsComposable.kt
deleted file mode 100644
index c4f7edc..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/permissions/PermissionsSettingsComposable.kt
+++ /dev/null
@@ -1,85 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.privacy.permissions
-
-import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.res.stringResource
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceCategoryItem
-import com.d4rk.englishwithlidia.plus.utils.compose.components.PreferenceItem
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun PermissionsSettingsComposable(activity: PermissionsSettingsActivity) {
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.permissions)) }, navigationIcon = {
-            IconButton(onClick = {
-                activity.finish()
-            }) {
-                Icon(
-                    Icons.AutoMirrored.Filled.ArrowBack, contentDescription = null
-                )
-            }
-        }, scrollBehavior = scrollBehavior
-        )
-    }) { paddingValues ->
-        LazyColumn(
-            modifier = Modifier
-                .fillMaxHeight()
-                .padding(paddingValues),
-        ) {
-            item {
-                PreferenceCategoryItem(title = stringResource(R.string.normal))
-                PreferenceItem(
-                    title = stringResource(R.string.ad_id),
-                    summary = stringResource(R.string.summary_preference_permissions_ad_id),
-                )
-                PreferenceItem(
-                    title = stringResource(R.string.internet),
-                    summary = stringResource(R.string.summary_preference_permissions_internet),
-                )
-                PreferenceItem(
-                    title = stringResource(R.string.post_notifications),
-                    summary = stringResource(R.string.summary_preference_permissions_post_notifications),
-                )
-            }
-            item {
-                PreferenceCategoryItem(title = stringResource(R.string.runtime))
-                PreferenceItem(
-                    title = stringResource(R.string.access_network_state),
-                    summary = stringResource(R.string.summary_preference_permissions_access_network_state),
-                )
-                PreferenceItem(
-                    title = stringResource(R.string.access_notification_policy),
-                    summary = stringResource(R.string.summary_preference_permissions_access_notification_policy),
-                )
-                PreferenceItem(
-                    title = stringResource(R.string.billing),
-                    summary = stringResource(R.string.summary_preference_permissions_billing),
-                )
-                PreferenceItem(
-                    title = stringResource(R.string.check_license),
-                    summary = stringResource(R.string.summary_preference_permissions_check_license),
-                )
-                PreferenceItem(
-                    title = stringResource(R.string.foreground_service),
-                    summary = stringResource(R.string.summary_preference_permissions_foreground_service),
-                )
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/usage/UsageAndDiagnosticsComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/usage/UsageAndDiagnosticsComposable.kt
deleted file mode 100644
index 62e7fc4..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/settings/privacy/usage/UsageAndDiagnosticsComposable.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.settings.privacy.usage
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
-import androidx.compose.runtime.rememberCoroutineScope
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.text.withStyle
-import androidx.compose.ui.unit.dp
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.data.datastore.DataStore
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.components.SwitchCardComposable
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun UsageAndDiagnosticsComposable(activity : UsageAndDiagnosticsActivity) {
-    val context = LocalContext.current
-    val dataStore = DataStore.getInstance(context)
-    val switchState = dataStore.usageAndDiagnostics.collectAsState(initial = true)
-    val scope = rememberCoroutineScope()
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection) , topBar = {
-        LargeTopAppBar(title = { Text(stringResource(R.string.usage_and_diagnostics)) } ,
-                       navigationIcon = {
-                           IconButton(onClick = {
-                               activity.finish()
-                           }) {
-                               Icon(
-                                   Icons.AutoMirrored.Filled.ArrowBack , contentDescription = null
-                               )
-                           }
-                       } ,
-                       scrollBehavior = scrollBehavior
-        )
-    }) { innerPadding ->
-        Box(modifier = Modifier.fillMaxSize()) {
-            LazyColumn(
-                modifier = Modifier
-                        .fillMaxSize()
-                        .padding(innerPadding) ,
-            ) {
-                item {
-                    SwitchCardComposable(
-                        title = stringResource(R.string.usage_and_diagnostics) ,
-                        switchState = switchState
-                    ) { isChecked ->
-                        scope.launch(Dispatchers.IO) {
-                            dataStore.saveUsageAndDiagnostics(isChecked)
-                        }
-                    }
-                }
-                item {
-                    Column(
-                        modifier = Modifier
-                                .fillMaxWidth()
-                                .padding(24.dp)
-                    ) {
-                        Icon(imageVector = Icons.Outlined.Info , contentDescription = null)
-                        Spacer(modifier = Modifier.height(24.dp))
-                        Text(stringResource(R.string.summary_usage_and_diagnostics))
-                        val annotatedString = buildAnnotatedString {
-                            withStyle(
-                                style = SpanStyle(
-                                    color = MaterialTheme.colorScheme.primary ,
-                                    textDecoration = TextDecoration.Underline
-                                )
-                            ) {
-                                append(stringResource(R.string.learn_more))
-                            }
-                            addStringAnnotation(
-                                tag = "URL" ,
-                                annotation = "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy" ,
-                                start = 0 ,
-                                end = stringResource(R.string.learn_more).length
-                            )
-                        }
-                        ClickableText(text = annotatedString , onClick = { offset ->
-                            annotatedString.getStringAnnotations("URL" , offset , offset)
-                                    .firstOrNull()?.let { annotation ->
-                                        IntentUtils.openUrl(context , annotation.item)
-                                    }
-                        })
-                    }
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/startup/StartupComposable.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/startup/StartupComposable.kt
deleted file mode 100644
index 46adc7b..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/startup/StartupComposable.kt
+++ /dev/null
@@ -1,138 +0,0 @@
-package com.d4rk.englishwithlidia.plus.ui.startup
-
-import android.app.Activity
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawingPadding
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.text.ClickableText
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.CheckCircle
-import androidx.compose.material.icons.outlined.Info
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.ExtendedFloatingActionButton
-import androidx.compose.material3.FloatingActionButtonDefaults
-import androidx.compose.material3.Icon
-import androidx.compose.material3.LargeTopAppBar
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Scaffold
-import androidx.compose.material3.Text
-import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.rememberTopAppBarState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color.Companion.Gray
-import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.SpanStyle
-import androidx.compose.ui.text.buildAnnotatedString
-import androidx.compose.ui.text.style.TextDecoration
-import androidx.compose.ui.text.withStyle
-import androidx.compose.ui.unit.dp
-import com.d4rk.englishwithlidia.plus.MainActivity
-import com.d4rk.englishwithlidia.plus.R
-import com.d4rk.englishwithlidia.plus.utils.IntentUtils
-import com.d4rk.englishwithlidia.plus.utils.PermissionsUtils
-import com.d4rk.englishwithlidia.plus.utils.compose.bounceClick
-
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun StartupComposable(activity: StartupActivity) {
-    val context = LocalContext.current
-    val scrollBehavior = TopAppBarDefaults.enterAlwaysScrollBehavior(rememberTopAppBarState())
-    val fabEnabled = remember { mutableStateOf(false) }
-    LaunchedEffect(context) {
-        if (!PermissionsUtils.hasNotificationPermission(context)) {
-            PermissionsUtils.requestNotificationPermission(context as Activity)
-        }
-        activity.consentFormShown.collect { shown ->
-            fabEnabled.value = shown
-        }
-    }
-
-    Scaffold(modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), topBar = {
-        LargeTopAppBar(
-            title = { Text(stringResource(R.string.welcome)) },
-            scrollBehavior = scrollBehavior
-        )
-    }) { innerPadding ->
-        Box(
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(24.dp)
-                .safeDrawingPadding()
-        ) {
-            LazyColumn(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .padding(innerPadding),
-            ) {
-                item {
-                    Image(
-                        painter = painterResource(id = R.drawable.il_startup),
-                        contentDescription = null
-                    )
-                    Icon(
-                        Icons.Outlined.Info, contentDescription = null
-                    )
-                }
-                item {
-                    Text(
-                        text = stringResource(R.string.summary_browse_terms_of_service_and_privacy_policy),
-                        modifier = Modifier.padding(top = 24.dp, bottom = 24.dp)
-                    )
-                    val annotatedString = buildAnnotatedString {
-                        withStyle(
-                            style = SpanStyle(
-                                color = MaterialTheme.colorScheme.primary,
-                                textDecoration = TextDecoration.Underline
-                            )
-                        ) {
-                            append(stringResource(R.string.browse_terms_of_service_and_privacy_policy))
-                        }
-                        addStringAnnotation(
-                            tag = "URL",
-                            annotation = "https://sites.google.com/view/d4rk7355608/more/apps/privacy-policy",
-                            start = 0,
-                            end = stringResource(R.string.browse_terms_of_service_and_privacy_policy).length
-                        )
-                    }
-                    ClickableText(text = annotatedString, onClick = { offset ->
-                        annotatedString.getStringAnnotations("URL", offset, offset).firstOrNull()
-                            ?.let { annotation ->
-                                IntentUtils.openUrl(context, annotation.item)
-                            }
-                    })
-                }
-            }
-            ExtendedFloatingActionButton(modifier = Modifier
-                .align(Alignment.BottomEnd)
-                .bounceClick(),
-                containerColor = if (fabEnabled.value) {
-                    FloatingActionButtonDefaults.containerColor
-                } else {
-                    Gray
-                },
-                text = { Text(stringResource(R.string.agree)) },
-                onClick = {
-                    IntentUtils.openActivity(
-                        context , MainActivity::class.java
-                    )
-                },
-                icon = {
-                    Icon(
-                        Icons.Outlined.CheckCircle,
-                        contentDescription = null
-                    )
-                })
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/viewmodel/BaseViewModel.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/viewmodel/BaseViewModel.kt
new file mode 100644
index 0000000..92cdb75
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/ui/viewmodel/BaseViewModel.kt
@@ -0,0 +1,90 @@
+package com.d4rk.englishwithlidia.plus.ui.viewmodel
+
+import android.app.Application
+import android.content.ActivityNotFoundException
+import android.util.Log
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.constants.error.ErrorType
+import com.d4rk.englishwithlidia.plus.data.model.ui.error.UiErrorModel
+import com.d4rk.englishwithlidia.plus.utils.error.ErrorHandler
+import kotlinx.coroutines.CoroutineExceptionHandler
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.launch
+import java.io.IOException
+
+open class BaseViewModel(application : Application) : AndroidViewModel(application) {
+    private val _isLoading = MutableStateFlow(value = false)
+    val isLoading : StateFlow<Boolean> = _isLoading
+
+    private val _uiErrorModel = MutableStateFlow(UiErrorModel())
+    val uiErrorModel : StateFlow<UiErrorModel> = _uiErrorModel.asStateFlow()
+
+    protected val coroutineExceptionHandler =
+            CoroutineExceptionHandler { _ , exception : Throwable ->
+                Log.e("BaseViewModel" , "Coroutine Exception: " , exception)
+                handleError(exception)
+            }
+
+    val _visibilityStates = MutableStateFlow<List<Boolean>>(emptyList())
+    val visibilityStates : StateFlow<List<Boolean>> = _visibilityStates.asStateFlow()
+
+    private val _isFabVisible = MutableStateFlow(value = false)
+    val isFabVisible : StateFlow<Boolean> = _isFabVisible.asStateFlow()
+
+    private fun handleError(exception : Throwable) {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            val errorType : ErrorType = when (exception) {
+                is SecurityException -> ErrorType.SECURITY_EXCEPTION
+                is IOException -> ErrorType.IO_EXCEPTION
+                is ActivityNotFoundException -> ErrorType.ACTIVITY_NOT_FOUND
+                is IllegalArgumentException -> ErrorType.ILLEGAL_ARGUMENT
+                else -> ErrorType.UNKNOWN_ERROR
+            }
+            handleError(errorType , exception)
+
+            _uiErrorModel.value = UiErrorModel(
+                showErrorDialog = true , errorMessage = when (errorType) {
+                    ErrorType.SECURITY_EXCEPTION -> getApplication<Application>().getString(R.string.security_error)
+                    ErrorType.IO_EXCEPTION -> getApplication<Application>().getString(R.string.io_error)
+                    ErrorType.ACTIVITY_NOT_FOUND -> getApplication<Application>().getString(R.string.activity_not_found)
+                    ErrorType.ILLEGAL_ARGUMENT -> getApplication<Application>().getString(R.string.illegal_argument_error)
+                    ErrorType.UNKNOWN_ERROR -> getApplication<Application>().getString(R.string.unknown_error)
+                }
+            )
+        }
+    }
+
+    fun dismissErrorDialog() {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            _uiErrorModel.value = UiErrorModel(showErrorDialog = false)
+        }
+    }
+
+    protected open fun handleError(errorType : ErrorType , ignoredException : Throwable) {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            ErrorHandler.handleError(getApplication() , errorType)
+        }
+    }
+
+    protected fun showLoading() {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            _isLoading.value = true
+        }
+    }
+
+    protected fun hideLoading() {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            _isLoading.value = false
+        }
+    }
+
+    protected fun showFab() {
+        viewModelScope.launch(coroutineExceptionHandler) {
+            _isFabVisible.value = true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/ClipboardUtil.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/ClipboardUtil.kt
new file mode 100644
index 0000000..3dabc2b
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/ClipboardUtil.kt
@@ -0,0 +1,20 @@
+package com.d4rk.englishwithlidia.plus.utils
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Build
+
+object ClipboardUtil {
+    fun copyTextToClipboard(
+        context : Context , label : String , text : String , onShowSnackbar : () -> Unit = {}
+    ) {
+        val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clip = ClipData.newPlainText(label , text)
+        clipboard.setPrimaryClip(clip)
+
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S_V2) {
+            onShowSnackbar()
+        }
+    }
+}
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/IntentUtils.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/IntentUtils.kt
index 8b749ee..c342cc4 100644
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/IntentUtils.kt
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/IntentUtils.kt
@@ -4,7 +4,9 @@ import android.content.Context
 import android.content.Intent
 import android.net.Uri
 import android.provider.Settings
+import com.d4rk.englishwithlidia.plus.BuildConfig
 import com.d4rk.englishwithlidia.plus.R
+import com.mikepenz.aboutlibraries.LibsBuilder
 
 /**
  * A utility object for performing common operations such as opening URLs, activities, and app notification settings.
@@ -114,4 +116,40 @@ object IntentUtils {
             )
         )
     }
+
+    fun openLicensesScreen(
+        context : Context ,
+        eulaHtmlString : String? ,
+        changelogHtmlString : String?
+    ) {
+        LibsBuilder().withActivityTitle(
+            activityTitle = context.getString(R.string.oss_license_title)
+        ).withEdgeToEdge(asEdgeToEdge = true).withShowLoadingProgress(showLoadingProgress = true)
+                .withSearchEnabled(searchEnabled = true).withAboutIconShown(aboutShowIcon = true)
+                .withAboutAppName(
+                    aboutAppName = context.getString(R.string.app_name)
+                ).withVersionShown(showVersion = true)
+                .withAboutVersionString(aboutVersionString = "${BuildConfig.VERSION_NAME} (${BuildConfig.VERSION_CODE})")
+
+                .withLicenseShown(showLicense = true).withAboutVersionShown(aboutShowVersion = true)
+                .withAboutVersionShownName(aboutShowVersion = true)
+                .withAboutVersionShownCode(aboutShowVersion = true)
+
+                .withAboutSpecial1(
+                    aboutAppSpecial1 = context.getString(
+                        R.string.eula_title
+                    )
+                ).withAboutSpecial1Description(
+                    aboutAppSpecial1Description = eulaHtmlString
+                        ?: context.getString(R.string.loading_eula)
+                ).withAboutSpecial2(
+                    aboutAppSpecial2 = context.getString(R.string.changelog)
+                ).withAboutSpecial2Description(
+                    aboutAppSpecial2Description = changelogHtmlString
+                        ?: context.getString(R.string.loading_changelog)
+                )
+
+                .withAboutDescription(context.getString(R.string.app_short_description))
+                .activity(context)
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/OpenSourceLicensesUtils.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/OpenSourceLicensesUtils.kt
new file mode 100644
index 0000000..01c0d20
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/OpenSourceLicensesUtils.kt
@@ -0,0 +1,103 @@
+package com.d4rk.englishwithlidia.plus.utils
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import com.d4rk.englishwithlidia.plus.BuildConfig
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.utils.helpers.getStringResource
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import org.commonmark.parser.Parser
+import org.commonmark.renderer.html.HtmlRenderer
+import java.io.BufferedReader
+import java.io.InputStreamReader
+import java.net.HttpURLConnection
+import java.net.URL
+
+object OpenSourceLicensesUtils {
+    private const val PACKAGE_NAME = BuildConfig.APPLICATION_ID
+
+    private suspend fun getChangelogMarkdown() : String {
+        return withContext(Dispatchers.IO) {
+            val url =
+                    URL("https://raw.githubusercontent.com/D4rK7355608/$PACKAGE_NAME/refs/heads/master/CHANGELOG.md")
+            (url.openConnection() as? HttpURLConnection)?.let { connection ->
+                try {
+                    connection.requestMethod = "GET"
+                    if (connection.responseCode == HttpURLConnection.HTTP_OK) {
+                        BufferedReader(InputStreamReader(connection.inputStream)).use { reader ->
+                            return@withContext reader.readText()
+                        }
+                    }
+                    else {
+                        getStringResource(id = R.string.error_loading_changelog)
+                    }
+                } finally {
+                    connection.disconnect()
+                }
+            } ?: getStringResource(id = R.string.error_loading_changelog)
+        }
+    }
+
+    private suspend fun getEulaMarkdown() : String {
+        return withContext(Dispatchers.IO) {
+            val url =
+                    URL("https://raw.githubusercontent.com/D4rK7355608/$PACKAGE_NAME/refs/heads/master/EULA.md")
+            (url.openConnection() as? HttpURLConnection)?.let { connection ->
+                try {
+                    connection.requestMethod = "GET"
+                    if (connection.responseCode == HttpURLConnection.HTTP_OK) {
+                        BufferedReader(InputStreamReader(connection.inputStream)).use { reader ->
+                            return@withContext reader.readText()
+                        }
+                    }
+                    else {
+                        getStringResource(id = R.string.error_loading_eula)
+                    }
+                } finally {
+                    connection.disconnect()
+                }
+            } ?: getStringResource(id = R.string.error_loading_eula)
+        }
+    }
+
+    private fun extractLatestVersionChangelog(markdown : String) : String {
+        val currentVersion = BuildConfig.VERSION_NAME
+        val regex = Regex(pattern = "(# Version\\s+$currentVersion:\\s*[\\s\\S]*?)(?=# Version|$)")
+        val match = regex.find(markdown)
+        return match?.groups?.get(1)?.value?.trim()
+            ?: "No changelog available for version $currentVersion"
+    }
+
+    private fun convertMarkdownToHtml(markdown : String) : String {
+        val parser = Parser.builder().build()
+        val renderer = HtmlRenderer.builder().build()
+        val document = parser.parse(markdown)
+        return renderer.render(document)
+    }
+
+    suspend fun loadHtmlData() : Pair<String? , String?> {
+        val changelogMarkdown = getChangelogMarkdown()
+        val extractedChangelog = extractLatestVersionChangelog(changelogMarkdown)
+        val changelogHtml = convertMarkdownToHtml(extractedChangelog)
+
+        val eulaMarkdown = getEulaMarkdown()
+        val eulaHtml = convertMarkdownToHtml(eulaMarkdown)
+
+        return changelogHtml to eulaHtml
+    }
+}
+
+@Composable
+fun rememberHtmlData() : State<Pair<String? , String?>> {
+    val htmlDataState = remember { mutableStateOf<Pair<String? , String?>>(value = null to null) }
+
+    LaunchedEffect(Unit) {
+        htmlDataState.value = OpenSourceLicensesUtils.loadHtmlData()
+    }
+
+    return htmlDataState
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/compose/AnimationUtils.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/compose/AnimationUtils.kt
deleted file mode 100644
index ae96c35..0000000
--- a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/compose/AnimationUtils.kt
+++ /dev/null
@@ -1,47 +0,0 @@
-package com.d4rk.englishwithlidia.plus.utils.compose
-
-import android.annotation.SuppressLint
-import androidx.compose.animation.core.animateFloatAsState
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.gestures.awaitFirstDown
-import androidx.compose.foundation.gestures.waitForUpOrCancellation
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.composed
-import androidx.compose.ui.graphics.graphicsLayer
-import androidx.compose.ui.input.pointer.pointerInput
-import com.d4rk.englishwithlidia.plus.data.model.ui.button.ButtonState
-
-@SuppressLint("ReturnFromAwaitPointerEventScope")
-@Composable
-fun Modifier.bounceClick() = composed {
-    var buttonState by remember { mutableStateOf(ButtonState.Idle) }
-    val scale by animateFloatAsState(
-        if (buttonState == ButtonState.Pressed) 0.95f else 1f , label = ""
-    )
-    this
-        .graphicsLayer {
-            scaleX = scale
-            scaleY = scale
-        }
-        .clickable(interactionSource = remember { MutableInteractionSource() } ,
-            indication = null ,
-            onClick = { })
-        .pointerInput(buttonState) {
-            awaitPointerEventScope {
-                buttonState = if (buttonState == ButtonState.Pressed) {
-                    waitForUpOrCancellation()
-                    ButtonState.Idle
-                }
-                else {
-                    awaitFirstDown(false)
-                    ButtonState.Pressed
-                }
-            }
-        }
-}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/error/ErrorHandler.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/error/ErrorHandler.kt
new file mode 100644
index 0000000..135443e
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/error/ErrorHandler.kt
@@ -0,0 +1,27 @@
+package com.d4rk.englishwithlidia.plus.utils.error
+
+import android.app.Activity
+import android.content.Context
+import com.d4rk.englishwithlidia.plus.R
+import com.d4rk.englishwithlidia.plus.constants.error.ErrorType
+import com.google.android.material.snackbar.Snackbar
+
+object ErrorHandler {
+    fun handleError(applicationContext : Context , errorType : ErrorType) {
+        val message : String = when (errorType) {
+            ErrorType.SECURITY_EXCEPTION -> applicationContext.getString(R.string.security_error)
+            ErrorType.IO_EXCEPTION -> applicationContext.getString(R.string.io_error)
+            ErrorType.ACTIVITY_NOT_FOUND -> applicationContext.getString(R.string.activity_not_found)
+            ErrorType.ILLEGAL_ARGUMENT -> applicationContext.getString(R.string.illegal_argument_error)
+            else -> applicationContext.getString(R.string.unknown_error)
+        }
+
+        (applicationContext as? Activity)?.let { activity ->
+            activity.runOnUiThread {
+                Snackbar.make(
+                    activity.findViewById(android.R.id.content) , message , Snackbar.LENGTH_SHORT
+                ).show()
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/helpers/StringsHelper.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/helpers/StringsHelper.kt
new file mode 100644
index 0000000..e18f101
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/helpers/StringsHelper.kt
@@ -0,0 +1,8 @@
+package com.d4rk.englishwithlidia.plus.utils.helpers
+
+import androidx.annotation.StringRes
+import com.d4rk.englishwithlidia.plus.data.core.AppCoreManager
+
+fun getStringResource(@StringRes id : Int) : String {
+    return AppCoreManager.instance.getString(id)
+}
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/interfaces/OnShowAdCompleteListener.kt b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/interfaces/OnShowAdCompleteListener.kt
new file mode 100644
index 0000000..3a32790
--- /dev/null
+++ b/app/src/main/kotlin/com/d4rk/englishwithlidia/plus/utils/interfaces/OnShowAdCompleteListener.kt
@@ -0,0 +1,6 @@
+package com.d4rk.englishwithlidia.plus.utils.interfaces
+
+interface OnShowAdCompleteListener {
+    @Suppress("EmptyMethod")
+    fun onShowAdComplete()
+}
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi/ic_launcher.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
diff --git a/app/src/main/res/mipmap-anydpi/ic_shortcut_lessons.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_lessons.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi/ic_shortcut_lessons.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_shortcut_lessons.xml
diff --git a/app/src/main/res/mipmap-anydpi/ic_shortcut_settings.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_settings.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi/ic_shortcut_settings.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_shortcut_settings.xml
diff --git a/app/src/main/res/mipmap-anydpi/ic_shortcut_website.xml b/app/src/main/res/mipmap-anydpi-v26/ic_shortcut_website.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi/ic_shortcut_website.xml
rename to app/src/main/res/mipmap-anydpi-v26/ic_shortcut_website.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..b9e4f176c40bbadc446329147d04e1dedd0593ca
GIT binary patch
literal 4362
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
E0K()^*#H0l

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..4f4da38bcda4ccd5494a266d2c1afeb7d2eac5b8
GIT binary patch
literal 2758
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
Mx~pbZt?D-P0n7STsQ>@~

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..7271aee986101f329d898e001aad7b605686c31e
GIT binary patch
literal 6096
zcmV;>7cb~iNk&G<7XScPMM6+kP&iDy7XSb+U%(d-O)zZRHWFk9xyQc!2ks3K(f<hm
zXkm93yPPwFZM<_nb?mS+cYy%kRD~oVu>}2#Bt(LUZlV4?_e_!y`{1nYdv<~Lvlnh-
z+g6noeKaO^Dd0!+UxvHG9b$Lrz-?^XO0{u^(|<@gL|TCR_ecZBjU*{j8nBoPHtaF@
zZ_TRIIur2G{|NwpUB4XKPH|}aYWlYuDg*%h$EXkhFti<G93F2u{S!yx$e3=7%eMf4
z{pS8?00EFV95aAt|H}HWqMsyAHZ0#7+74Zx=uKBTUv#A_)f9*R`cz`4jh=L+Yx`E<
z<t4Aqk#d)Gs&v}xWxetSfB>N7)rZ<p(6)`_@Q1y78AQYc_*%6ps?Z^J=B8&(tn-qx
zZCi@u<~6gJWoBj`Gqe2xo-vQuW6zkGnWoG*5;HSHGgL2UzKD!U(e!GS*$ykr(BZJs
zAeLge%urqqBuP%27KEAp|3c<Svh7BaZB^;-7U7by{{>M$!Yy<8sGMut4oSMZzrxtI
zZQHYUWZN4#+8@BkPIn{Qw#K$?Rh2`@w&Cc8N3LZav70ZjZ*70uxY6$iu&GV)WL>uR
z-rE(_%ih0o3B9?;nyM~}Ab@i`A~m^#FGbYYE6F}K(`L1Ovi7)-ot!z7^-es=wyoNB
zZCg2)*2kDEW@c6ZWD1MIvMEBmw`-eRdv70ui<x=v1!JyWiznN*RY|gKtF=Cb)R~!?
znK9}i4|xtem!1Mr3vXs-R1lFRvxfsoQsZVF5T$cLHd4Mon6QX^Jc}oQFhYJl3-j<^
zVquIy_y#k7Fdl^2`<IF9N^Cjd<pdPsU4Ux|0eOH{fNr3vk)9N7bu`sbHI;vR^Ow*~
zV$6KOxK~M8kD@AaD@ak%DaB+BU+3~}9543dJE0N!JoY)~UL|!yR&`*pL=lTXXvp|R
znr3ltG<R>H(*u6q`3Pw^Te`DJu8LMtuLIF1V!n)j!O!`5l8<v^INXy%tgd9dMg$L*
zQ!|4TIlTdAh`A(*-Q%1a$<Ce}j!(%3I>vK)Q!ZrUh4-EiZ&0`uC!ttZR!bq0sNwq{
zP7xw#+;JM$n}tLKfINt`E`D?_&OBctwH-O>)t6Ol2_LVB%kkcIA+DTwXdSx%vhT+f
z=zTeXfK^l}HH0*DDfK0zq02x?YA78y6sH#j;fHdqe&;=W3@E}ajeP67j0x8vL(db&
z-NukV>uq;zcAC+9v!^sQsO$V`9Ksi24Or${fw#igSFf=K=j$7*U9q;VJ@lh1G%?_O
zM)8Hp&juKykDZnCMOepx6ejQ#hzPK#C8VK-WnC{}LrpMhbsA|@-B?CXrCy;*kfV>E
zmh=Co>m`h4#^vd)6``Sx%kZkb1W_3G`8fn(DA9@srjqOpQs8_e<Aebi)i47z(j!l=
z1(%A}b*bXAgo`J!nvnIml8vS|%INLhJ8L(J!SMhE&NtHoqt2RYngDB~(r5YAE^UQ#
zdPb^@7B$+x)7fS{SBnu|TwT|;M6sFq$!3hB`K8M9ogwtmlmU65<>>(pT$I!0RcXN|
zy6gZs2@-p~159?S@_c$my66F*5zVho)L@c>_)*P&Sa4dBW%a+LM(*8P(X~WR6ZBFP
zFg6RNs*<h2g>c?hmkN~<{BsaLl#DTiHj|IMoyyX+^bw6Uqp44*sRb9{w6>_i1hvif
zd=tYQuz?g%vW^#Q18ZwRQy)`bGg^j-=ra6}4FVNLqbDe6CB!mh*(R)I0<`UNcny}d
zt`ww(2#SB8_I39$!-Orbdh4K2Hw6e{fUuI_oAvV=!qe#a+QSiIPmXXE^1N>xlaD*F
z9G3Ckn*66_h@l}w{GJp5VKk%yOsoPJ0@#%(iCjz><rk2j_11uOs`<Guud~s0Nr*md
zlYLhp)7l#wVI`cVRZ@pUl-`b*XZq?B`Hm3Ubb>W5mJ*jb_yieJ6h?A~n2T})Y|b93
z9=Slhd<{?AcO!_C#DrQ5X9{ouu%9Sl5r8uqY(Y$XCH!~#I`wq!z~yMspM9`eq@%bp
zoGTlliW|^Y0Aua|ET9-X!3>1Rumclg_0*FUdEG823bHIEkBs0-luH;_@nZ{iLxWkW
zpY)0f4So7lgHZwiO!{Ia9Y=J3duo~Q0QtVci@J<WqdG&X+F_DiGea2@F-08Cu&4mZ
zutCq*^QBQTY>Ktuj)Vh}VFbeg?fu_iw!e>Twn0zJ8D@QrDXUnopG0)J>-k@fD@RKo
zQQtCFYE|kIE)>{tw~xgh(q@$Oy}|7}Ng}a+toCI?tL<_|Z7FE&L%6QxxEjKc=6nZ9
z80TZECOl}%I-Fg-AZs$pHsg_JI{+{v1I&;or_6yF4iij9iB)U_FdSmH9jc3!xB<mw
zNsD*t%l-uDK++wg62gnGPVd1|05GcH-0B%PM><xSx2Q~0b^tg8a5U`eoaACndYK-_
zDGAv|y9$+hTt9U89s$^cRfOb3;rx1(0?5L0DZCcWN*y%xMFZ%!GcqD|j>v=Vx%>Oh
z8O~9%a#JkCa_>XAAp%S>J9aSD40@!&jPZj+_tCe;x5OvZ$@o4*Mj7cQ%OSFCikSj6
zsfkX5aY_9hqQH7ABxKEn_x@&*nA@^v^o&$%52C0cS$iZv8mE<sqwYEWW#whO%Q_bo
z7q}Od7l^IA!CU2_d~jQ=$(sarui3RbW{=s~p4eS|N_@}w4$&R;J=I<BeJE6*MPm&1
z#bPu9oJL4Ds3wkq$UzXG48NO6C4>`<-ibT}v`KA^LK9c&tE*LL0Q$ZqKqTePd0ddC
zvXsm{IkoiG7`Bs+Z9_NqBoYO&TvHlTtuv{vaf<`4O5%YJMN)zyqcE1RKzOX6yR;@Y
zy-8P0B>*m$$mZ*@_!U&NyJFNPSx$hRC?X^;4yo&rDtsY@9as&^wkj*6OZyV_Gjals
zqkf$5S>q?BdMdr^*_ejdBlmh3m9WP6u|^FhX!67$QK1rq5k<;J5^n|8&G4<K9u#E3
z$ZvmI{4{glTp$1X*@-*1+zxkZg#=SVSBfg&yOR@ISEZyh007n_GslF7^BqZ$b&-v<
zDyN5)(8OLb${^wo+wUG`@N_P{-Pb?#;_JQi8kfo%#Bh1Sl+3{b09F(AvqRUMNcGh>
z?&0&o*=NT;`r^x9`f}+Tw{&K#jaFs{WpYZtqIUf4WKrn<lTJ-|(2?W-o{1}nfecTS
zsNrHbLtkF@1{oIHpTp8i{P~ml+{a#gljtJqNNh9!DS~0YBw!74N7tYE=f&6mboR~P
zg;)E+{cnHz^w-`OZ*JA=CZp*175S6--JbV;Msgs50xYi}E{MpmHId<%2Z&=(ler#N
zWLfH+!nl!+U3<3G=UICiY%<zMf>(e29)Q_i%Gm=e7vA=czSK#)<V0M+ljQh;MKFz1
zQ}QB!t%)Xt@Y01~<N>0dbI$Y9-0_u+I>s*gTqOmNaGPk-^}S@}5XgHMG#^JF;^Q%x
z*Dr5=g#dLxT6BOeggF-Ae0zK#pVt`yMB0OnmMPI80HoVY`^G2gS^ApU_MbH;!>?=r
zzGlb=1*bj!p$Ok9aEHP()hGY}U=yU;1CF0*@;%rGP^h~S5Bm8^QGsU=CA7W_C!uDv
zG{P+aS$5dJi>Y=>^M0D0Wjo39Ha*9e<Kl!U6?j8K?HL_z(auskA-568b0oU$Lt2D#
ze1(1oDA0X*`*Wn(H<7d_S<+@1CUSO`yxnJjjaUqEM=eI4@|MUQXGgSLb1I^W0b)Gl
zA?I=<Gr`h>f9nN|%nlC?XsRV8x97<#j~qfe%OtdPWunu1l*l3$Apn=S;E4yHdCSi}
zyY8S96^x@2(TGG4$+(9~LTTfM)Y`qoNsk=X_F3b6D?hDFm(z0Dtw^O*XoXXeqhygB
z*(0-OrVs}l>$)lD?tq(pw@egQUH{kOAH6PGG-!s&#<I1X8F!zySvN>a9=EXR%5f54
za~4ZF5QnC0hoP<rnm`5#2xBoM>9rNgI6DxfBy*nT-TPeno|cB=oC2?ygLWTt&>Xba
z#>G$&<?bqZFz_yiTcG%V*nhPBgYiHJW-Z+~-0XOh<C*L&<Suf%4$G|8+|;<a#kSyZ
z#lis)+f`|WcIiO_&Jig~lJaMTAL|&*rBx}$0V?`K_DlR%=P%Fa$JPFiy(BLtf|bje
z!<ppf!~ck$!8oJ*`=Z|(j+TOm%*OYw{|VLvPd`#z##}0|WBzXqvtw>0w#*%iebeJ{
zueUFhO{L6fI3H@z4j1HEU4S2z1SG{VHS{xDBZ>~}NlzXA+vbY7-Q#|jTS-0_Y$ZFv
znZri9lWYVVi^f_Hkryrg)aLKI<vdXKF^@ZlopkJyi*eEHRSzcD?`jt736U4pW8fba
z`B$k=xB;*hwuaiU^^_abwXKmRQA<B}jj5(fjn?d~|1EgcbsxE&=a~vmF7ySLn;mxC
zEe&SZHruxTb(f>q5Qo&ZAFbyn!-aYM*#5d5w?7vLIgpTwz)OnnDlZiOukp)<ziRu3
zmcLT|Ip7ZAwr_Tcg-HRmT+TO1%%#g1!!{h#X_eDj(4f73x8cug{JiMB^FF`GvjO+`
zy;o*f#^>>!_WqOTKkfaS@ZX8=IB_lw9&hP+)&C`m_<yv1pXfj7{+;*^!DDf*<U`~U
z{|4{jI2Z7$rsT=@4xRl5zqBkRAN)?gn)k6jt|j;y{tVmlx`ZSJ(`ik(lT4ycjaJ<o
zFQOdEeYnWoq5p3F;bQqatNO1S->u!<whcH?!WO)g=M)~Z^Jny%KSATyzVWT>=@aHQ
zSE=Y*&57+t&IQh;`P{2^U-*S!Rr208e{TE7(0|2T1CX)+-<&+7U&0=IA6BpeNn}Ep
zU_;Z7$`rJMwbBeZO~_60^yu8ZSH<i)|0Mds$8TWNLM%P?OR)sO2OD%z*jn@ykGji7
z2qtpjNW6HUhW~e@YpwdV45t?1KNale`bxpaW{UqRE&)VxffU0D0Ajp&q&Oz|_oI@~
z*ejtY7g1KvWFBaxV4=bYBvX3K;D;Z@qf9-Jg%b{APDO<cR(Nc_bKZFW2G<k2b3b{P
z8H}V<GNUG#QE7Ym_{Mx&dIkb85e}9E09GRyy8zr!ATWVCrrsm;gm1{Q6Zk8(R|^RZ
z5K;$`k#k1*dmn{Chhg04Xp0R>RHPj)4pvsXQN4SPZmDWVG$D~iq6De8Mbrxc9-RYu
zbi^{Ej#*m1Wbgn9OyCcpWqFh=F*lNL9P;sl1=iROHrH|*{2zW)hfeHa2(en>Ho^$v
zC0Ad*aG(P~vz&)oiG{*Lw>XIlUh$_MItK%L49o*BD>gZ{^o-;iF-K@Zl+3HVZw5et
z&IPdzHwGJjm%jU914-q=f%iNe6?U9Wt2fLhkKK2F=)8B1x%dr-s}2z<)!4*T6D0~l
zxow-{tKGjjp0Sc+f3_90z}p#?%mlcAUo&V^EBH0pWWpA2@PF`O+n7MYWz5zo(IP6y
zdFiD>0Gaqdc~46xm_Z~A)4S8LiMC~#NACvG118MK54M8ov|YgO0EP=<b`UQmG$7Jb
zYRDmw(7$2shadLFaH~R9dmC|i-!4V5LDcsamv;#s*=Y|Ov}wZBCH~Gs61TXULF-pv
zgWy~<M!stiTfrb+5;I%?N#>_#c-ROk^h78#sDp9&XX*a%!wod$-SN8)dP~3k2aiS`
z)QA7@dpEeWb%R>*OJ#UJj&aaKtY*BM%kbsU_yq?z+TBw5%`-eCW;2Oo;r<N$8xbxa
zIrtd3&uB@0x9}vTRc})kyR<3oi6I_j%QBHwsuTP)diMrFk+~!+8sbVzZq3rPkF{$1
zcz6uFhgVeYT2|B$ZUx^zL%;Ws!0m;U0tL;6L`0lw5A$yy7k+<lQ1ph`t0&RwTM?M4
zfuk!P_|rRp?<oKD9a}?*svA5i^#%nN0gOVV6rOdPm<LyfTfmaNkb*^*XaWBqHPad4
zz0Qi1MSv>TnBzLXTmAFD?H?YgX=jYa(28AmQCdh4?byO7fE5hhKeyrR^4TU*vtt6O
z0Jama`rsZYObg4UvhnZhH7*nou#(vVW-#&~HC{g9d;bF0S|AM9T0&ccLng$Gxrj~+
zpUwmpI^B)C?(()RLjE~6fu;@?DE7<K<7g=r8~+{07<9x$&?^BR7qzQAk*5hG(=E*W
zJlCR+FpuW)RJx;S7Oq6t?DD2Vd>bqu6+mp=jdr-$03IpGQ2X$Q+6OmqEYAPvotrjL
zH6@ass1Ox}ap3m)vB-xNQ5-N@SA+4%(OiyRUl3EzaeY}deaIxY8O5jZHcbhK?oMlL
z58+OTanwu5VX{;@7=3t-RyeoPoJK3QOot2(Ub$Wf<+d0D8$3LL3F~0h1kZ7un2J6Y
zA|_AZ_HfD|AH6N&Jw`UvOxl02J@WyrctvjbJ8~gbKD^C#PeB+pg$*%{+FO1h#c*cn
zlthlVJy}Y_e*sWs96W3UWhZd^OA~o;Kui-8k8{2T<fHci(Mc|daEzM2we#uYCb-3m
zMevRW)Mq;8y{Ekp1s5pdhQNXp)IlLIsFvL}tliMXZlU3;8{t1DK#qK%)WBn$U;ev^
z6of=5gt{{Y#lXi7A={$~b?nWa`S9zn{LlEVq+&xH!Ye!AC=XDE-50&*uy(%G&yVa}
zcx}wzEg#k#_SsS~v$79P@$K3?!0vq?!DCildJq^AV~{dCQ}6*H6H@fa86k3O2xS9O
zGJNphKVy-IRB43x4?kXcsRP)parG&jt99_idH|DG1YnskGaZ@LZEb`^2!-=v!kk-k
z9tqtEmyX`RNI01Fh>R7hx@&eZ46;+A)?in#kb`NBJpnX{82_AF2X0zcg40ocM9mSm
zudZ=fUA3;$v0M{!xT91sfp<$H3P6G*;F>^588qz?1rh17R-&jP#u5{tt|Yo~2DD>!
z(X}x(2F%KFy5cbI-ygg5z9ztdWu2}HU`rz2wBe3k#c{b@SA6n;(cB~C#@?*P>H>p3
znPMC!!+>QnS~k*oASe+<Rf(OkCl5T<jDqz|OE}!5dO(hw<1t~~d08=}R_8-kd~!MG
zyy|6)*5x>V%jgi)IT6{qQjjQfwTmBJE7&^XfTNOeUoZrdZA>~`wLR)A9SF=k%z?-F
z8+6q%s!A0^j{inP(b!R7x~Ltjsq${1Jl_u}lD-Hl32j{w?v!2qsIkgbNG_~peKlvo
zK;$oEOfjip(V|gW!P@o23|0bSTF8teGbFo4EY=Y5=qg!{X{s&I-KBM(<ULX#(4$F9
zmURFvqFbih4c0PC0!t7o?$f=VZD4XSqi1YtrtPOx&zCgE7utekz<ttcs})fBZqfeL
zBfk$Jf5;bR8<_;s^m*3BYZ+Lg0W^${RL^%z-`2FGCwRLRCdq5Ig=P_~lEOL_|Bxd9
z76%JypQZtWnL^vLWw5FEp($UfnIC8kAH*0;kzk;zX-oXloIbn@EL%32cD{~A3?TFY
z)J~?R5h?(2KBR%n0KWO<ha`y&gqFROe`EQzJFEXK0@*Gq!62Py*&JB)VK#}&7l4=}
zW<R@xyd&AOA<>mk0I`V{sD=rYKg9)N_OnbjzI*N@FoZQ>bsKB<VMABkmga--z26*C
z@ZNNK`*QmN{t^*^jqwuQBuR#_`1)(Y@@_Wo#m0`<mVpOvnqwo>!E8qRar<;06468;
zGC_E(*YUiMKS<g3jF#cF9?^f5!iseAu7^69N_l_ooy&6~h6siuL;@fG-ymRs$EZ1z
z_<bqejQmb`l|V5V70Q0|O#{rPV;pZ^<oSJQMD*{3;T$0dNx{a|#u7sPfKbjPb{{e~
zCaD`SrKm+v2*2mUiWR)J7N?*Yep}YS)GW%!^Xm=1+(sV}M}!jrY&drF!sj{K2>FAy
zHERgzBqDYov^Rkr@v6kF496<G80OMZ$6z%*GwB#d(;#YYqA5$n{y+p7N0?lcFZM)6
z>otTFAeYnHIp=w+O9(Cd4iOB%xio#TT|;Z9b!fHo944D&J$&eM>b{uUu=8OI?>xXw
WV!U(V+kEuL7tabPv}S_<h=&1z3bAwm

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..22fa3ef9c36aa2690cfcdcf4372d49e02d3c5cb3
GIT binary patch
literal 9788
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%0D`VTCI!LyjdD#5hik
zq>wX6Xw<BV8ad^t1?E&$2!y^xDtL>?91*|`RjL(<s??~NNSa%yj0pvTcn2T?vg0D&
zGzsDYTlmDrT`=QBr_o04sU|ir%c4L8(T7qjhmlG_8bqHW@eo_Of)MH|k7#-8<|uQm
zd?$V^_^kM-{1WQ^jjKW;S903SO0khLnrA9xe3TC<#!*+8B&NQ+Hh8*Zoa00UNTD%6
z0A8$`Yg4YIfdI*gQy?P_GI1;u-=Yiy81M<bkZLHm01T{Ia()p{57RPBRw!v^(OfeN
zEm;_03PNLvBQQz?kU+?fv0Et`#xF&13RVTkmE=fc7&t*vwtaHH&z5~-b*GgbkKf<6
zDJAnGa4CXBXdIQT^rBY?z$R!g0$kWKG&_z)5Ko7ZrlkYe1VDvwK<mHGa~{CE&f5)8
z7W=E~I}ZHcaOV9-ejV-{ml{R`5D9wB8WgGw0ZK@-F1rPl`moO119*jcv`EpM0lmzt
zJ_Lwh>x(y*wzr)5^ufN_{wpHUqs_OOVdAwUv`b7Iu)?b-vS~e;aRGY|Vj)Jq6R!5v
z!+taX_M4@t>jTlFlm=|-aZY#iiKqt)IHa!}z)2cVN2uz-21H^My)^i<ZG_GkFft90
zwLLgYWy1}K%*@WC_zccPP&VxL+h}UvuElf;_TfC260w_X17eyD=(mxxkIO3{hI~HS
z1{{UI@Y6lnKFEJfFf+ky<-ti_EJJ)3F#ekcNZq4W=?v`S#Sb|6WPS(kX19G1hqfVJ
zr%!TYKera355rK~heL1{f4_kJzoQ<wfh*eH9vtg+Bx3uqt_7E-bBB;E0HCU^?dvOf
z6pr%pPi+4fL7+8=0st9(JTkxnNRfU()vXX0rb~b=pbZ(I?KbiR{C@{WpTV!79cbRz
z)B4k+0T<%`Va)wJ%CCi-r%eTup!tBdxl^#0&)&i(pd)BSpqncgEKeh&IK%x2)_zK_
z05i1Sgi(m%u~w-Er{NUr=kpKq)dHPB8xSr+I=A{_hU1@Wn)*Gs{>Zbd@NSHxKy-j{
zXj$q-I1MMM*w3$T;d{^tv;lF={RM_Qhvg5CJaW4y@qL*mm&ZOuXqSu)2rvq*(K0N;
z0_^4LS^V}^ia<xu282kIo6(2l5U225{2^uk<n9Hj8zB&+tU(2Bz|X)EEW<(WoW;fW
zbM6l~K!;ji>v2Tx!}HH5(I$s9%?EIOot(dObCS|c++7-u!6Zz8=XY(f#lArgcJa?S
z-2OP%{(uws2rRMTC&%=m`@5`&-2cF<k8|rB?(gFNhtuHZw7DEDE==Qj8jm5yU=-Me
z4rrTsE6|4xSO@Px54}RcA_a$e_Gcb`juOxnv<GcLbS-4eIh$?vVPt@!T*%fxM4&y4
z2G=CxQl!q2G>dJFxC_%#p<_Jl@%#*qWonO5wT<%6QUV%+2A~;e1=0bHemEO#)gt2I
zVxp?Xka|O`8F`hF9tl4J5<m(_1DTO60kS4@qx=YBXp;%XS=Z2LCZ7*gByq(8PccOa
zZb-XZ18T6q@Q45|GC_)&tWS09A<o=bXC|FRH1ld?<ZeL93L|Czp+9II`7im()u)W+
W(virK{$-NsE`$2@S|rH;tqK7H!hKo*

literal 0
HcmV?d00001

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
new file mode 100644
index 0000000000000000000000000000000000000000..bf66beda2e3d267879908e482bb4fd0453143bc3
GIT binary patch
literal 14124
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 65eb049..61b5cea 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -10,12 +10,20 @@
     <string name="summary_browse_terms_of_service_and_privacy_policy">Read and agree to our Terms of Service and Privacy Policy to continue.</string>
     <string name="agree">Agree</string>
 
+    <string name="navigation_drawer_open">Open navigation drawer</string>
+
     <string name="find_us">Find us on</string>
     <string name="website">Website</string>
     <string name="close">Close?</string>
     <string name="summary_close">Are you sure you want to exit?</string>
     <string name="snack_network_error">Network error occurred while checking for updates</string>
     <string name="snack_general_error">An error occurred while checking for updates</string>
+    <string name="get_the_app_to_watch">Get the app and see the full lesson: %1$s</string>
+    <string name="activity_not_found">Activity not found.</string>
+    <string name="security_error">A security error occurred. Please try again later.</string>
+    <string name="io_error">An input/output error occurred. Please check your network connection or storage and try again.</string>
+    <string name="illegal_argument_error">Invalid input or argument provided. Please check the information and try again.</string>
+    <string name="unknown_error">An unknown error occurred.</string>
 
     <string name="settings">Settings</string>
 
@@ -35,6 +43,10 @@
     <string name="dynamic_colors">Dynamic colors</string>
     <string name="summary_preference_settings_dynamic_colors">Apply colors from wallpapers to the app theme</string>
 
+    <string name="app_behavior">App behavior</string>
+    <string name="bounce_buttons">Bounce click</string>
+    <string name="summary_preference_settings_bounce_buttons">Applies a subtle bounce animation to all clickable elements when clicked</string>
+
     <string name="language">Language</string>
     <string name="summary_preference_settings_language">Changes the language used in the app</string>
     <string name="dialog_language_subtitle">Select your preferred language</string>
@@ -106,11 +118,14 @@
     <string name="app_build_version">Application build version</string>
     <string name="summary_preference_settings_oss">License details for open source software</string>
     <string name="device_info">Device Info</string>
-    <string name="app_build">App Build: Release\n%1$s\n%2$s\n%3$s\n%4$s\n%5$s</string>
+    <string name="app_build">App Build: %6$s\n%1$s\n%2$s\n%3$s\n%4$s\n%5$s</string>
+    <string name="debug">Debug</string>
+    <string name="release">Release</string>
     <string name="manufacturer">Manufacturer:</string>
     <string name="device_model">Device Model:</string>
     <string name="android_version">Android Version:</string>
     <string name="api_level">API Level:</string>
+    <string name="snack_device_info_copied">Device info copied to clipboard</string>
 
     <string name="help_and_feedback">Help &amp; feedback</string>
     <string name="help">Help</string>
diff --git a/app/src/main/res/values/untranslatable_strings.xml b/app/src/main/res/values/untranslatable_strings.xml
index 99e155f..736ad27 100644
--- a/app/src/main/res/values/untranslatable_strings.xml
+++ b/app/src/main/res/values/untranslatable_strings.xml
@@ -22,4 +22,13 @@
     <string name="dear_developer" translatable="false">Dear developer, </string>
     <string name="send_email_using" translatable="false">Send mail using:</string>
     <string name="copyright" translatable="false">Copyright ©2023-2024, D4rK</string>
+
+
+    <string name="oss_license_title">Open source licenses</string>
+    <string name="eula_title" translatable="false">EULA</string>
+    <string name="changelog">CHANGELOG</string>
+    <string name="loading_eula">Loading EULA</string>
+    <string name="error_loading_eula">Error loading EULA</string>
+    <string name="loading_changelog">Loading changelog</string>
+    <string name="error_loading_changelog">Error loading changelog</string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index cb98ceb..c62d0f8 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
-    alias(libs.plugins.androidApplication) apply false
-    alias(libs.plugins.androidLibrary) apply false
-    alias(libs.plugins.jetbrainsKotlinAndroid) apply false
-    alias(libs.plugins.jetbrainsKotlinParcelize) apply false
-    alias(libs.plugins.kotlin.serialization) apply false
-    alias(libs.plugins.compose.compiler) apply false
-    alias(libs.plugins.googlePlayServices) apply false
-    alias(libs.plugins.googleFirebase) apply false
-    alias(libs.plugins.googleOssServices) apply false
+    alias(notation = libs.plugins.androidApplication) apply false
+    alias(notation = libs.plugins.androidLibrary) apply false
+    alias(notation = libs.plugins.jetbrainsKotlinAndroid) apply false
+    alias(notation = libs.plugins.jetbrainsKotlinParcelize) apply false
+    alias(notation = libs.plugins.kotlin.serialization) apply false
+    alias(notation = libs.plugins.compose.compiler) apply false
+    alias(notation = libs.plugins.googlePlayServices) apply false
+    alias(notation = libs.plugins.googleFirebase) apply false
+    alias(notation = libs.plugins.about.libraries) apply true
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bc19286..e6ae371 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,55 +1,44 @@
 [versions]
-agp = "8.5.1"
+agp = "8.7.2"
 appcompat = "1.7.0"
 appUpdateKtx = "2.1.0"
-coilCompose = "2.7.0"
-composeBom = "2024.06.00"
-coreKtx = "1.13.1"
-billing = "7.0.0"
+coil = "3.0.3"
+composeBom = "2024.11.00"
+coreKtx = "1.15.0"
+billing = "7.1.1"
 datastoreCore = "1.1.1"
-graphicsShapes = "1.0.0-rc01"
-ktorClientContentNegotiation = "2.3.12"
-ktorClientCio = "2.3.12"
-ktorClientCore = "2.3.12"
-ktorSerializationKotlinxJson = "2.3.12"
-lifecycle = "2.8.4"
-lottieCompose = "6.4.1"
+kotlinxSerializationJson = "1.7.3"
+ktorBom = "3.0.1"
+lifecycle = "2.8.7"
+core = "4.6.2"
+aboutlibraries = "11.2.3"
 material = "1.12.0"
-kotlinxCoroutinesAndroid = "1.8.1"
-media3Exoplayer = "1.4.0"
+kotlinxCoroutinesAndroid = "1.9.0"
+media3Exoplayer = "1.5.0"
 multidex = "2.0.1"
-slf4jSimple = "2.0.13"
-volley = "1.2.1"
-workRuntimeKtx = "2.9.0"
+wavySlider = "2.0.0"
+workRuntimeKtx = "2.10.0"
 coreSplashscreen = "1.0.1"
-firebaseBom = "32.8.1"
-kotlin = "2.0.0"
-junit = "4.13.2"
-activityCompose = "1.9.1"
-junitVersion = "1.2.1"
-navigationCompose = "2.7.7"
-constraintlayoutCompose = "1.0.1"
-espressoCore = "3.6.1"
-composeUi = "1.6.8"
+firebaseBom = "33.6.0"
+kotlin = "2.0.10"
+activityCompose = "1.9.3"
+navigationCompose = "2.8.4"
 google-services = "4.4.2"
-google-oss-services = "0.10.6"
 google-firebase-crashlytics = "3.0.2"
-playServicesAds = "23.2.0"
-playServicesOssLicenses = "17.1.0"
-reviewKtx = "2.0.1"
+playServicesAds = "23.5.0"
+reviewKtx = "2.0.2"
 
 [libraries]
-androidx-animation-core = { module = "androidx.compose.animation:animation-core" }
+aboutlibraries = { module = "com.mikepenz:aboutlibraries", version.ref = "aboutlibraries" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "activityCompose" }
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "appcompat" }
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "coreKtx" }
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "coreSplashscreen" }
-androidx-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version.ref = "constraintlayoutCompose" }
-androidx-datastore-core = { module = "androidx.datastore:datastore-core", version.ref = "datastoreCore" }
+androidx-datastore-preferences = { module = "androidx.datastore:datastore-core", version.ref = "datastoreCore" }
+datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastoreCore" }
 androidx-foundation = { module = "androidx.compose.foundation:foundation" }
-androidx-graphics-shapes = { module = "androidx.graphics:graphics-shapes", version.ref = "graphicsShapes" }
-androidx-lifecycle-common-java8 = { module = "androidx.lifecycle:lifecycle-common-java8", version.ref = "lifecycle" }
+androidx-ui-graphics = { group = "androidx.compose.ui", name = "ui-graphics" }
 androidx-lifecycle-livedata-ktx = { module = "androidx.lifecycle:lifecycle-livedata-ktx", version.ref = "lifecycle" }
 androidx-lifecycle-process = { module = "androidx.lifecycle:lifecycle-process", version.ref = "lifecycle" }
 androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
@@ -58,39 +47,37 @@ androidx-media3-exoplayer = { module = "androidx.media3:media3-exoplayer", versi
 androidx-media3-session = { module = "androidx.media3:media3-session", version.ref = "media3Exoplayer" }
 androidx-media3-ui = { module = "androidx.media3:media3-ui", version.ref = "media3Exoplayer" }
 androidx-multidex = { module = "androidx.multidex:multidex", version.ref = "multidex" }
+core = { module = "io.noties.markwon:core", version.ref = "core" }
 androidx-navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigationCompose" }
 androidx-material-icons-extended = { module = "androidx.compose.material:material-icons-extended" }
 androidx-material3 = { module = "androidx.compose.material3:material3" }
 androidx-work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
-androidx-runtime = { module = "androidx.compose.runtime:runtime" }
 androidx-runtime-livedata = { module = "androidx.compose.runtime:runtime-livedata" }
 androidx-ui = { module = "androidx.compose.ui:ui" }
-coil-compose = { module = "io.coil-kt:coil-compose", version.ref = "coilCompose" }
+coil-network-okhttp = { module = "io.coil-kt.coil3:coil-network-okhttp", version.ref = "coil" }
 kotlinx-coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "kotlinxCoroutinesAndroid" }
-androidx-ui-tooling = { group = "androidx.compose.ui", name = "ui-tooling" }
-androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 billing = { module = "com.android.billingclient:billing", version.ref = "billing" }
 app-update-ktx = { module = "com.google.android.play:app-update-ktx", version.ref = "appUpdateKtx" }
 firebase-analytics-ktx = { module = "com.google.firebase:firebase-analytics-ktx" }
 firebase-bom = { module = "com.google.firebase:firebase-bom", version.ref = "firebaseBom" }
 firebase-crashlytics-ktx = { module = "com.google.firebase:firebase-crashlytics-ktx" }
 firebase-perf = { module = "com.google.firebase:firebase-perf" }
-junit = { group = "junit", name = "junit", version.ref = "junit" }
-androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "junitVersion" }
-androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "espressoCore" }
-ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktorClientCio" }
-ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktorClientContentNegotiation" }
-ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktorClientCore" }
-ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktorSerializationKotlinxJson" }
-lottie-compose = { module = "com.airbnb.android:lottie-compose", version.ref = "lottieCompose" }
+kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerializationJson" }
+ktor-bom = { module = "io.ktor:ktor-bom", version.ref = "ktorBom" }
+ktor-client-android = { module = "io.ktor:ktor-client-android" }
+ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation" }
+ktor-client-logging = { module = "io.ktor:ktor-client-logging" }
+ktor-client-serialization = { module = "io.ktor:ktor-client-serialization" }
+ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 play-services-ads = { module = "com.google.android.gms:play-services-ads", version.ref = "playServicesAds" }
-play-services-oss-licenses = { module = "com.google.android.gms:play-services-oss-licenses", version.ref = "playServicesOssLicenses" }
 review-ktx = { module = "com.google.android.play:review-ktx", version.ref = "reviewKtx" }
-slf4j-simple = { module = "org.slf4j:slf4j-simple", version.ref = "slf4jSimple" }
-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "composeUi" }
-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
-volley = { module = "com.android.volley:volley", version.ref = "volley" }
+wavy-slider = { module = "ir.mahozad.multiplatform:wavy-slider", version.ref = "wavySlider" }
+androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
+androidx-lifecycle-runtime-compose = { module = "androidx.lifecycle:lifecycle-runtime-compose", version.ref = "lifecycle" }
+androidx-lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
+coil-compose = { module = "io.coil-kt.coil3:coil-compose", version.ref = "coil" }
+androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-tooling-preview" }
 
 [plugins]
 androidApplication = { id = "com.android.application", version.ref = "agp" }
@@ -98,7 +85,7 @@ androidLibrary = { id = "com.android.library", version.ref = "agp" }
 jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 jetbrainsKotlinParcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
 googlePlayServices = { id = "com.google.gms.google-services", version.ref = "google-services" }
-googleOssServices = { id = "com.google.android.gms.oss-licenses-plugin", version.ref = "google-oss-services" }
 googleFirebase = { id = "com.google.firebase.crashlytics", version.ref = "google-firebase-crashlytics" }
 compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
+about-libraries = { id = "com.mikepenz.aboutlibraries.plugin", version.ref = "aboutlibraries" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f29c151..76d5420 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Jul 12 22:33:34 EEST 2024
+#Mon Nov 25 12:07:39 EET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists