diff --git a/Authorization/Authorization/Presentation/Login/SignInView.swift b/Authorization/Authorization/Presentation/Login/SignInView.swift
index 35024ef4b..800c50387 100644
--- a/Authorization/Authorization/Presentation/Login/SignInView.swift
+++ b/Authorization/Authorization/Presentation/Login/SignInView.swift
@@ -48,7 +48,7 @@ public struct SignInView: View {
             }
             
             VStack(alignment: .center) {
-                ThemeAssets.appLogoLight.swiftUIImage
+                ThemeAssets.appLogo.swiftUIImage
                     .resizable()
                     .aspectRatio(contentMode: .fit)
                     .frame(maxWidth: 189, maxHeight: 89)
@@ -75,6 +75,8 @@ public struct SignInView: View {
                                 .foregroundColor(Theme.Colors.textPrimary)
                                 .accessibilityIdentifier("username_text")
                             TextField(AuthLocalization.SignIn.emailOrUsername, text: $email)
+                                .font(Theme.Fonts.bodyLarge)
+                                .foregroundColor(Theme.Colors.textPrimary)
                                 .keyboardType(.emailAddress)
                                 .textContentType(.emailAddress)
                                 .autocapitalization(.none)
@@ -97,6 +99,8 @@ public struct SignInView: View {
                                 .padding(.top, 18)
                                 .accessibilityIdentifier("password_text")
                             SecureField(AuthLocalization.SignIn.password, text: $password)
+                                .font(Theme.Fonts.bodyLarge)
+                                .foregroundColor(Theme.Colors.textPrimary)
                                 .padding(.all, 14)
                                 .background(
                                     Theme.Shapes.textInputShape
@@ -123,7 +127,8 @@ public struct SignInView: View {
                                     viewModel.trackForgotPasswordClicked()
                                     viewModel.router.showForgotPasswordScreen()
                                 }
-                                .foregroundColor(Theme.Colors.accentColor)
+                                .font(Theme.Fonts.bodyLarge)
+                                .foregroundColor(Theme.Colors.accentXColor)
                                 .padding(.top, 0)
                                 .accessibilityIdentifier("forgot_password_button")
                             }
diff --git a/Authorization/Authorization/Presentation/Registration/SignUpView.swift b/Authorization/Authorization/Presentation/Registration/SignUpView.swift
index 4215501a9..999f5d2b0 100644
--- a/Authorization/Authorization/Presentation/Registration/SignUpView.swift
+++ b/Authorization/Authorization/Presentation/Registration/SignUpView.swift
@@ -111,6 +111,7 @@ public struct SignUpView: View {
                                         Text(disclosureGroupOpen
                                              ? AuthLocalization.SignUp.hideFields
                                              : AuthLocalization.SignUp.showFields)
+                                        .font(Theme.Fonts.labelLarge)
                                     }
                                     .accessibilityLabel("optional_fields_text")
                                     .padding(.top, 10)
diff --git a/Authorization/Authorization/Presentation/Reset Password/ResetPasswordView.swift b/Authorization/Authorization/Presentation/Reset Password/ResetPasswordView.swift
index 8019fc9b4..9c6a78823 100644
--- a/Authorization/Authorization/Presentation/Reset Password/ResetPasswordView.swift	
+++ b/Authorization/Authorization/Presentation/Reset Password/ResetPasswordView.swift	
@@ -92,6 +92,8 @@ public struct ResetPasswordView: View {
                                     .foregroundColor(Theme.Colors.textPrimary)
                                     .accessibilityIdentifier("email_text")
                                 TextField(AuthLocalization.SignIn.email, text: $email)
+                                    .font(Theme.Fonts.bodyLarge)
+                                    .foregroundColor(Theme.Colors.textPrimary)
                                     .keyboardType(.emailAddress)
                                     .textContentType(.emailAddress)
                                     .autocapitalization(.none)
diff --git a/Authorization/Authorization/Presentation/SocialAuth/SocialAuthView.swift b/Authorization/Authorization/Presentation/SocialAuth/SocialAuthView.swift
index f5190cf4e..16367414e 100644
--- a/Authorization/Authorization/Presentation/SocialAuth/SocialAuthView.swift
+++ b/Authorization/Authorization/Presentation/SocialAuth/SocialAuthView.swift
@@ -7,6 +7,7 @@
 
 import SwiftUI
 import Core
+import Theme
 
 struct SocialAuthView: View {
 
@@ -51,7 +52,7 @@ struct SocialAuthView: View {
         HStack {
             Text("\(AuthLocalization.or) \(title.lowercased()):")
                 .padding(.vertical, 20)
-                .font(.system(size: 17, weight: .medium))
+                .font(Theme.Fonts.bodyMedium)
                 .accessibilityIdentifier("social_auth_title_text")
             Spacer()
         }
diff --git a/Authorization/Authorization/Presentation/Startup/StartupView.swift b/Authorization/Authorization/Presentation/Startup/StartupView.swift
index db0eff655..bf5313947 100644
--- a/Authorization/Authorization/Presentation/Startup/StartupView.swift
+++ b/Authorization/Authorization/Presentation/Startup/StartupView.swift
@@ -55,6 +55,7 @@ public struct StartupView: View {
                             Image(systemName: "magnifyingglass")
                                 .padding(.leading, 16)
                                 .padding(.top, 1)
+                                .foregroundColor(Theme.Colors.textPrimary)
                             TextField(AuthLocalization.Startup.searchPlaceholder, text: $searchQuery, onCommit: {
                                 if searchQuery.isEmpty { return }
                                 viewModel.router.showDiscoveryScreen(
@@ -66,6 +67,8 @@ public struct StartupView: View {
                             .autocorrectionDisabled()
                             .frame(minHeight: 50)
                             .submitLabel(.search)
+                            .font(Theme.Fonts.bodyLarge)
+                            .foregroundColor(Theme.Colors.textPrimary)
                             .accessibilityIdentifier("explore_courses_textfield")
                             
                         }.overlay(
@@ -86,7 +89,7 @@ public struct StartupView: View {
                         } label: {
                             Text(AuthLocalization.Startup.exploreAllCourses)
                                 .underline()
-                                .foregroundColor(Theme.Colors.accentColor)
+                                .foregroundColor(Theme.Colors.accentXColor)
                                 .font(Theme.Fonts.bodyLarge)
                         }
                         .padding(.top, isHorizontal ? 0 : 5)
diff --git a/Core/Core/Configuration/CSSInjector.swift b/Core/Core/Configuration/CSSInjector.swift
index 59beef4cd..efd18643c 100644
--- a/Core/Core/Configuration/CSSInjector.swift
+++ b/Core/Core/Configuration/CSSInjector.swift
@@ -115,7 +115,7 @@ public class CSSInjector {
         <style>
         a {
             text-decoration: none;
-            color: \(Theme.Colors.accentColor.uiColor().cgColor.hexString ?? "");
+            color: \(Theme.UIColors.accentXColor.cgColor.hexString ?? "");
         }
         @font-face {
         font-family: "San Francisco";
diff --git a/Core/Core/Extensions/UIApplicationExtension.swift b/Core/Core/Extensions/UIApplicationExtension.swift
index 871a60b7b..00b7651fe 100644
--- a/Core/Core/Extensions/UIApplicationExtension.swift
+++ b/Core/Core/Extensions/UIApplicationExtension.swift
@@ -48,8 +48,20 @@ extension UINavigationController {
         navigationBar.backIndicatorImage = image.withTintColor(Theme.UIColors.accentXColor)
         navigationBar.backItem?.backButtonTitle = " "
         navigationBar.backIndicatorTransitionMaskImage = image.withTintColor(Theme.UIColors.accentXColor)
-        navigationBar.titleTextAttributes = [.foregroundColor: Theme.UIColors.navigationBarTintColor]
-        UIView.appearance(whenContainedInInstancesOf: [UIAlertController.self]).tintColor = Theme.UIColors.accentColor
+        navigationBar.titleTextAttributes = [
+            .foregroundColor: Theme.UIColors.navigationBarTintColor,
+            .font: Theme.UIFonts.titleMedium()
+        ]
+        
+        UISegmentedControl.appearance().setTitleTextAttributes(
+            [
+                .foregroundColor: Theme.Colors.primaryButtonTextColor.uiColor(),
+                .font: Theme.UIFonts.labelLarge()
+            ],
+            for: .normal)
+        UISegmentedControl.appearance().selectedSegmentTintColor = UIColor(Theme.Colors.accentXColor)
+        
+        UIView.appearance(whenContainedInInstancesOf: [UIAlertController.self]).tintColor = Theme.UIColors.accentXColor
     }
 }
 
diff --git a/Core/Core/View/Base/AlertView.swift b/Core/Core/View/Base/AlertView.swift
index 80aa89307..ff79856c4 100644
--- a/Core/Core/View/Base/AlertView.swift
+++ b/Core/Core/View/Base/AlertView.swift
@@ -134,12 +134,14 @@ public struct AlertView: View {
         case .logOut:
             HStack {
                 Spacer(minLength: 100)
-                CoreAssets.logOut.swiftUIImage
+                CoreAssets.logOut.swiftUIImage.renderingMode(.template)
                     .padding(.top, isHorizontal ? 20 : 54)
+                    .foregroundColor(Theme.Colors.textPrimary)
                 Spacer(minLength: 100)
             }
             Text(alertMessage)
                 .font(Theme.Fonts.titleLarge)
+                .foregroundColor(Theme.Colors.textPrimary)
                 .padding(.vertical, isHorizontal ? 6 : 40)
                 .multilineTextAlignment(.center)
                 .padding(.horizontal, 40)
@@ -147,17 +149,21 @@ public struct AlertView: View {
         case .leaveProfile, .deleteVideo:
             VStack(spacing: 20) {
                 if type == .deleteVideo {
-                    CoreAssets.warning.swiftUIImage
+                    CoreAssets.warning.swiftUIImage.renderingMode(.template)
+                        .foregroundColor(Theme.Colors.textPrimary)
                         .padding(.top, isHorizontal ? 20 : 54)
                 } else {
-                    CoreAssets.leaveProfile.swiftUIImage
+                    CoreAssets.leaveProfile.swiftUIImage.renderingMode(.template)
+                        .foregroundColor(Theme.Colors.textPrimary)
                         .padding(.top, isHorizontal ? 20 : 54)
                 }
                 Text(alertTitle)
                     .font(Theme.Fonts.titleLarge)
+                    .foregroundColor(Theme.Colors.textPrimary)
                     .padding(.horizontal, 40)
                 Text(alertMessage)
                     .font(Theme.Fonts.bodyMedium)
+                    .foregroundColor(Theme.Colors.textPrimary)
                     .multilineTextAlignment(.center)
                     .padding(.horizontal, 40)
 
@@ -174,10 +180,12 @@ public struct AlertView: View {
                     }
                     Text(alertTitle)
                         .font(Theme.Fonts.titleLarge)
+                        .foregroundColor(Theme.Colors.textPrimary)
                         .padding(.horizontal, 40)
                         .padding(.top, 10)
                     Text(alertMessage)
                         .font(Theme.Fonts.bodyMedium)
+                        .foregroundColor(Theme.Colors.textPrimary)
                         .multilineTextAlignment(.center)
                         .padding(.horizontal, 40)
                         .frame(maxWidth: 250)
@@ -260,7 +268,7 @@ public struct AlertView: View {
                 }, label: {
                     ZStack {
                         Text(CoreLocalization.Alert.logout)
-                            .foregroundColor(Theme.Colors.white)
+                            .foregroundColor(Theme.Colors.primaryButtonTextColor)
                             .font(Theme.Fonts.labelLarge)
                             .frame(maxWidth: .infinity)
                             .padding(.horizontal, 16)
@@ -292,7 +300,7 @@ public struct AlertView: View {
                     }, label: {
                         ZStack {
                             Text(CoreLocalization.Alert.leave)
-                                .foregroundColor(Theme.Colors.white)
+                                .foregroundColor(Theme.Colors.primaryButtonTextColor)
                                 .font(Theme.Fonts.labelLarge)
                                 .frame(maxWidth: .infinity)
                                 .padding(.horizontal, 16)
@@ -351,7 +359,7 @@ public struct AlertView: View {
                     } label: {
                         ZStack {
                             Text(CoreLocalization.Alert.delete)
-                                .foregroundColor(Theme.Colors.white)
+                                .foregroundColor(Theme.Colors.primaryButtonTextColor)
                                 .font(Theme.Fonts.labelLarge)
                                 .frame(maxWidth: .infinity)
                                 .padding(.horizontal, 16)
diff --git a/Core/Core/View/Base/AppReview/AppReviewView.swift b/Core/Core/View/Base/AppReview/AppReviewView.swift
index e7fedcf1b..c22765245 100644
--- a/Core/Core/View/Base/AppReview/AppReviewView.swift
+++ b/Core/Core/View/Base/AppReview/AppReviewView.swift
@@ -68,6 +68,8 @@ public struct AppReviewView: View {
                         
                     case .feedback:
                         TextEditor(text: $viewModel.feedback)
+                            .font(Theme.Fonts.bodyMedium)
+                            .foregroundColor(Theme.Colors.textPrimary)
                             .padding(.horizontal, 12)
                             .padding(.vertical, 4)
                             .hideScrollContentBackground()
diff --git a/Core/Core/View/Base/CheckBoxView.swift b/Core/Core/View/Base/CheckBoxView.swift
index 29253290a..efed96ccc 100644
--- a/Core/Core/View/Base/CheckBoxView.swift
+++ b/Core/Core/View/Base/CheckBoxView.swift
@@ -26,10 +26,11 @@ public struct CheckBoxView: View {
                 systemName: checked ? "checkmark.square.fill" : "square"
             )
             .foregroundColor(
-                checked ? Theme.Colors.accentColor : Theme.Colors.textPrimary
+                checked ? Theme.Colors.accentXColor : Theme.Colors.textPrimary
             )
             Text(text)
                 .font(font)
+                .foregroundColor(Theme.Colors.textPrimary)
         }
         .onTapGesture {
             withAnimation(.linear(duration: 0.1)) {
diff --git a/Core/Core/View/Base/CourseCellView.swift b/Core/Core/View/Base/CourseCellView.swift
index 2d8ea1c24..6166b81a3 100644
--- a/Core/Core/View/Base/CourseCellView.swift
+++ b/Core/Core/View/Base/CourseCellView.swift
@@ -85,7 +85,7 @@ public struct CourseCellView: View {
                                 .resizable()
                                 .frame(width: 16, height: 16)
                                 .offset(x: 15)
-                                .foregroundColor(Theme.Colors.accentColor)
+                                .foregroundColor(Theme.Colors.accentXColor)
                                 .accessibilityIdentifier("arrow_image")
                         }
                     }
diff --git a/Core/Core/View/Base/PickerMenu.swift b/Core/Core/View/Base/PickerMenu.swift
index 849f99ae4..2066a8aa0 100644
--- a/Core/Core/View/Base/PickerMenu.swift
+++ b/Core/Core/View/Base/PickerMenu.swift
@@ -82,20 +82,23 @@ public struct PickerMenu: View {
                         Text(titleText)
                             .foregroundColor(Theme.Colors.textPrimary)
                             .accessibilityIdentifier("picker_title_text")
+                            .font(Theme.Fonts.bodyMedium)
                         TextField(CoreLocalization.Picker.search, text: $search)
                             .padding(.all, 8)
+                            .font(Theme.Fonts.bodySmall)
                             .background(Theme.Colors.textInputStroke.cornerRadius(6))
                             .accessibilityIdentifier("picker_search_textfield")
                         Picker("", selection: $selectedItem) {
                             ForEach(filteredItems, id: \.self) { item in
                                 Text(item.value)
                                     .foregroundColor(Theme.Colors.textPrimary)
+                                    .font(Theme.Fonts.bodyMedium)
                             }
                         }
                         .pickerStyle(.wheel)
                         .accessibilityIdentifier("picker")
                     }
-                    .frame(minWidth: 0, 
+                    .frame(minWidth: 0,
                            maxWidth: (idiom == .pad || (idiom == .phone && isHorizontal))
                            ? ipadPickerWidth
                            : .infinity)
@@ -114,6 +117,7 @@ public struct PickerMenu: View {
                         router.dismiss(animated: true)
                     }) {
                         Text(CoreLocalization.Picker.accept)
+                            .font(Theme.Fonts.bodyMedium)
                             .foregroundColor(Theme.Colors.textPrimary)
                             .frame(minWidth: 0,
                                    maxWidth: (idiom == .pad || (idiom == .phone && isHorizontal))
diff --git a/Core/Core/View/Base/PickerView.swift b/Core/Core/View/Base/PickerView.swift
index c7437ac71..91be4684b 100644
--- a/Core/Core/View/Base/PickerView.swift
+++ b/Core/Core/View/Base/PickerView.swift
@@ -61,7 +61,7 @@ public struct PickerView: View {
                             .stroke(lineWidth: 1)
                             .fill(config.error == "" ?
                                   Theme.Colors.textInputStroke
-                                  : Color.red)
+                                  : Theme.Colors.alert)
                     )
                     .shake($config.shake)
                 Text(config.error == "" ? config.field.instructions
@@ -69,7 +69,7 @@ public struct PickerView: View {
                 .font(Theme.Fonts.labelMedium)
                 .foregroundColor(config.error == ""
                                  ? Theme.Colors.textPrimary
-                                 : Color.red)
+                                 : Theme.Colors.alert)
                 .accessibilityIdentifier("\(config.field.name)_instructions_text")
             }
         }
diff --git a/Core/Core/View/Base/RegistrationTextField.swift b/Core/Core/View/Base/RegistrationTextField.swift
index 70467643f..a6751451b 100644
--- a/Core/Core/View/Base/RegistrationTextField.swift
+++ b/Core/Core/View/Base/RegistrationTextField.swift
@@ -42,6 +42,8 @@ public struct RegistrationTextField: View {
             }
             if isTextArea {
                 TextEditor(text: $config.text)
+                    .font(Theme.Fonts.bodyMedium)
+                    .foregroundColor(Theme.Colors.textPrimary)
                     .padding(.horizontal, 12)
                     .padding(.vertical, 4)
                     .frame(height: 100)
@@ -57,7 +59,7 @@ public struct RegistrationTextField: View {
                             .fill(
                                 config.error == "" ?
                                 Theme.Colors.textInputStroke
-                                : Color.red
+                                : Theme.Colors.alert
                             )
                     )
                     .shake($config.shake)
@@ -80,13 +82,15 @@ public struct RegistrationTextField: View {
                                 .fill(
                                     config.error == "" ?
                                     Theme.Colors.textInputStroke
-                                    : Color.red
+                                    : Theme.Colors.alert
                                 )
                         )
                         .shake($config.shake)
                         .accessibilityIdentifier("\(config.field.name)_textfield")
                 } else {
                     TextField(placeholder, text: $config.text)
+                        .font(Theme.Fonts.bodyLarge)
+                        .foregroundColor(Theme.Colors.textPrimary)
                         .keyboardType(keyboardType)
                         .textContentType(textContentType)
                         .autocapitalization(.none)
@@ -102,7 +106,7 @@ public struct RegistrationTextField: View {
                                 .fill(
                                     config.error == "" ?
                                     Theme.Colors.textInputStroke
-                                    : Color.red
+                                    : Theme.Colors.alert
                                 )
                         )
                         .shake($config.shake)
@@ -113,8 +117,8 @@ public struct RegistrationTextField: View {
             Text(config.error == "" ? config.field.instructions : config.error)
                 .font(Theme.Fonts.bodySmall)
                 .foregroundColor(config.error == ""
-                                 ? Theme.Colors.textSecondary
-                                 : Color.red)
+                                 ? Theme.Colors.textSecondaryLight
+                                 : Theme.Colors.alert)
                 .accessibilityIdentifier("\(config.field.name)_instructions_text")
         }
     }
diff --git a/Core/Core/View/Base/ScrollSlidingTabBar/ScrollSlidingTabBar.swift b/Core/Core/View/Base/ScrollSlidingTabBar/ScrollSlidingTabBar.swift
index 0c89f0811..129a5f6b9 100644
--- a/Core/Core/View/Base/ScrollSlidingTabBar/ScrollSlidingTabBar.swift
+++ b/Core/Core/View/Base/ScrollSlidingTabBar/ScrollSlidingTabBar.swift
@@ -160,9 +160,9 @@ extension ScrollSlidingTabBar {
         }
         
         public static let `default` = Style(
-            font: .body,
-            selectedFont: .body.bold(),
-            activeAccentColor: Theme.Colors.accentColor,
+            font: Theme.Fonts.bodyLarge,
+            selectedFont: Theme.Fonts.titleMedium,
+            activeAccentColor: Theme.Colors.accentXColor,
             inactiveAccentColor: Theme.Colors.textSecondary,
             indicatorHeight: 2,
             borderColor: .gray.opacity(0.2),
diff --git a/Core/Core/View/Base/SocialAuthButton.swift b/Core/Core/View/Base/SocialAuthButton.swift
index 3ebd367e7..74224fa25 100644
--- a/Core/Core/View/Base/SocialAuthButton.swift
+++ b/Core/Core/View/Base/SocialAuthButton.swift
@@ -47,6 +47,7 @@ public struct SocialAuthButton: View {
                 Text(title)
                     .foregroundStyle(textColor)
                     .padding(.leading, 10)
+                    .font(Theme.Fonts.bodyLarge)
                 Spacer()
             } icon: {
                 image.padding(.leading, 10)
diff --git a/Core/Core/View/Base/UnitButtonView.swift b/Core/Core/View/Base/UnitButtonView.swift
index 5dfc96775..6e39ff997 100644
--- a/Core/Core/View/Base/UnitButtonView.swift
+++ b/Core/Core/View/Base/UnitButtonView.swift
@@ -109,9 +109,9 @@ public struct UnitButtonView: View {
                             } else {
                                 CoreAssets.arrowLeft.swiftUIImage.renderingMode(.template)
                                     .padding(.leading, 20)
-                                    .foregroundColor(Theme.Colors.accentColor)
+                                    .foregroundColor(Theme.Colors.secondaryButtonTextColor)
                                 Text(type.stringValue())
-                                    .foregroundColor(Theme.Colors.accentColor)
+                                    .foregroundColor(Theme.Colors.secondaryButtonTextColor)
                                     .font(Theme.Fonts.labelLarge)
                                     .padding(.trailing, 20)
                             }
diff --git a/Core/Core/View/Base/VideoDownloadQualityView.swift b/Core/Core/View/Base/VideoDownloadQualityView.swift
index 6ffa52466..7585d4c57 100644
--- a/Core/Core/View/Base/VideoDownloadQualityView.swift
+++ b/Core/Core/View/Base/VideoDownloadQualityView.swift
@@ -112,7 +112,7 @@ public struct SettingsCell: View {
                 .accessibilityIdentifier("video_quality_title_text")
             if let description {
                 Text(description)
-                    .font(Theme.Fonts.labelMedium)
+                    .font(Theme.Fonts.bodySmall)
                     .foregroundColor(Theme.Colors.textSecondary)
                     .accessibilityIdentifier("video_quality_des_text")
             }
diff --git a/Core/Core/View/Base/WebBrowser.swift b/Core/Core/View/Base/WebBrowser.swift
index 776c14733..8f441bacd 100644
--- a/Core/Core/View/Base/WebBrowser.swift
+++ b/Core/Core/View/Base/WebBrowser.swift
@@ -54,7 +54,11 @@ public struct WebBrowser: View {
                 leftButtonAction: { presentationMode.wrappedValue.dismiss() }
             )
             WebView(
-                viewModel: .init(url: url, baseURL: ""),
+                viewModel: .init(
+                    url: url,
+                    baseURL: "",
+                    injections: [.colorInversionCss]
+                ),
                 isLoading: $isLoading,
                 refreshCookies: {}
             )
diff --git a/Course/Course/Presentation/Outline/CourseStructure/CourseStructureNestedListView.swift b/Course/Course/Presentation/Outline/CourseStructure/CourseStructureNestedListView.swift
index a868c19fa..e057b3b7c 100644
--- a/Course/Course/Presentation/Outline/CourseStructure/CourseStructureNestedListView.swift
+++ b/Course/Course/Presentation/Outline/CourseStructure/CourseStructureNestedListView.swift
@@ -50,8 +50,8 @@ struct CourseStructureNestedListView: View {
                 .lineLimit(1)
                 .foregroundColor(Theme.Colors.textPrimary)
             Spacer()
-            Image(systemName: "chevron.down")
-                .foregroundColor(Theme.Colors.accentColor)
+            Image(systemName: "chevron.down").renderingMode(.template)
+                .foregroundColor(Theme.Colors.accentXColor)
                 .dropdownArrowRotationAnimation(value: isExpanded)
         }
         .padding(.horizontal, 30)
diff --git a/Course/Course/Presentation/Subviews/CourseVideoDownloadBarView/CourseVideoDownloadBarView.swift b/Course/Course/Presentation/Subviews/CourseVideoDownloadBarView/CourseVideoDownloadBarView.swift
index 600b565da..f99f17ca6 100644
--- a/Course/Course/Presentation/Subviews/CourseVideoDownloadBarView/CourseVideoDownloadBarView.swift
+++ b/Course/Course/Presentation/Subviews/CourseVideoDownloadBarView/CourseVideoDownloadBarView.swift
@@ -131,7 +131,7 @@ struct CourseVideoDownloadBarView: View {
 
     private var toggle: some View {
         Toggle("", isOn: .constant(viewModel.isOn))
-            .toggleStyle(SwitchToggleStyle(tint: Theme.Colors.accentColor))
+            .toggleStyle(SwitchToggleStyle(tint: Theme.Colors.toggleSwitchColor))
             .padding(.trailing, 15)
             .onTapGesture {
                 if !viewModel.isInternetAvaliable {
diff --git a/Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownList.swift b/Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownList.swift
index f48b7159c..d7e1a2836 100644
--- a/Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownList.swift
+++ b/Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownList.swift
@@ -36,7 +36,8 @@ struct CourseUnitDropDownList<Content>: View where Content: View {
         .background(Theme.Colors.background)
         .clipShape(RoundedRectangle(cornerRadius: 10))
         .frame(height: scrollViewHeight)
-        .shadow(radius: 4)
+        .shadow(color: Theme.Colors.textSecondary, radius: 4)
+
     }
 }
 
diff --git a/Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownTitle.swift b/Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownTitle.swift
index 79b1e193f..93a666bcc 100644
--- a/Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownTitle.swift
+++ b/Course/Course/Presentation/Unit/Subviews/DropdownList/CourseUnitDropDownTitle.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import Theme
 
 struct CourseUnitDropDownTitle: View {
     var title: String
@@ -23,9 +24,12 @@ struct CourseUnitDropDownTitle: View {
                     Text(title)
                         .opacity(showDropdown ? 0.7 : 1.0)
                         .lineLimit(1)
+                        .font(Theme.Fonts.bodyMedium)
+                        .foregroundColor(Theme.Colors.textPrimary)
                     if isAvailable {
-                        Image(systemName: "chevron.down")
+                        Image(systemName: "chevron.down").renderingMode(.template)
                             .dropdownArrowRotationAnimation(value: showDropdown)
+                            .foregroundColor(Theme.Colors.textPrimary)
                     }
                 }
             }
diff --git a/Discovery/Discovery/Presentation/NativeDiscovery/DiscoveryView.swift b/Discovery/Discovery/Presentation/NativeDiscovery/DiscoveryView.swift
index 2b857e0af..973271ecc 100644
--- a/Discovery/Discovery/Presentation/NativeDiscovery/DiscoveryView.swift
+++ b/Discovery/Discovery/Presentation/NativeDiscovery/DiscoveryView.swift
@@ -56,6 +56,7 @@ public struct DiscoveryView: View {
                 // MARK: - Search fake field
                 HStack(spacing: 11) {
                     Image(systemName: "magnifyingglass")
+                        .foregroundColor(Theme.Colors.textSecondary)
                         .padding(.leading, 16)
                         .padding(.top, 1)
                         .accessibilityIdentifier("search_image")
diff --git a/Discovery/Discovery/Presentation/NativeDiscovery/SearchView.swift b/Discovery/Discovery/Presentation/NativeDiscovery/SearchView.swift
index a494ee1ec..2fe227582 100644
--- a/Discovery/Discovery/Presentation/NativeDiscovery/SearchView.swift
+++ b/Discovery/Discovery/Presentation/NativeDiscovery/SearchView.swift
@@ -36,6 +36,7 @@ public struct SearchView: View {
                 
                 HStack(spacing: 11) {
                     Image(systemName: "magnifyingglass")
+                        .foregroundColor(Theme.Colors.textPrimary)
                         .padding(.leading, 16)
                         .padding(.top, 1)
                         .foregroundColor(
@@ -59,6 +60,7 @@ public struct SearchView: View {
                             self.focused = true
                         }
                     .foregroundColor(Theme.Colors.textPrimary)
+                    .font(Theme.Fonts.bodyLarge)
                     .accessibilityIdentifier("search_textfields")
                     Spacer()
                     if !viewModel.searchText.trimmingCharacters(in: .whitespaces).isEmpty {
diff --git a/Discovery/Discovery/Presentation/WebPrograms/ProgramWebviewView.swift b/Discovery/Discovery/Presentation/WebPrograms/ProgramWebviewView.swift
index d5a1b4f8f..099846af3 100644
--- a/Discovery/Discovery/Presentation/WebPrograms/ProgramWebviewView.swift
+++ b/Discovery/Discovery/Presentation/WebPrograms/ProgramWebviewView.swift
@@ -58,7 +58,8 @@ public struct ProgramWebviewView: View {
                 WebView(
                     viewModel: .init(
                         url: URLString,
-                        baseURL: ""
+                        baseURL: "",
+                        injections: [.colorInversionCss]
                     ),
                     isLoading: $isLoading,
                     refreshCookies: {
diff --git a/Discussion/Discussion/Domain/Model/DiscussionPost.swift b/Discussion/Discussion/Domain/Model/DiscussionPost.swift
index 398b0888f..e73bc686c 100644
--- a/Discussion/Discussion/Domain/Model/DiscussionPost.swift
+++ b/Discussion/Discussion/Domain/Model/DiscussionPost.swift
@@ -25,9 +25,9 @@ public enum PostType: String, Codable {
     public func getImage() -> Image {
         switch self {
         case .question:
-            return CoreAssets.question.swiftUIImage
+            return CoreAssets.question.swiftUIImage.renderingMode(.template)
         case .discussion:
-            return CoreAssets.discussion.swiftUIImage
+            return CoreAssets.discussion.swiftUIImage.renderingMode(.template)
         }
     }
 }
diff --git a/Discussion/Discussion/Presentation/Comments/Base/CommentCell.swift b/Discussion/Discussion/Presentation/Comments/Base/CommentCell.swift
index acfb41b5a..ff11baedd 100644
--- a/Discussion/Discussion/Presentation/Comments/Base/CommentCell.swift
+++ b/Discussion/Discussion/Presentation/Comments/Base/CommentCell.swift
@@ -98,8 +98,9 @@ public struct CommentCell: View {
                             Text(url.absoluteString)
                             .multilineTextAlignment(.leading)
                         }
-                    }.foregroundColor(Theme.Colors.accentColor)
-                        .font(Theme.Fonts.bodyMedium)
+                    }
+                    .foregroundColor(Theme.Colors.accentColor)
+                    .font(Theme.Fonts.bodyMedium)
                 }
             }
             
@@ -132,8 +133,9 @@ public struct CommentCell: View {
                             Image(systemName: "message.fill")
                             Text("\(comment.responsesCount)")
                             Text(DiscussionLocalization.commentsCount(comment.responsesCount))
-                        }.foregroundColor(Theme.Colors.textSecondary)
-                            .font(Theme.Fonts.labelLarge)
+                        }
+                        .foregroundColor(Theme.Colors.textSecondary)
+                        .font(Theme.Fonts.labelLarge)
                 }
             }.foregroundColor(Theme.Colors.accentColor)
                 .font(Theme.Fonts.labelMedium)
diff --git a/Discussion/Discussion/Presentation/Comments/Base/ParentCommentView.swift b/Discussion/Discussion/Presentation/Comments/Base/ParentCommentView.swift
index 15ced3ce7..821e8a342 100644
--- a/Discussion/Discussion/Presentation/Comments/Base/ParentCommentView.swift
+++ b/Discussion/Discussion/Presentation/Comments/Base/ParentCommentView.swift
@@ -53,10 +53,11 @@ public struct ParentCommentView: View {
                 VStack(alignment: .leading) {
                     Text(comments.authorName)
                         .font(Theme.Fonts.titleMedium)
+                        .foregroundColor(Theme.Colors.textPrimary)
                     Text(comments.postDate
                         .dateToString(style: .lastPost))
                     .font(Theme.Fonts.labelSmall)
-                    .foregroundColor(Theme.Colors.textSecondary)
+                    .foregroundColor(Theme.Colors.textSecondaryLight)
                 }
                 Spacer()
                 if isThread {
@@ -67,15 +68,18 @@ public struct ParentCommentView: View {
                         Text(comments.followed
                              ? DiscussionLocalization.Comment.unfollow
                              : DiscussionLocalization.Comment.follow)
+                        .font(Theme.Fonts.bodyMedium)
                     }).foregroundColor(comments.followed
                                        ? Theme.Colors.accentColor
-                                       : Theme.Colors.textSecondary)
+                                       : Theme.Colors.textSecondaryLight)
                 }
             }.padding(.top, 31)
             Text(comments.postTitle)
                 .font(Theme.Fonts.titleLarge)
+                .foregroundColor(Theme.Colors.textPrimary)
             Text(comments.postBodyHtml.hideHtmlTagsAndUrls())
                 .font(Theme.Fonts.bodyMedium)
+                .foregroundColor(Theme.Colors.textPrimary)
                 .fixedSize(horizontal: false, vertical: true)
                 .padding(.bottom, 8)
             ForEach(Array(comments.postBody.extractURLs().enumerated()), id: \.offset) { _, url in
@@ -89,12 +93,12 @@ public struct ParentCommentView: View {
                     }
                 } else {
                     HStack {
-                        Image(systemName: "globe")
+                        Image(systemName: "globe").renderingMode(.template)
                         Link(destination: url) {
                             Text(url.absoluteString)
                             .multilineTextAlignment(.leading)
                         }
-                    }.foregroundColor(Theme.Colors.accentColor)
+                    }.foregroundColor(Theme.Colors.accentXColor)
                         .font(Theme.Fonts.bodyMedium)
                 }
             }
@@ -106,11 +110,13 @@ public struct ParentCommentView: View {
                     ? CoreAssets.voted.swiftUIImage
                     : CoreAssets.vote.swiftUIImage
                     Text("\(comments.votesCount)")
+                        .foregroundColor(Theme.Colors.textPrimary)
                     Text(DiscussionLocalization.votesCount(comments.votesCount))
                         .font(Theme.Fonts.labelLarge)
+                        .foregroundColor(Theme.Colors.textPrimary)
                 }).foregroundColor(comments.voted
                                    ? Theme.Colors.accentColor
-                                   : Theme.Colors.textSecondary)
+                                   : Theme.Colors.textSecondaryLight)
                 Spacer()
                 Button(action: {
                     onReportTap()
@@ -125,7 +131,7 @@ public struct ParentCommentView: View {
             }
             .accentColor(comments.abuseFlagged
                 ? Theme.Colors.alert
-                         : Theme.Colors.textSecondary)
+                         : Theme.Colors.textSecondaryLight)
                 .font(Theme.Fonts.labelLarge)
                 .padding(.top, 8)
         }
diff --git a/Discussion/Discussion/Presentation/Comments/Responses/ResponsesView.swift b/Discussion/Discussion/Presentation/Comments/Responses/ResponsesView.swift
index 9ccb56e34..34069c0b4 100644
--- a/Discussion/Discussion/Presentation/Comments/Responses/ResponsesView.swift
+++ b/Discussion/Discussion/Presentation/Comments/Responses/ResponsesView.swift
@@ -45,7 +45,7 @@ public struct ResponsesView: View {
                             viewModel.comments = []
                             _ = await viewModel.getComments(
                                 commentID: commentID,
-                                parentComment: parentComment, 
+                                parentComment: parentComment,
                                 page: 1
                             )
                         }) {
@@ -87,10 +87,12 @@ public struct ResponsesView: View {
                                         Text("\(viewModel.itemsCount)")
                                         Text(DiscussionLocalization.commentsCount(viewModel.itemsCount))
                                         Spacer()
-                                    }.padding(.top, 40)
-                                        .padding(.bottom, 14)
-                                        .padding(.leading, 24)
-                                        .font(Theme.Fonts.titleMedium)
+                                    }
+                                    .padding(.top, 40)
+                                    .padding(.bottom, 14)
+                                    .padding(.leading, 24)
+                                    .font(Theme.Fonts.titleMedium)
+                                    .foregroundColor(Theme.Colors.textPrimary)
                                     ForEach(
                                         Array(comments.comments.enumerated()), id: \.offset
                                     ) { index, comment in
diff --git a/Discussion/Discussion/Presentation/Comments/Thread/ThreadView.swift b/Discussion/Discussion/Presentation/Comments/Thread/ThreadView.swift
index 2249cf192..b004ec6ed 100644
--- a/Discussion/Discussion/Presentation/Comments/Thread/ThreadView.swift
+++ b/Discussion/Discussion/Presentation/Comments/Thread/ThreadView.swift
@@ -42,7 +42,7 @@ public struct ThreadView: View {
                                 if let comments = viewModel.postComments {
                                     ParentCommentView(
                                         comments: comments,
-                                        isThread: true, 
+                                        isThread: true,
                                         onAvatarTap: { username in
                                             viewModel.router.showUserDetails(username: username)
                                         },
@@ -86,10 +86,12 @@ public struct ThreadView: View {
                                         Text("\(viewModel.itemsCount)")
                                         Text(DiscussionLocalization.responsesCount(viewModel.itemsCount))
                                         Spacer()
-                                    }.padding(.top, 40)
-                                        .padding(.bottom, 14)
-                                        .padding(.leading, 24)
-                                        .font(Theme.Fonts.titleMedium)
+                                    }
+                                    .padding(.top, 40)
+                                    .padding(.bottom, 14)
+                                    .padding(.leading, 24)
+                                    .font(Theme.Fonts.titleMedium)
+                                    .foregroundColor(Theme.Colors.textPrimary)
                                     
                                     ForEach(Array(comments.comments.enumerated()), id: \.offset) { index, comment in
                                         CommentCell(
diff --git a/Discussion/Discussion/Presentation/CreateNewThread/CreateNewThreadView.swift b/Discussion/Discussion/Presentation/CreateNewThread/CreateNewThreadView.swift
index f6f6a0dc4..6fe53baea 100644
--- a/Discussion/Discussion/Presentation/CreateNewThread/CreateNewThreadView.swift
+++ b/Discussion/Discussion/Presentation/CreateNewThread/CreateNewThreadView.swift
@@ -37,8 +37,6 @@ public struct CreateNewThreadView: View {
         Task {
             await viewModel.getTopics(courseID: courseID)
         }
-        UISegmentedControl.appearance().selectedSegmentTintColor = UIColor(Theme.Colors.accentColor)
-        UISegmentedControl.appearance().setTitleTextAttributes([.foregroundColor: Theme.Colors.white.uiColor()], for: .selected)
     }
     
     public var body: some View {
@@ -65,6 +63,7 @@ public struct CreateNewThreadView: View {
                             Picker("", selection: $postType) {
                                 ForEach(postTypes, id: \.self) {
                                     Text($0.localizedValue.capitalized)
+                                        .font(Theme.Fonts.bodySmall)
                                 }
                             }.pickerStyle(.segmented)
                                 .frame(maxWidth: .infinity, maxHeight: 40)
@@ -72,6 +71,7 @@ public struct CreateNewThreadView: View {
                             // MARK: Topic picker
                             Group {
                                 Text(DiscussionLocalization.CreateThread.topic)
+                                    .foregroundColor(Theme.Colors.textPrimary)
                                     .font(Theme.Fonts.titleSmall)
                                     .padding(.top, 16)
                                 
@@ -88,6 +88,7 @@ public struct CreateNewThreadView: View {
                                         Text(viewModel.allTopics.first(where: {
                                             $0.id == viewModel.selectedTopic })?.name ?? "")
                                         .font(Theme.Fonts.labelLarge)
+                                        .foregroundColor(Theme.Colors.textPrimary)
                                         .frame(height: 40, alignment: .leading)
                                         Spacer()
                                         Image(systemName: "chevron.down")
@@ -108,10 +109,12 @@ public struct CreateNewThreadView: View {
                             Group {
                                 Text(DiscussionLocalization.CreateThread.title)
                                     .font(Theme.Fonts.titleSmall)
-                                + Text(" *").foregroundColor(.red)
+                                    .foregroundColor(Theme.Colors.textPrimary)
+                                + Text(" *").foregroundColor(Theme.Colors.alert)
                             }.padding(.top, 16)
                             TextField("", text: $postTitle)
-                                .font(Theme.Fonts.labelLarge)
+                                .font(Theme.Fonts.bodyLarge)
+                                .foregroundColor(Theme.Colors.textPrimary)
                                 .padding(14)
                                 .frame(height: 40)
                                 .background(
@@ -129,10 +132,12 @@ public struct CreateNewThreadView: View {
                             Group {
                                 Text("\(postType.localizedValue.capitalized)")
                                     .font(Theme.Fonts.titleSmall)
-                                + Text(" *").foregroundColor(.red)
+                                    .foregroundColor(Theme.Colors.textPrimary)
+                                + Text(" *").foregroundColor(Theme.Colors.alert)
                             }.padding(.top, 16)
                             TextEditor(text: $postBody)
-                                .font(Theme.Fonts.labelLarge)
+                                .font(Theme.Fonts.bodyMedium)
+                                .foregroundColor(Theme.Colors.textPrimary)
                                 .padding(.horizontal, 10)
                                 .padding(.vertical, 10)
                                 .frame(height: 200)
diff --git a/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionSearchTopicsView.swift b/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionSearchTopicsView.swift
index 8091016fe..6deb26098 100644
--- a/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionSearchTopicsView.swift
+++ b/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionSearchTopicsView.swift
@@ -31,6 +31,7 @@ public struct DiscussionSearchTopicsView: View {
                 .padding(.bottom, -7)
                 HStack(spacing: 11) {
                     Image(systemName: "magnifyingglass")
+                        .foregroundColor(Theme.Colors.textPrimary)
                         .padding(.leading, 16)
                         .padding(.top, -1)
                         .foregroundColor(
@@ -52,6 +53,7 @@ public struct DiscussionSearchTopicsView: View {
                             self.focused = true
                         }
                     .foregroundColor(Theme.Colors.textPrimary)
+                    .font(Theme.Fonts.bodyMedium)
                     Spacer()
                     if !viewModel.searchText.trimmingCharacters(in: .whitespaces).isEmpty {
                         Button(action: { viewModel.searchText.removeAll() }, label: {
diff --git a/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionTopicsView.swift b/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionTopicsView.swift
index e242b58d9..c5d84f55c 100644
--- a/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionTopicsView.swift
+++ b/Discussion/Discussion/Presentation/DiscussionTopics/DiscussionTopicsView.swift
@@ -28,10 +28,12 @@ public struct DiscussionTopicsView: View {
                 // MARK: - Search fake field
                 HStack(spacing: 11) {
                     Image(systemName: "magnifyingglass")
+                        .foregroundColor(Theme.Colors.textSecondary)
                         .padding(.leading, 16)
                         .padding(.top, 1)
                     Text(DiscussionLocalization.Topics.search)
                         .foregroundColor(Theme.Colors.textSecondary)
+                        .font(Theme.Fonts.bodyMedium)
                     Spacer()
                 }
                 .frame(maxWidth: 532)
@@ -77,9 +79,11 @@ public struct DiscussionTopicsView: View {
                                             }, label: {
                                                 VStack {
                                                     Spacer(minLength: 0)
-                                                    CoreAssets.allPosts.swiftUIImage
+                                                    CoreAssets.allPosts.swiftUIImage.renderingMode(.template)
+                                                        .foregroundColor(Theme.Colors.textPrimary)
                                                     Text(allTopics.name)
                                                         .font(Theme.Fonts.titleSmall)
+                                                        .foregroundColor(Theme.Colors.textPrimary)
                                                     Spacer(minLength: 0)
                                                 }
                                                 .frame(maxWidth: .infinity)
@@ -93,9 +97,11 @@ public struct DiscussionTopicsView: View {
                                             }, label: {
                                                 VStack(alignment: .center) {
                                                     Spacer(minLength: 0)
-                                                    CoreAssets.followed.swiftUIImage
+                                                    CoreAssets.followed.swiftUIImage.renderingMode(.template)
+                                                        .foregroundColor(Theme.Colors.textPrimary)
                                                     Text(followed.name)
                                                         .font(Theme.Fonts.titleSmall)
+                                                        .foregroundColor(Theme.Colors.textPrimary)
                                                     Spacer(minLength: 0)
                                                 }
                                                 .frame(maxWidth: .infinity)
diff --git a/Discussion/Discussion/Presentation/Posts/PostsView.swift b/Discussion/Discussion/Presentation/Posts/PostsView.swift
index ab24def7c..5b3da4cfb 100644
--- a/Discussion/Discussion/Presentation/Posts/PostsView.swift
+++ b/Discussion/Discussion/Presentation/Posts/PostsView.swift
@@ -293,6 +293,7 @@ public struct PostCell: View {
             VStack(alignment: .leading, spacing: 8) {
                 HStack(spacing: 4) {
                     post.type.getImage()
+                        .foregroundColor(Theme.Colors.accentColor)
                     Text(post.type.localizedValue.capitalized)
                     Spacer()
                     if post.unreadCommentCount - 1 > 0 {
diff --git a/OpenEdX.xcodeproj/project.pbxproj b/OpenEdX.xcodeproj/project.pbxproj
index a7084fabf..b1557b530 100644
--- a/OpenEdX.xcodeproj/project.pbxproj
+++ b/OpenEdX.xcodeproj/project.pbxproj
@@ -43,7 +43,7 @@
 		07A7D79028F5C9060000BE81 /* Core.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 07A7D78E28F5C9060000BE81 /* Core.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		07D5DA3528D075AA00752FD9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D5DA3428D075AA00752FD9 /* AppDelegate.swift */; };
 		07D5DA3E28D075AB00752FD9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 07D5DA3D28D075AB00752FD9 /* Assets.xcassets */; };
-		07D5DA4128D075AB00752FD9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 07D5DA3F28D075AB00752FD9 /* LaunchScreen.storyboard */; };
+		149FF39E2B9F1AB50034B33F /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 149FF39C2B9F1AB50034B33F /* LaunchScreen.storyboard */; };
 		95C140F3BDF778364986E83B /* Pods_App_OpenEdX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F138C15C3A2515F8F94DAA8B /* Pods_App_OpenEdX.framework */; };
 		A500668B2B613ED10024680B /* PushNotificationsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A500668A2B613ED10024680B /* PushNotificationsManager.swift */; };
 		A500668D2B6143000024680B /* FCMProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = A500668C2B6143000024680B /* FCMProvider.swift */; };
@@ -125,8 +125,8 @@
 		07D5DA3128D075AA00752FD9 /* OpenEdX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenEdX.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		07D5DA3428D075AA00752FD9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		07D5DA3D28D075AB00752FD9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
-		07D5DA4028D075AB00752FD9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		1499CCAD7A0D8A3E6AF39794 /* Pods-App-OpenEdX.debugprod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-OpenEdX.debugprod.xcconfig"; path = "Target Support Files/Pods-App-OpenEdX/Pods-App-OpenEdX.debugprod.xcconfig"; sourceTree = "<group>"; };
+		149FF39D2B9F1AB50034B33F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		6F54C19C823A769E18923FA8 /* Pods-App-OpenEdX.debugstage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-OpenEdX.debugstage.xcconfig"; path = "Target Support Files/Pods-App-OpenEdX/Pods-App-OpenEdX.debugstage.xcconfig"; sourceTree = "<group>"; };
 		8284179FC05AEE2591573E20 /* Pods-App-OpenEdX.debugdev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-OpenEdX.debugdev.xcconfig"; path = "Target Support Files/Pods-App-OpenEdX/Pods-App-OpenEdX.debugdev.xcconfig"; sourceTree = "<group>"; };
 		A24D6A8E1BC4DF46AD68904C /* Pods-App-OpenEdX.releaseprod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-OpenEdX.releaseprod.xcconfig"; path = "Target Support Files/Pods-App-OpenEdX/Pods-App-OpenEdX.releaseprod.xcconfig"; sourceTree = "<group>"; };
@@ -235,7 +235,7 @@
 				0727878C28D347B2002E9142 /* View */,
 				0770DE1A28D084BC006D8A5D /* DI */,
 				07D5DA3D28D075AB00752FD9 /* Assets.xcassets */,
-				07D5DA3F28D075AB00752FD9 /* LaunchScreen.storyboard */,
+				149FF39C2B9F1AB50034B33F /* LaunchScreen.storyboard */,
 				02450ABD29C35FF20094E2D0 /* Info.plist */,
 				02ED50DA29A66007008341CD /* languages.json */,
 				02ED50D629A6554E008341CD /* сountries.json */,
@@ -446,10 +446,10 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				07D5DA4128D075AB00752FD9 /* LaunchScreen.storyboard in Resources */,
 				02ED50D429A6554E008341CD /* сountries.json in Resources */,
 				02ED50D829A66007008341CD /* languages.json in Resources */,
 				0770DE6428D0BCC7006D8A5D /* Localizable.strings in Resources */,
+				149FF39E2B9F1AB50034B33F /* LaunchScreen.storyboard in Resources */,
 				07D5DA3E28D075AB00752FD9 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -606,10 +606,10 @@
 			name = Localizable.strings;
 			sourceTree = "<group>";
 		};
-		07D5DA3F28D075AB00752FD9 /* LaunchScreen.storyboard */ = {
+		149FF39C2B9F1AB50034B33F /* LaunchScreen.storyboard */ = {
 			isa = PBXVariantGroup;
 			children = (
-				07D5DA4028D075AB00752FD9 /* Base */,
+				149FF39D2B9F1AB50034B33F /* Base */,
 			);
 			name = LaunchScreen.storyboard;
 			sourceTree = "<group>";
diff --git a/OpenEdX/AppDelegate.swift b/OpenEdX/AppDelegate.swift
index 1f71d7209..59138b48c 100644
--- a/OpenEdX/AppDelegate.swift
+++ b/OpenEdX/AppDelegate.swift
@@ -48,6 +48,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         window = UIWindow(frame: UIScreen.main.bounds)
         window?.rootViewController = RouteController()
         window?.makeKeyAndVisible()
+        window?.tintColor = Theme.UIColors.accentColor
         
         NotificationCenter.default.addObserver(
             self,
diff --git a/Theme/Theme/Assets.xcassets/Colors/SplashBackground.colorset/Contents.json b/OpenEdX/Assets.xcassets/SplashBackground.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/Colors/SplashBackground.colorset/Contents.json
rename to OpenEdX/Assets.xcassets/SplashBackground.colorset/Contents.json
diff --git a/OpenEdX/Assets.xcassets/appLogo.imageset/Contents.json b/OpenEdX/Assets.xcassets/appLogo.imageset/Contents.json
index 54aff84e1..c0e621b99 100644
--- a/OpenEdX/Assets.xcassets/appLogo.imageset/Contents.json
+++ b/OpenEdX/Assets.xcassets/appLogo.imageset/Contents.json
@@ -1,10 +1,20 @@
 {
   "images" : [
-    {
-      "filename" : "Group 21.svg",
-      "idiom" : "universal"
-    }
-  ],
+      {
+        "filename" : "appLogo.svg",
+        "idiom" : "universal"
+      },
+      {
+        "appearances" : [
+          {
+            "appearance" : "luminosity",
+            "value" : "dark"
+          }
+        ],
+        "filename" : "appLogo-light.svg",
+        "idiom" : "universal"
+      }
+    ],
   "info" : {
     "author" : "xcode",
     "version" : 1
diff --git a/OpenEdX/Assets.xcassets/appLogo.imageset/Group 21.svg b/OpenEdX/Assets.xcassets/appLogo.imageset/appLogo-light.svg
similarity index 100%
rename from OpenEdX/Assets.xcassets/appLogo.imageset/Group 21.svg
rename to OpenEdX/Assets.xcassets/appLogo.imageset/appLogo-light.svg
diff --git a/OpenEdX/Assets.xcassets/appLogo.imageset/appLogo.svg b/OpenEdX/Assets.xcassets/appLogo.imageset/appLogo.svg
new file mode 100644
index 000000000..0bc57dd59
--- /dev/null
+++ b/OpenEdX/Assets.xcassets/appLogo.imageset/appLogo.svg
@@ -0,0 +1,21 @@
+<svg width="121" height="121" viewBox="0 0 121 121" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="121" height="121" rx="30" fill="url(#paint0_linear_2077_15146)"/>
+<path d="M59.4111 29.3889C60.1602 29.0025 61.0505 29.0025 61.7996 29.3889L101.56 49.8932C103.414 50.8493 103.447 53.4876 101.616 54.4889L61.8556 76.2359C61.0766 76.6621 60.1341 76.6621 59.3548 76.2359L19.5947 54.4889C17.7642 53.4876 17.7964 50.8496 19.6508 49.8932L59.4111 29.3889Z" fill="url(#paint1_linear_2077_15146)"/>
+<path d="M59.2726 40.3405C60.0402 39.9204 60.96 39.9204 61.7276 40.3405L83.896 52.4794C84.7509 52.9474 85.2851 53.8639 85.2851 54.8616V78.7617C85.2851 79.7594 84.7509 80.6759 83.896 81.1439L61.7276 93.2828C60.96 93.7029 60.0402 93.7029 59.2726 93.2828L37.1043 81.1439C36.2494 80.6759 35.7151 79.7594 35.7151 78.7617V54.8616C35.7151 53.8639 36.2494 52.9474 37.1043 52.4794L59.2726 40.3405Z" fill="url(#paint2_linear_2077_15146)"/>
+<path d="M102.495 52.8462V79.8474" stroke="#3686DB"/>
+<path d="M102.495 82.4501C103.484 82.4501 104.286 81.649 104.286 80.6608C104.286 79.6727 103.484 78.8716 102.495 78.8716C101.506 78.8716 100.705 79.6727 100.705 80.6608C100.705 81.649 101.506 82.4501 102.495 82.4501Z" fill="#3686DB"/>
+<defs>
+<linearGradient id="paint0_linear_2077_15146" x1="116.844" y1="129.005" x2="16.7799" y2="-1.24829e-06" gradientUnits="userSpaceOnUse">
+<stop stop-color="#E9EDF3"/>
+<stop offset="1" stop-color="white"/>
+</linearGradient>
+<linearGradient id="paint1_linear_2077_15146" x1="65.546" y1="23.2426" x2="83.6792" y2="83.1882" gradientUnits="userSpaceOnUse">
+<stop stop-color="#53B4EB"/>
+<stop offset="1" stop-color="#256AD1"/>
+</linearGradient>
+<linearGradient id="paint2_linear_2077_15146" x1="33.3637" y1="39.6681" x2="49.0592" y2="103.115" gradientUnits="userSpaceOnUse">
+<stop stop-color="#75B5D9" stop-opacity="0.3"/>
+<stop offset="1" stop-color="#5099EE" stop-opacity="0.5"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/OpenEdX/Info.plist b/OpenEdX/Info.plist
index dfb2fae04..dc623f961 100644
--- a/OpenEdX/Info.plist
+++ b/OpenEdX/Info.plist
@@ -8,6 +8,8 @@
 	<false/>
 	<key>FirebaseAutomaticScreenReportingEnabled</key>
 	<false/>
+	<key>FirebaseCrashlyticsCollectionEnabled</key>
+	<true/>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
@@ -29,7 +31,5 @@
 	<array/>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
 	<true/>
-	<key>FirebaseCrashlyticsCollectionEnabled</key>
-	<true/>
 </dict>
 </plist>
diff --git a/OpenEdX/View/MainScreenView.swift b/OpenEdX/View/MainScreenView.swift
index 1d0c1a2f6..b3895ab1d 100644
--- a/OpenEdX/View/MainScreenView.swift
+++ b/OpenEdX/View/MainScreenView.swift
@@ -34,9 +34,14 @@ struct MainScreenView: View {
     init(viewModel: MainScreenViewModel) {
         self.viewModel = viewModel
         UITabBar.appearance().isTranslucent = false
-        UITabBar.appearance().barTintColor = UIColor(Theme.Colors.textInputUnfocusedBackground)
-        UITabBar.appearance().backgroundColor = UIColor(Theme.Colors.textInputUnfocusedBackground)
+        UITabBar.appearance().barTintColor = UIColor(Theme.Colors.tabbarColor)
+        UITabBar.appearance().backgroundColor = UIColor(Theme.Colors.tabbarColor)
         UITabBar.appearance().unselectedItemTintColor = UIColor(Theme.Colors.textSecondaryLight)
+        
+        UITabBarItem.appearance().setTitleTextAttributes(
+            [NSAttributedString.Key.font: Theme.UIFonts.labelSmall()],
+            for: .normal
+        )
     }
     
     var body: some View {
@@ -170,7 +175,7 @@ struct MainScreenView: View {
                 await viewModel.prefetchDataForOffline()
             }
         }
-        .accentColor(Theme.Colors.accentColor)
+        .accentColor(Theme.Colors.accentXColor)
     }
     
     private func titleBar() -> String {
diff --git a/Profile/Profile/Presentation/DeleteAccount/DeleteAccountView.swift b/Profile/Profile/Presentation/DeleteAccount/DeleteAccountView.swift
index 67967fb2f..2373b01b8 100644
--- a/Profile/Profile/Presentation/DeleteAccount/DeleteAccountView.swift
+++ b/Profile/Profile/Presentation/DeleteAccount/DeleteAccountView.swift
@@ -107,6 +107,7 @@ public struct DeleteAccountView: View {
                                 try await viewModel.deleteAccount(password: viewModel.password)
                             }
                         }, color: Theme.Colors.accentColor,
+                                     textColor: Theme.Colors.primaryButtonTextColor,
                                      isActive: viewModel.password.count >= 2)
                         .padding(.top, 18)
                         .accessibilityIdentifier("delete_account_button")
@@ -119,18 +120,18 @@ public struct DeleteAccountView: View {
                         HStack(spacing: 9) {
                             CoreAssets.arrowRight16.swiftUIImage.renderingMode(.template)
                                 .rotationEffect(Angle(degrees: 180))
-                                .foregroundColor(Theme.Colors.accentColor)
+                                .foregroundColor(Theme.Colors.secondaryButtonTextColor)
                             Text(ProfileLocalization.DeleteAccount.backToProfile)
                                 .font(Theme.Fonts.labelLarge)
-                                .foregroundColor(Theme.Colors.accentColor)
+                                .foregroundColor(Theme.Colors.secondaryButtonTextColor)
                         }
                     })
-                    .padding(.top, 35)
+                    .padding(.top, 5)
                     .accessibilityIdentifier("back_button")
                     .frame(maxWidth: .infinity, minHeight: 42)
                     .background(
                         Theme.Shapes.buttonShape
-                            .fill(Theme.Colors.white)
+                            .fill(.clear)
                     )
                     .overlay(
                         Theme.Shapes.buttonShape
diff --git a/Profile/Profile/Presentation/EditProfile/EditProfileView.swift b/Profile/Profile/Presentation/EditProfile/EditProfileView.swift
index ce7861ed3..56914aeff 100644
--- a/Profile/Profile/Presentation/EditProfile/EditProfileView.swift
+++ b/Profile/Profile/Presentation/EditProfile/EditProfileView.swift
@@ -48,9 +48,9 @@ public struct EditProfileView: View {
                             .overlay(
                                 ZStack {
                                     Circle().frame(width: 36, height: 36)
-                                        .foregroundColor(Theme.Colors.accentColor)
+                                        .foregroundColor(Theme.Colors.accentXColor)
                                     CoreAssets.addPhoto.swiftUIImage.renderingMode(.template)
-                                        .foregroundColor(Theme.Colors.white)
+                                        .foregroundColor(Theme.Colors.primaryButtonTextColor)
                                 }.offset(x: 36, y: 50)
                             )
                     })
@@ -87,6 +87,8 @@ public struct EditProfileView: View {
                                     .font(Theme.Fonts.titleMedium)
                                     .accessibilityIdentifier("about_text")
                                 TextEditor(text: $viewModel.profileChanges.shortBiography)
+                                    .font(Theme.Fonts.bodyMedium)
+                                    .foregroundColor(Theme.Colors.textPrimary)
                                     .padding(.horizontal, 12)
                                     .padding(.vertical, 4)
                                     .frame(height: 200)
diff --git a/Profile/Profile/Presentation/EditProfile/ProfileBottomSheet.swift b/Profile/Profile/Presentation/EditProfile/ProfileBottomSheet.swift
index e6779c0ef..36e5ead52 100644
--- a/Profile/Profile/Presentation/EditProfile/ProfileBottomSheet.swift
+++ b/Profile/Profile/Presentation/EditProfile/ProfileBottomSheet.swift
@@ -125,7 +125,8 @@ struct ProfileBottomSheet: View {
             HStack(alignment: .center) {
                 switch type {
                 case .gallery:
-                    CoreAssets.gallery.swiftUIImage
+                    CoreAssets.gallery.swiftUIImage.renderingMode(.template)
+                        .foregroundColor(Theme.Colors.primaryButtonTextColor)
                 case .remove:
                     CoreAssets.removePhoto.swiftUIImage
                 case .cancel:
@@ -194,7 +195,7 @@ extension ProfileBottomSheet {
         func textColor() -> Color {
             switch self {
             case .gallery:
-                return Theme.Colors.white
+                return Theme.Colors.primaryButtonTextColor
             case .remove:
                 return Theme.Colors.alert
             case .cancel:
diff --git a/Profile/Profile/Presentation/Profile/ProfileView.swift b/Profile/Profile/Presentation/Profile/ProfileView.swift
index aba4352f4..c1e3499c0 100644
--- a/Profile/Profile/Presentation/Profile/ProfileView.swift
+++ b/Profile/Profile/Presentation/Profile/ProfileView.swift
@@ -108,6 +108,7 @@ public struct ProfileView: View {
                     .accessibilityIdentifier("user_avatar_image")
                 Text(viewModel.userModel?.name ?? "")
                     .font(Theme.Fonts.headlineSmall)
+                    .foregroundColor(Theme.Colors.textPrimary)
                     .padding(.top, 20)
                     .accessibilityIdentifier("user_name_text")
                 Text("@\(viewModel.userModel?.username ?? "")")
@@ -146,13 +147,15 @@ public struct ProfileView: View {
                                 .foregroundColor(Theme.Colors.textSecondary)
                                 .accessibilityIdentifier("yob_text")
                             Text(String(viewModel.userModel?.yearOfBirth ?? 0))
+                                .foregroundColor(Theme.Colors.textPrimary)
                                 .accessibilityIdentifier("yob_value_text")
                         }
+                        .font(Theme.Fonts.titleMedium)
                     }
                     if let bio = viewModel.userModel?.shortBiography, bio != "" {
                         HStack(alignment: .top) {
                             Text(ProfileLocalization.bio + " ")
-                                .foregroundColor(Theme.Colors.textSecondary)
+                                .foregroundColor(Theme.Colors.textPrimary)
                             + Text(bio)
                         }
                         .accessibilityIdentifier("bio_text")
@@ -192,6 +195,7 @@ public struct ProfileView: View {
             }, label: {
                 HStack {
                     Text(ProfileLocalization.settingsVideo)
+                        .font(Theme.Fonts.titleMedium)
                     Spacer()
                     Image(systemName: "chevron.right")
                 }
diff --git a/Profile/Profile/Presentation/Profile/Subviews/ProfileSupportInfoView.swift b/Profile/Profile/Presentation/Profile/Subviews/ProfileSupportInfoView.swift
index 51c68156f..134b38536 100644
--- a/Profile/Profile/Presentation/Profile/Subviews/ProfileSupportInfoView.swift
+++ b/Profile/Profile/Presentation/Profile/Subviews/ProfileSupportInfoView.swift
@@ -114,6 +114,8 @@ struct ProfileSupportInfoView: View {
             HStack {
                 Text(viewModel.title)
                     .multilineTextAlignment(.leading)
+                    .font(Theme.Fonts.titleMedium)
+                    .foregroundColor(Theme.Colors.textPrimary)
                 Spacer()
                 Image(systemName: "chevron.right")
             }
@@ -142,6 +144,8 @@ struct ProfileSupportInfoView: View {
         } label: {
             HStack {
                 Text(linkViewModel.title)
+                    .foregroundColor(Theme.Colors.textPrimary)
+                    .font(Theme.Fonts.titleMedium)
                 Spacer()
                 Image(systemName: "chevron.right")
             }
@@ -169,6 +173,7 @@ struct ProfileSupportInfoView: View {
                                 .frame(width: 24, height: 24)
                         }
                         Text("\(ProfileLocalization.Settings.version) \(viewModel.currentVersion)")
+                            .font(Theme.Fonts.titleMedium)
                     }
                     switch viewModel.versionState {
                     case .actual:
@@ -197,7 +202,6 @@ struct ProfileSupportInfoView: View {
                         .frame(width: 24, height: 24)
                         .foregroundStyle(Theme.Colors.accentColor)
                 }
-
             }
         })
         .disabled(viewModel.versionState == .actual)
diff --git a/Profile/Profile/Presentation/Profile/UserProfile/UserProfileView.swift b/Profile/Profile/Presentation/Profile/UserProfile/UserProfileView.swift
index 870060a77..905f03681 100644
--- a/Profile/Profile/Presentation/Profile/UserProfile/UserProfileView.swift
+++ b/Profile/Profile/Presentation/Profile/UserProfile/UserProfileView.swift
@@ -50,6 +50,7 @@ public struct UserProfileView: View {
                                 Text(ProfileLocalization.info)
                                     .padding(.horizontal, 24)
                                     .font(Theme.Fonts.labelLarge)
+                                    .foregroundColor(Theme.Colors.textSecondary)
                                 
                                 VStack(alignment: .leading, spacing: 16) {
                                     if viewModel.userModel?.yearOfBirth != 0 {
diff --git a/Profile/Profile/Presentation/Settings/SettingsView.swift b/Profile/Profile/Presentation/Settings/SettingsView.swift
index 7dc184467..e695b0c88 100644
--- a/Profile/Profile/Presentation/Settings/SettingsView.swift
+++ b/Profile/Profile/Presentation/Settings/SettingsView.swift
@@ -38,7 +38,7 @@ public struct SettingsView: View {
                                 description: ProfileLocalization.Settings.wifiDescription
                             )
                             Toggle(isOn: $viewModel.wifiOnly, label: {})
-                                .toggleStyle(SwitchToggleStyle(tint: Theme.Colors.accentColor))
+                                .toggleStyle(SwitchToggleStyle(tint: Theme.Colors.toggleSwitchColor))
                                 .frame(width: 50)
                                 .accessibilityIdentifier("download_agreement_switch")
                         }.foregroundColor(Theme.Colors.textPrimary)
@@ -156,7 +156,7 @@ public struct SettingsCell: View {
                 .accessibilityIdentifier("video_settings_text")
             if let description {
                 Text(description)
-                    .font(Theme.Fonts.labelMedium)
+                    .font(Theme.Fonts.bodySmall)
                     .foregroundColor(Theme.Colors.textSecondary)
                     .accessibilityIdentifier("video_settings_sub_text")
             }
diff --git a/Theme/Theme/Assets.xcassets/CourseDates/Contents.json b/Theme/Theme/Assets.xcassets/Colors/CourseDates/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/CourseDates/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/CourseDates/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/CourseDates/DatesSectionBackground.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/CourseDates/DatesSectionBackground.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/CourseDates/DatesSectionBackground.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/CourseDates/DatesSectionBackground.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/CourseDates/DatesSectionStroke.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/CourseDates/DatesSectionStroke.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/CourseDates/DatesSectionStroke.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/CourseDates/DatesSectionStroke.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/CourseDates/NextWeekTimelineColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/CourseDates/NextWeekTimelineColor.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/CourseDates/NextWeekTimelineColor.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/CourseDates/NextWeekTimelineColor.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/CourseDates/ThisWeekTimelineColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/CourseDates/ThisWeekTimelineColor.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/CourseDates/ThisWeekTimelineColor.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/CourseDates/ThisWeekTimelineColor.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/CourseDates/TodayTimelineColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/CourseDates/TodayTimelineColor.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/CourseDates/TodayTimelineColor.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/CourseDates/TodayTimelineColor.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/CourseDates/UpcomingTimelineColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/CourseDates/UpcomingTimelineColor.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/CourseDates/UpcomingTimelineColor.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/CourseDates/UpcomingTimelineColor.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/CourseDates/pastDueTimelineColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/CourseDates/pastDueTimelineColor.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/CourseDates/pastDueTimelineColor.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/CourseDates/pastDueTimelineColor.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/Colors/PrimaryButtonTextColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/PrimaryButtonTextColor.colorset/Contents.json
new file mode 100644
index 000000000..22c4bb0a8
--- /dev/null
+++ b/Theme/Theme/Assets.xcassets/Colors/PrimaryButtonTextColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Theme/Theme/Assets.xcassets/ProgressLine/Contents.json b/Theme/Theme/Assets.xcassets/Colors/ProgressLine/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/ProgressLine/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/ProgressLine/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/ProgressLine/OnProgress.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/ProgressLine/OnProgress.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/ProgressLine/OnProgress.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/ProgressLine/OnProgress.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/ProgressLine/ProgressDone.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/ProgressLine/ProgressDone.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/ProgressLine/ProgressDone.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/ProgressLine/ProgressDone.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/ProgressLine/ProgressSkip.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/ProgressLine/ProgressSkip.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/ProgressLine/ProgressSkip.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/ProgressLine/ProgressSkip.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/ProgressLine/SelectedAndDone.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/ProgressLine/SelectedAndDone.colorset/Contents.json
similarity index 100%
rename from Theme/Theme/Assets.xcassets/ProgressLine/SelectedAndDone.colorset/Contents.json
rename to Theme/Theme/Assets.xcassets/Colors/ProgressLine/SelectedAndDone.colorset/Contents.json
diff --git a/Theme/Theme/Assets.xcassets/Colors/TabbarColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/TabbarColor.colorset/Contents.json
new file mode 100644
index 000000000..2d9b9cd70
--- /dev/null
+++ b/Theme/Theme/Assets.xcassets/Colors/TabbarColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.984",
+          "green" : "0.980",
+          "red" : "0.976"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "display-p3",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.275",
+          "green" : "0.200",
+          "red" : "0.153"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Theme/Theme/Assets.xcassets/Colors/ToggleSwitchColor.colorset/Contents.json b/Theme/Theme/Assets.xcassets/Colors/ToggleSwitchColor.colorset/Contents.json
new file mode 100644
index 000000000..00d59cb46
--- /dev/null
+++ b/Theme/Theme/Assets.xcassets/Colors/ToggleSwitchColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "0.408",
+          "red" : "0.235"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.976",
+          "green" : "0.471",
+          "red" : "0.329"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Theme/Theme/Assets.xcassets/appLogoLight.imageset/Contents.json b/Theme/Theme/Assets.xcassets/appLogoLight.imageset/Contents.json
deleted file mode 100644
index 0c3881647..000000000
--- a/Theme/Theme/Assets.xcassets/appLogoLight.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "filename" : "appLogoWhite.svg",
-      "idiom" : "universal",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
diff --git a/Theme/Theme/Assets.xcassets/appLogoLight.imageset/appLogoWhite.svg b/Theme/Theme/Assets.xcassets/appLogoLight.imageset/appLogoWhite.svg
deleted file mode 100644
index 5a2d136db..000000000
--- a/Theme/Theme/Assets.xcassets/appLogoLight.imageset/appLogoWhite.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="171" height="48" viewBox="0 0 171 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20.6077 0C9.24426 0 0 9.3704 0 20.8889V39.3145C0 40.3096 0.592957 41.2112 1.50184 41.5906C1.80317 41.7187 2.11909 41.7778 2.43016 41.7778C3.06199 41.7778 3.68411 41.5265 4.1507 41.0585L15.2371 29.8209C16.8798 30.9047 18.8385 31.5353 20.943 31.5353C26.7317 31.5353 31.4462 26.7614 31.4462 20.8889C31.4462 15.0164 26.7365 10.2425 20.943 10.2425C15.1495 10.2425 10.4399 15.0164 10.4399 20.8889C10.4399 22.8448 10.9649 24.6774 11.8786 26.2589L4.8603 33.368V20.8889C4.8603 12.085 11.9272 4.92662 20.6077 4.92662C29.2882 4.92662 36.355 12.09 36.355 20.8889C36.355 29.6878 29.2882 36.8511 20.6077 36.8511C19.169 36.8511 17.7401 36.654 16.3646 36.2649C15.0718 35.9004 13.7303 36.6639 13.3707 37.9744C13.011 39.2849 13.7644 40.6446 15.0572 41.0092C16.8555 41.5166 18.7219 41.7778 20.6077 41.7778C31.9711 41.7778 41.2154 32.4074 41.2154 20.8889C41.2154 9.3704 31.9711 0 20.6077 0ZM20.9382 15.1691C24.0488 15.1691 26.581 17.7358 26.581 20.8889C26.581 24.042 24.0488 26.6087 20.9382 26.6087C17.8276 26.6087 15.2954 24.042 15.2954 20.8889C15.2954 17.7358 17.8276 15.1691 20.9382 15.1691Z" fill="white"/>
-<path d="M54.3693 33.7777V4.65771H62.5378C65.4053 4.65771 67.8388 5.09771 69.8382 5.97772C71.8376 6.83105 73.4555 7.99105 74.692 9.45772C75.9284 10.8977 76.8229 12.511 77.3753 14.2977C77.9541 16.0577 78.2435 17.831 78.2435 19.6177C78.2435 21.8044 77.862 23.7644 77.0991 25.4977C76.3362 27.231 75.297 28.7244 73.9816 29.9777C72.6663 31.2044 71.1404 32.151 69.4041 32.8177C67.6941 33.4577 65.8657 33.7777 63.919 33.7777H54.3693ZM58.9863 29.2977H63.0903C64.6161 29.2977 66.0104 29.0844 67.2732 28.6577C68.536 28.2044 69.6277 27.5644 70.5485 26.7377C71.4956 25.8844 72.219 24.831 72.7189 23.5777C73.245 22.3244 73.5081 20.8977 73.5081 19.2977C73.5081 17.4844 73.2056 15.9377 72.6005 14.6577C72.0217 13.351 71.2456 12.2977 70.2723 11.4977C69.3252 10.671 68.286 10.071 67.1548 9.69771C66.0236 9.32438 64.9055 9.13771 63.8006 9.13771H58.9863V29.2977ZM90.5757 34.2177C88.6026 34.2177 86.9192 33.831 85.5249 33.0577C84.1306 32.2844 83.0652 31.2177 82.3286 29.8577C81.5919 28.471 81.2236 26.911 81.2236 25.1777C81.2236 23.471 81.6446 21.9377 82.4864 20.5777C83.3282 19.2177 84.4595 18.1377 85.8801 17.3377C87.327 16.511 88.9183 16.0977 90.6546 16.0977C92.9434 16.0977 94.8244 16.7777 96.2976 18.1377C97.7971 19.471 98.7968 21.3644 99.2967 23.8177L85.8406 28.4177L84.8146 25.8977L95.3111 22.0977L94.4034 22.6177C94.114 21.8177 93.6405 21.1244 92.9828 20.5377C92.3514 19.951 91.457 19.6577 90.2994 19.6577C89.3787 19.6577 88.5631 19.8844 87.8532 20.3377C87.1429 20.7644 86.5772 21.3777 86.1563 22.1777C85.7617 22.951 85.5644 23.871 85.5644 24.9377C85.5644 26.031 85.788 26.991 86.2352 27.8177C86.6825 28.6444 87.2876 29.2844 88.0505 29.7377C88.813 30.1644 89.6812 30.3777 90.6546 30.3777C91.3386 30.3777 91.9963 30.2577 92.6277 30.0177C93.259 29.7777 93.851 29.4577 94.4034 29.0577L96.416 32.3777C95.5478 32.9377 94.5876 33.3911 93.5353 33.7377C92.5093 34.0577 91.5227 34.2177 90.5757 34.2177ZM107.781 34.1377C106.518 34.1377 105.308 33.911 104.15 33.4577C103.019 33.0044 102.059 32.3377 101.27 31.4577L103.164 28.9377C103.901 29.6577 104.624 30.191 105.334 30.5377C106.071 30.8577 106.768 31.0177 107.426 31.0177C107.926 31.0177 108.373 30.9644 108.767 30.8577C109.188 30.7244 109.517 30.5244 109.754 30.2577C110.017 29.991 110.149 29.6311 110.149 29.1777C110.149 28.6444 109.964 28.231 109.596 27.9377C109.228 27.6177 108.754 27.3644 108.176 27.1777C107.597 26.9644 106.992 26.7644 106.36 26.5777C104.913 26.1244 103.835 25.4577 103.124 24.5777C102.414 23.6977 102.059 22.6844 102.059 21.5377C102.059 20.6577 102.283 19.8177 102.73 19.0177C103.177 18.191 103.861 17.511 104.782 16.9777C105.703 16.4444 106.86 16.1777 108.254 16.1777C109.517 16.1777 110.609 16.3244 111.53 16.6177C112.477 16.8844 113.358 17.351 114.174 18.0177L112.477 20.6977C112.003 20.2444 111.438 19.8977 110.78 19.6577C110.149 19.391 109.57 19.2444 109.044 19.2177C108.57 19.191 108.149 19.2577 107.781 19.4177C107.413 19.551 107.11 19.751 106.873 20.0177C106.663 20.2844 106.558 20.591 106.558 20.9377C106.531 21.471 106.702 21.8977 107.071 22.2177C107.465 22.5377 107.965 22.791 108.57 22.9777C109.175 23.1644 109.78 23.3644 110.385 23.5777C111.201 23.8177 111.924 24.151 112.556 24.5777C113.187 25.0044 113.674 25.5244 114.016 26.1377C114.384 26.7244 114.568 27.4577 114.568 28.3377C114.568 29.351 114.318 30.311 113.819 31.2177C113.319 32.0977 112.569 32.8044 111.569 33.3377C110.57 33.871 109.307 34.1377 107.781 34.1377ZM118.578 16.8577H122.998V33.7777H118.578V16.8577ZM118.381 10.8177C118.381 10.1244 118.644 9.55105 119.17 9.09771C119.723 8.64438 120.315 8.41772 120.946 8.41772C121.578 8.41772 122.143 8.64438 122.643 9.09771C123.169 9.55105 123.432 10.1244 123.432 10.8177C123.432 11.511 123.169 12.0844 122.643 12.5377C122.143 12.9644 121.578 13.1777 120.946 13.1777C120.315 13.1777 119.723 12.951 119.17 12.4977C118.644 12.0444 118.381 11.4844 118.381 10.8177ZM136.51 42.2177C135.142 42.2177 133.971 42.0577 132.998 41.7377C132.024 41.4177 131.156 40.9911 130.393 40.4577C129.657 39.951 128.959 39.4177 128.302 38.8577L130.906 35.7777C131.669 36.4977 132.472 37.0977 133.313 37.5777C134.182 38.0577 135.221 38.2977 136.431 38.2977C137.509 38.2977 138.443 38.1111 139.233 37.7377C140.048 37.3644 140.68 36.8444 141.127 36.1777C141.574 35.511 141.811 34.7111 141.837 33.7777V29.5777L142.113 30.4177C141.666 31.4577 140.851 32.351 139.667 33.0977C138.483 33.8444 137.01 34.2177 135.247 34.2177C133.721 34.2177 132.314 33.831 131.025 33.0577C129.736 32.2577 128.71 31.1777 127.947 29.8177C127.184 28.4577 126.802 26.9244 126.802 25.2177C126.802 23.4577 127.197 21.8977 127.986 20.5377C128.802 19.151 129.867 18.071 131.182 17.2977C132.524 16.4977 133.945 16.0977 135.444 16.0977C136.918 16.0977 138.22 16.3644 139.351 16.8977C140.509 17.431 141.377 18.0977 141.955 18.8977L141.719 19.5377L142.192 16.8577H146.257V33.8577C146.257 35.431 145.836 36.8444 144.994 38.0977C144.178 39.3777 143.034 40.3777 141.561 41.0977C140.114 41.8444 138.43 42.2177 136.51 42.2177ZM131.261 25.0977C131.261 26.111 131.485 27.031 131.932 27.8577C132.406 28.6844 133.037 29.3377 133.826 29.8177C134.642 30.2977 135.55 30.5377 136.549 30.5377C137.417 30.5377 138.193 30.391 138.877 30.0977C139.588 29.8044 140.193 29.391 140.693 28.8577C141.219 28.3244 141.6 27.6977 141.837 26.9777V23.2977C141.6 22.5777 141.219 21.9644 140.693 21.4577C140.193 20.9244 139.588 20.511 138.877 20.2177C138.193 19.9244 137.417 19.7777 136.549 19.7777C135.55 19.7777 134.642 20.0044 133.826 20.4577C133.037 20.911 132.406 21.5377 131.932 22.3377C131.485 23.1377 131.261 24.0577 131.261 25.0977ZM155.455 16.8577L155.849 20.4977L155.692 20.0177C156.27 18.8444 157.125 17.911 158.257 17.2177C159.414 16.4977 160.782 16.1377 162.361 16.1377C163.939 16.1377 165.241 16.6044 166.267 17.5377C167.293 18.471 167.819 19.6977 167.846 21.2177V33.7777H163.426V22.8177C163.4 21.9644 163.163 21.2844 162.716 20.7777C162.269 20.2444 161.558 19.9644 160.585 19.9377C159.69 19.9377 158.888 20.2177 158.178 20.7777C157.467 21.311 156.902 22.0577 156.481 23.0177C156.086 23.951 155.889 25.031 155.889 26.2577V33.7777H151.469V16.8577H155.455Z" fill="white"/>
-</svg>
diff --git a/Theme/Theme/SwiftGen/ThemeAssets.swift b/Theme/Theme/SwiftGen/ThemeAssets.swift
index 19d67ddf2..7c25fd7b6 100644
--- a/Theme/Theme/SwiftGen/ThemeAssets.swift
+++ b/Theme/Theme/SwiftGen/ThemeAssets.swift
@@ -36,8 +36,20 @@ public enum ThemeAssets {
   public static let cardViewStroke = ColorAsset(name: "CardViewStroke")
   public static let certificateForeground = ColorAsset(name: "CertificateForeground")
   public static let commentCellBackground = ColorAsset(name: "CommentCellBackground")
+  public static let datesSectionBackground = ColorAsset(name: "DatesSectionBackground")
+  public static let datesSectionStroke = ColorAsset(name: "DatesSectionStroke")
+  public static let nextWeekTimelineColor = ColorAsset(name: "NextWeekTimelineColor")
+  public static let thisWeekTimelineColor = ColorAsset(name: "ThisWeekTimelineColor")
+  public static let todayTimelineColor = ColorAsset(name: "TodayTimelineColor")
+  public static let upcomingTimelineColor = ColorAsset(name: "UpcomingTimelineColor")
+  public static let pastDueTimelineColor = ColorAsset(name: "pastDueTimelineColor")
   public static let loginBackground = ColorAsset(name: "LoginBackground")
   public static let loginNavigationText = ColorAsset(name: "LoginNavigationText")
+  public static let primaryButtonTextColor = ColorAsset(name: "PrimaryButtonTextColor")
+  public static let onProgress = ColorAsset(name: "OnProgress")
+  public static let progressDone = ColorAsset(name: "ProgressDone")
+  public static let progressSkip = ColorAsset(name: "ProgressSkip")
+  public static let selectedAndDone = ColorAsset(name: "SelectedAndDone")
   public static let secondaryButtonBorderColor = ColorAsset(name: "SecondaryButtonBorderColor")
   public static let secondaryButtonTextColor = ColorAsset(name: "SecondaryButtonTextColor")
   public static let shadowColor = ColorAsset(name: "ShadowColor")
@@ -45,9 +57,9 @@ public enum ThemeAssets {
   public static let snackbarInfoColor = ColorAsset(name: "SnackbarInfoColor")
   public static let snackbarTextColor = ColorAsset(name: "SnackbarTextColor")
   public static let snackbarWarningColor = ColorAsset(name: "SnackbarWarningColor")
-  public static let splashBackground = ColorAsset(name: "SplashBackground")
   public static let styledButtonText = ColorAsset(name: "StyledButtonText")
   public static let success = ColorAsset(name: "Success")
+  public static let tabbarColor = ColorAsset(name: "TabbarColor")
   public static let textPrimary = ColorAsset(name: "TextPrimary")
   public static let textSecondary = ColorAsset(name: "TextSecondary")
   public static let textSecondaryLight = ColorAsset(name: "TextSecondaryLight")
@@ -55,22 +67,11 @@ public enum ThemeAssets {
   public static let textInputStroke = ColorAsset(name: "TextInputStroke")
   public static let textInputUnfocusedBackground = ColorAsset(name: "TextInputUnfocusedBackground")
   public static let textInputUnfocusedStroke = ColorAsset(name: "TextInputUnfocusedStroke")
+  public static let toggleSwitchColor = ColorAsset(name: "ToggleSwitchColor")
   public static let navigationBarTintColor = ColorAsset(name: "navigationBarTintColor")
   public static let warning = ColorAsset(name: "warning")
   public static let white = ColorAsset(name: "white")
-  public static let datesSectionBackground = ColorAsset(name: "DatesSectionBackground")
-  public static let datesSectionStroke = ColorAsset(name: "DatesSectionStroke")
-  public static let nextWeekTimelineColor = ColorAsset(name: "NextWeekTimelineColor")
-  public static let thisWeekTimelineColor = ColorAsset(name: "ThisWeekTimelineColor")
-  public static let todayTimelineColor = ColorAsset(name: "TodayTimelineColor")
-  public static let upcomingTimelineColor = ColorAsset(name: "UpcomingTimelineColor")
-  public static let pastDueTimelineColor = ColorAsset(name: "pastDueTimelineColor")
-  public static let onProgress = ColorAsset(name: "OnProgress")
-  public static let progressDone = ColorAsset(name: "ProgressDone")
-  public static let progressSkip = ColorAsset(name: "ProgressSkip")
-  public static let selectedAndDone = ColorAsset(name: "SelectedAndDone")
   public static let appLogo = ImageAsset(name: "appLogo")
-  public static let appLogoLight = ImageAsset(name: "appLogoLight")
 }
 // swiftlint:enable identifier_name line_length nesting type_body_length type_name
 
diff --git a/Theme/Theme/Theme.swift b/Theme/Theme/Theme.swift
index ec48bcad6..ef1055734 100644
--- a/Theme/Theme/Theme.swift
+++ b/Theme/Theme/Theme.swift
@@ -56,6 +56,9 @@ public struct Theme {
         public private(set) static var secondaryButtonBorderColor = ThemeAssets.secondaryButtonBorderColor.swiftUIColor
         public private(set) static var secondaryButtonTextColor = ThemeAssets.secondaryButtonTextColor.swiftUIColor
         public private(set) static var success = ThemeAssets.success.swiftUIColor
+        public private(set) static var tabbarColor = ThemeAssets.tabbarColor.swiftUIColor
+        public private(set) static var primaryButtonTextColor = ThemeAssets.primaryButtonTextColor.swiftUIColor
+        public private(set) static var toggleSwitchColor = ThemeAssets.toggleSwitchColor.swiftUIColor
 
         public static func update(
             accentColor: Color = ThemeAssets.accentColor.swiftUIColor,
@@ -95,7 +98,10 @@ public struct Theme {
             navigationBarTintColor: Color = ThemeAssets.navigationBarTintColor.swiftUIColor,
             secondaryButtonBorderColor: Color = ThemeAssets.secondaryButtonBorderColor.swiftUIColor,
             secondaryButtonTextColor: Color = ThemeAssets.secondaryButtonTextColor.swiftUIColor,
-            success: Color = ThemeAssets.success.swiftUIColor
+            success: Color = ThemeAssets.success.swiftUIColor,
+            tabbarColor: Color = ThemeAssets.tabbarColor.swiftUIColor,
+            primaryButtonTextColor: Color = ThemeAssets.primaryButtonTextColor.swiftUIColor,
+            toggleSwitchColor: Color = ThemeAssets.toggleSwitchColor.swiftUIColor
         ) {
             self.accentColor = accentColor
             self.accentXColor = accentXColor
@@ -135,6 +141,9 @@ public struct Theme {
             self.secondaryButtonBorderColor = secondaryButtonBorderColor
             self.secondaryButtonTextColor = secondaryButtonTextColor
             self.success = success
+            self.tabbarColor = tabbarColor
+            self.primaryButtonTextColor = primaryButtonTextColor
+            self.toggleSwitchColor = toggleSwitchColor
         }
     }
     
@@ -181,6 +190,32 @@ public struct Theme {
         public static let labelSmall: Font = .custom(fontsParser.fontName(for: .regular), size: 10)
     }
     
+    public struct UIFonts {
+        public static func labelSmall() -> UIFont {
+            guard let font = UIFont(name: fontsParser.fontName(for: .regular), size: 10) else {
+                assert(false, "Could not find the required font")
+            }
+            
+            return font
+        }
+        
+        public static func labelLarge() -> UIFont {
+            guard let font = UIFont(name: fontsParser.fontName(for: .regular), size: 14) else {
+                assert(false, "Could not find the required font")
+            }
+            
+            return font
+        }
+        
+        public static func titleMedium() -> UIFont {
+            guard let font = UIFont(name: fontsParser.fontName(for: .semiBold), size: 18) else {
+                assert(false, "Could not find the required font")
+            }
+            
+            return font
+        }
+    }
+    
     public struct Shapes {
         public static var isRoundedCorners: Bool = true
         public static let screenBackgroundRadius = 24.0
diff --git a/WhatsNew/WhatsNew/Presentation/Elements/PageControl.swift b/WhatsNew/WhatsNew/Presentation/Elements/PageControl.swift
index 92ce5a1ae..8bdef4535 100644
--- a/WhatsNew/WhatsNew/Presentation/Elements/PageControl.swift
+++ b/WhatsNew/WhatsNew/Presentation/Elements/PageControl.swift
@@ -18,7 +18,7 @@ struct PageControl: View {
             ForEach(0 ..< numberOfPages) { page in
                 RoundedRectangle(cornerRadius: 4)
                     .frame(width: page == currentPage ? 24 : 8, height: 8)
-                    .foregroundColor(page == currentPage ? Theme.Colors.accentXColor : Theme.Colors.textInputStroke)
+                    .foregroundColor(page == currentPage ? Theme.Colors.accentXColor : Theme.Colors.textSecondaryLight)
             }
         }
     }