diff --git a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
index d21559dd..1b9626bf 100644
--- a/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
+++ b/app/src/main/java/org/mian/gitnex/activities/MainActivity.java
@@ -12,7 +12,6 @@ import android.widget.TextView;
 import androidx.activity.EdgeToEdge;
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
-import androidx.core.view.WindowCompat;
 import androidx.navigation.NavController;
 import androidx.navigation.NavOptions;
 import androidx.navigation.fragment.NavHostFragment;
@@ -45,7 +44,6 @@ import org.mian.gitnex.helpers.AppUtil;
 import org.mian.gitnex.helpers.ChangeLog;
 import org.mian.gitnex.helpers.TinyDB;
 import org.mian.gitnex.helpers.Toasty;
-import org.mian.gitnex.structs.BottomSheetListener;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -60,7 +58,6 @@ public class MainActivity extends BaseActivity
 	private TinyDB tinyDB;
 	private NavController navController;
 	private boolean noConnection;
-	private BottomSheetListener profileInitListener;
 	public static boolean refActivity;
 	public static boolean reloadRepos;
 	public static boolean closeActivity;
@@ -81,9 +78,6 @@ public class MainActivity extends BaseActivity
 		super.onCreate(savedInstanceState);
 		EdgeToEdge.enable(this);
 
-		WindowCompat.setDecorFitsSystemWindows(getWindow(), false);
-		getWindow().setStatusBarColor(getResources().getColor(R.color.colorPrimary, getTheme()));
-
 		binding = ActivityMainBinding.inflate(getLayoutInflater());
 		setContentView(binding.getRoot());
 		tinyDB = TinyDB.getInstance(this);
@@ -183,9 +177,6 @@ public class MainActivity extends BaseActivity
 					public void onUserInfoLoaded(
 							String username, boolean isAdmin, String serverVersion) {
 						tinyDB.putString("username", username);
-						if (profileInitListener != null) {
-							profileInitListener.onButtonClicked(null);
-						}
 					}
 
 					@Override
@@ -267,9 +258,6 @@ public class MainActivity extends BaseActivity
 						public void onUserInfoLoaded(
 								String username, boolean isAdmin, String serverVersion) {
 							tinyDB.putString("username", username);
-							if (profileInitListener != null) {
-								profileInitListener.onButtonClicked(null);
-							}
 						}
 
 						@Override
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bc4811c5..4ca86e82 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -53,7 +53,7 @@
         android:id="@+id/bottom_navigation"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="?attr/primaryBackgroundColor"
+        app:backgroundTint="?attr/navigationBarColor"
         app:menu="@menu/bottom_nav_menu"
         app:labelVisibilityMode="labeled"
         app:itemIconTint="?attr/iconsColor"
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 0d2c4cc4..00000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/themes.xml b/app/src/main/res/values-v23/themes.xml
deleted file mode 100644
index a68cbeaf..00000000
--- a/app/src/main/res/values-v23/themes.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- Light theme -->
-    <style name="AppThemeLight" parent="Theme.Material3.Light.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:typeface">monospace</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textColorSecondary">@color/lightThemeTextColor</item>
-        <item name="colorPrimary">@color/darkGreen</item>
-        <item name="colorSecondary">@color/lightThemeTextColor</item>
-        <item name="colorOnSurfaceVariant">@color/lightThemeTextColor</item>
-        <item name="colorSecondaryContainer">@color/lightThemeColorSecondaryContainer</item>
-        <item name="materialCardBackgroundColor">@color/lightThemeCardBackground</item>
-
-        <item name="diffAddedColor">@color/lightThemeDiffAddedColor</item>
-        <item name="diffRemovedColor">@color/lightThemeDiffRemovedColor</item>
-        <item name="diffSelectedColor">@color/lightThemeDiffSelectedColor</item>
-        <item name="primaryTextColor">@color/lightThemeTextColor</item>
-        <item name="primaryBackgroundColor">@color/lightThemeBackground</item>
-        <item name="inputBackgroundColor">@color/lightThemeInputBackground</item>
-        <item name="inputSelectedColor">@color/lightThemInputSelected</item>
-        <item name="inputTextColor">@color/lightThemeInputTextColor</item>
-        <item name="checkboxStyle">@style/AppThemeLightCheckBoxStyle</item>
-        <item name="selectedTextColor">@color/darkGreen</item>
-        <item name="alertDialogTheme">@style/AppThemeLightConfirmDialog</item>
-        <item name="popupMenuStyle">@style/AppThemeLightPopupMenuStyle</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
-        <item name="autoCompleteTextViewStyle">@style/AppThemeLightSearchAutoCompleteTextView</item>
-        <item name="hintColor">@color/hintColor</item>
-        <item name="colorControlActivated">@color/darkGreen</item>
-        <item name="dividerColor">@color/lightThemeDividerColor</item>
-        <item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
-        <item name="searchViewStyle">@style/AppSearchViewStyle</item>
-        <item name="progressIndicatorColor">@color/darkGreen</item>
-        <item name="fabColor">@color/darkGreen</item>
-        <item name="iconsColor">@color/darkGreen</item>
-        <item name="pagerTabIndicatorColor">@color/darkGreen</item>
-        <item name="android:actionOverflowButtonStyle">@style/customOverflowButtonStyle</item>
-        <item name="actionOverflowMenuStyle">@style/customOverflowMenuStyle</item>
-        <item name="colorSurface">@color/lightThemeInputBackground</item>
-        <item name="shapeAppearanceSmallComponent">@style/inputsMaterialComponentCorner</item>
-        <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
-        <item name="chipStyle">@style/CustomChipFilter</item>
-        <item name="isDark">0</item>
-    </style>
-    <!-- Light theme -->
-
-    <!-- Retro theme -->
-    <style name="AppThemeRetro" parent="Theme.Material3.Light.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:typeface">monospace</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textColorSecondary">@color/retroThemeTextColor</item>
-        <item name="android:textColorPrimary">@color/retroThemeTextColor</item>
-        <item name="colorPrimary">@color/retroThemeColorPrimary</item>
-        <item name="colorSecondary">@color/retroThemeColorSecondary</item>
-        <item name="colorOnSurfaceVariant">@color/retroThemeTextColor</item>
-        <item name="materialCardBackgroundColor">@color/retroThemeCardBackground</item>
-
-        <item name="diffAddedColor">@color/retroThemeDiffAddedColor</item>
-        <item name="diffRemovedColor">@color/retroThemeDiffRemovedColor</item>
-        <item name="diffSelectedColor">@color/retroThemeDiffSelectedColor</item>
-        <item name="primaryTextColor">@color/retroThemeTextColor</item>
-        <item name="primaryBackgroundColor">@color/retroThemeBackground</item>
-        <item name="inputBackgroundColor">@color/retroThemeInputBackground</item>
-        <item name="inputSelectedColor">@color/retroThemeInputSelected</item>
-        <item name="inputTextColor">@color/retroThemeInputTextColor</item>
-        <item name="checkboxStyle">@style/AppThemeRetroCheckBoxStyle</item>
-        <item name="selectedTextColor">@color/retroThemeColorPrimary</item>
-        <item name="alertDialogTheme">@style/AppThemeRetroConfirmDialog</item>
-        <item name="popupMenuStyle">@style/AppThemeRetroPopupMenuStyle</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
-        <item name="autoCompleteTextViewStyle">@style/AppThemeRetroSearchAutoCompleteTextView</item>
-        <item name="hintColor">@color/hintColor</item>
-        <item name="colorControlActivated">@color/retroThemeColorPrimary</item>
-        <item name="dividerColor">@color/retroThemeDividerColor</item>
-        <item name="bottomSheetDialogTheme">@style/AppThemeLightBottomSheetDialog</item>
-        <item name="searchViewStyle">@style/AppSearchViewStyle</item>
-        <item name="progressIndicatorColor">@color/retroThemeColorPrimary</item>
-        <item name="fabColor">@color/retroThemeColorPrimary</item>
-        <item name="iconsColor">@color/retroThemeColorPrimary</item>
-        <item name="pagerTabIndicatorColor">@color/retroThemeColorPrimary</item>
-        <item name="android:actionOverflowButtonStyle">@style/customOverflowButtonStyle</item>
-        <item name="actionOverflowMenuStyle">@style/customOverflowMenuStyle</item>
-        <item name="colorSurface">@color/retroThemeInputBackground</item>
-        <item name="shapeAppearanceSmallComponent">@style/inputsMaterialComponentCorner</item>
-        <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
-        <item name="chipStyle">@style/CustomChipFilter</item>
-        <item name="isDark">0</item>
-    </style>
-    <!-- Retro theme -->
-
-    <!-- Codeberg dark theme -->
-    <style name="AppThemeCodebergDark" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:typeface">monospace</item>
-        <item name="colorAccent">@color/colorAccent</item>
-        <item name="android:textColorSecondary">@color/codebergDarkThemeTextColor</item>
-        <item name="android:textColorPrimary">@color/codebergDarkThemeTextColor</item>
-        <item name="colorPrimary">@color/codebergDarkColorPrimary</item>
-        <item name="colorSecondary">@color/codebergDarkThemeTextColor</item>
-        <item name="colorOnSurfaceVariant">@color/codebergDarkThemeTextColor</item>
-        <item name="colorSecondaryContainer">@color/codebergDarkThemeColorSecondary</item>
-        <item name="materialCardBackgroundColor">@color/codebergDarkThemeCardBackground</item>
-
-        <item name="diffAddedColor">@color/diffAddedColor</item>
-        <item name="diffRemovedColor">@color/diffRemovedColor</item>
-        <item name="diffSelectedColor">@color/diffSelectedColor</item>
-        <item name="primaryTextColor">@color/codebergDarkThemeTextColor</item>
-        <item name="primaryBackgroundColor">@color/codebergDarkThemeBackground</item>
-        <item name="inputBackgroundColor">@color/codebergDarkInputBackground</item>
-        <item name="inputSelectedColor">@color/codebergDarkInputBackground</item>
-        <item name="inputTextColor">@color/codebergDarkThemeTextColor</item>
-        <item name="checkboxStyle">@style/AppThemeCheckBoxStyle</item>
-        <item name="selectedTextColor">@color/codebergDarkColorPrimary</item>
-        <item name="alertDialogTheme">@style/AppThemeCodebergDarkConfirmDialog</item>
-        <item name="popupMenuStyle">@style/AppThemeCodebergDarkPopupMenuStyle</item>
-        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
-        <item name="autoCompleteTextViewStyle">@style/AppThemeDarkSearchAutoCompleteTextView</item>
-        <item name="hintColor">@color/codebergDarkHintColor</item>
-        <item name="colorControlActivated">@color/codebergDarkColorPrimary</item>
-        <item name="dividerColor">@color/codebergDarkThemeDividerColor</item>
-        <item name="bottomSheetDialogTheme">@style/AppThemeDarkBottomSheetDialog</item>
-        <item name="searchViewStyle">@style/AppSearchViewStyle</item>
-        <item name="progressIndicatorColor">@color/codebergDarkColorPrimary</item>
-        <item name="fabColor">@color/codebergDarkThemeIconsColors</item>
-        <item name="iconsColor">@color/codebergDarkThemeIconsColors</item>
-        <item name="pagerTabIndicatorColor">@color/codebergDarkColorPrimary</item>
-        <item name="android:actionOverflowButtonStyle">@style/customOverflowButtonStyle</item>
-        <item name="actionOverflowMenuStyle">@style/customOverflowMenuStyle</item>
-        <item name="colorSurface">@color/codebergDarkInputBackground</item>
-        <item name="shapeAppearanceSmallComponent">@style/inputsMaterialComponentCorner</item>
-        <item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
-        <item name="materialSwitchStyle">@style/m3SwitchStyle</item>
-        <item name="chipStyle">@style/CustomChipFilter</item>
-        <item name="isDark">1</item>
-    </style>
-    <!-- Codeberg dark theme -->
-
-</resources>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
index 45e216c9..185f4674 100644
--- a/app/src/main/res/values-v31/themes.xml
+++ b/app/src/main/res/values-v31/themes.xml
@@ -2,6 +2,7 @@
 <resources>
     <style name="AppThemeDarkDynamicColors" parent="Theme.Material3.Dark.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/system_neutral1_800</item>
         <item name="android:typeface">monospace</item>
         <item name="colorAccent">@android:color/system_neutral1_800</item>
         <item name="android:textColorSecondary">@android:color/system_accent1_0</item>
@@ -12,6 +13,7 @@
         <item name="colorSecondaryContainer">@android:color/system_neutral1_800</item>
         <item name="materialCardBackgroundColor">@android:color/system_neutral1_800</item>
 
+        <item name="navigationBarColor">@android:color/system_neutral1_900</item>
         <item name="diffAddedColor">@color/diffAddedColor</item>
         <item name="diffRemovedColor">@color/diffRemovedColor</item>
         <item name="diffSelectedColor">@color/diffSelectedColor</item>
@@ -47,6 +49,7 @@
 
     <style name="AppThemeLightDynamicColors" parent="Theme.Material3.Light.NoActionBar">
         <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@android:color/system_neutral1_10</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:typeface">monospace</item>
         <item name="materialCardBackgroundColor">@android:color/system_accent2_50</item>
@@ -59,6 +62,7 @@
         <item name="colorSecondary">@android:color/system_accent1_200</item>
         <item name="colorOnSurface">@android:color/system_accent2_900</item>
 
+        <item name="navigationBarColor">@android:color/system_neutral1_0</item>
         <item name="diffAddedColor">@color/lightThemeDiffAddedColor</item>
         <item name="diffRemovedColor">@color/lightThemeDiffRemovedColor</item>
         <item name="diffSelectedColor">@color/lightThemeDiffSelectedColor</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index d411b094..c9aff9cc 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -16,5 +16,6 @@
     <attr name="iconsColor" format="reference"/>
     <attr name="pagerTabIndicatorColor" format="reference"/>
     <attr name="materialCardBackgroundColor" format="reference"/>
+    <attr name="navigationBarColor" format="reference"/>
     <attr name="isDark" format="integer"/>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dc0f3b17..6444a04b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,21 +1,260 @@
 <resources>
-
-    <style name="DrawerIcon" parent="Widget.AppCompat.DrawerArrowToggle">
-        <item name="color">@color/colorWhite</item>
-        <item name="android:textSize">@dimen/dimen16sp</item>
-    </style>
-
     <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
-
     <style name="customTabLayout" parent="TextAppearance.Design.Tab">
         <item name="android:textSize">@dimen/dimen16sp</item>
     </style>
 
+    <style name="Widget.App.Switch" parent="Widget.Material3.CompoundButton.MaterialSwitch">
+        <item name="thumbTint">@color/colorWhite</item>
+        <item name="colorPrimary">?attr/fabColor</item>
+    </style>
+
+    <style name="m3SwitchStyle" parent="Widget.Material3.CompoundButton.MaterialSwitch">
+        <item name="materialThemeOverlay">@style/Widget.App.Switch</item>
+        <item name="thumbTint">@color/colorWhite</item>
+    </style>
+
+    <!-- Custom Material cards -->
+    <style name="CustomMaterCardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
+        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.card.custom.corners</item>
+    </style>
+
+    <style name="ShapeAppearanceOverlay.card.custom.corners" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopRight">@dimen/dimen32dp</item>
+        <item name="cornerSizeTopLeft">@dimen/dimen32dp</item>
+        <item name="cornerSizeBottomRight">0dp</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+    </style>
+
+    <style name="CustomMaterialCardStyle" parent="@style/Widget.MaterialComponents.CardView">
+        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.custom.card</item>
+    </style>
+
+    <style name="ShapeAppearanceOverlay.custom.card" parent="">
+        <item name="cornerFamily">rounded</item>
+    </style>
+
+    <style name="inputsMaterialComponentCorner" parent="ShapeAppearance.Material3.SmallComponent">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">@dimen/dimen6dp</item>
+    </style>
+
+    <style name="customOverflowButtonStyle">
+        <item name="android:src">@drawable/ic_dotted_menu</item>
+        <item name="android:paddingStart">@dimen/dimen12dp</item>
+        <item name="android:paddingEnd">@dimen/dimen12dp</item>
+    </style>
+
+    <style name="customOverflowMenuStyle" parent="@style/Widget.Material3.PopupMenu.Overflow">
+        <item name="android:popupBackground">@drawable/shape_round_corners</item>
+    </style>
+
+    <style name="AppSearchViewStyle" parent="Widget.AppCompat.SearchView">
+        <item name="searchHintIcon">@drawable/ic_search</item>
+        <item name="searchIcon">@null</item>
+        <item name="queryBackground">@android:color/transparent</item>
+        <item name="closeIcon">@drawable/ic_close</item>
+    </style>
+
+    <style name="AppThemeDarkBottomSheetDialog" parent="Theme.Material3.Dark.BottomSheetDialog">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="bottomSheetStyle">@style/AppBottomSheetModalStyle</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="AppThemeLightBottomSheetDialog" parent="Theme.Material3.Light.BottomSheetDialog">
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="bottomSheetStyle">@style/AppBottomSheetModalStyle</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
+
+    <style name="AppBottomSheetModalStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/shape_bottom_sheet_top_corners</item>
+        <item name="behavior_peekHeight">420dp</item>
+    </style>
+
+    <style name="AppThemeLightSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
+        <item name="android:textColor">@color/lightThemeTextColor</item>
+        <item name="android:textColorHint">@color/lightThemeTextColor</item>
+    </style>
+
+    <style name="AppThemeDarkSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
+        <item name="android:textColor">@color/colorWhite</item>
+        <item name="android:textColorHint">@color/colorWhite</item>
+    </style>
+
+    <style name="AppThemeConfirmDialog" parent="Theme.Material3.Dark.Dialog.Alert">
+        <item name="android:background">@color/colorPrimary</item>
+        <item name="android:textColorPrimary">@color/colorWhite</item>
+        <item name="android:textColor">@color/colorWhite</item>
+        <item name="colorControlNormal">@color/colorWhite</item>
+        <item name="colorControlActivated">@color/darkGreen</item>
+        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+        <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
+        <item name="android:windowBackground">@drawable/shape_round_corners</item>
+    </style>
+
+    <style name="AppThemeLightConfirmDialog" parent="Theme.Material3.Light.Dialog.Alert">
+        <item name="android:background">@color/colorWhite</item>
+        <item name="android:textColorPrimary">@color/lightThemeTextColor</item>
+        <item name="android:textColor">@color/lightThemeTextColor</item>
+        <item name="colorControlNormal">@color/lightThemeTextColor</item>
+        <item name="colorControlActivated">@color/darkGreen</item>
+        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+        <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
+        <item name="android:windowBackground">@drawable/shape_round_corners</item>
+    </style>
+
+    <style name="NegativeButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="android:textColor">@color/darkRed</item>
+        <item name="android:layout_marginEnd">@dimen/dimen16dp</item>
+    </style>
+
+    <style name="PositiveButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="android:textColor">@color/darkGreen</item>
+    </style>
+
+    <style name="NeutralButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="android:textColor">@color/colorAccent</item>
+    </style>
+
+    <style name="AppThemePopupMenuStyle" parent="Widget.Material3.PopupMenu">
+        <item name="android:popupBackground">@color/colorPrimary</item>
+        <item name="android:textColor">@color/colorWhite</item>
+        <item name="android:layout_marginStart">@dimen/dimen4dp</item>
+        <item name="android:layout_marginEnd">@dimen/dimen4dp</item>
+    </style>
+
+    <style name="AppThemeLightPopupMenuStyle" parent="Widget.Material3.PopupMenu">
+        <item name="android:popupBackground">@color/colorWhite</item>
+        <item name="android:itemBackground">@color/lightThemeBackground</item>
+        <item name="android:textColor">@color/lightThemeTextColor</item>
+        <item name="android:layout_marginStart">@dimen/dimen4dp</item>
+        <item name="android:layout_marginEnd">@dimen/dimen4dp</item>
+    </style>
+
+    <style name="AppThemeLightCheckBoxStyle" parent="Widget.Material3.CompoundButton.CheckBox">
+        <item name="buttonTint">@color/colorDarkGreen</item>
+    </style>
+
+    <style name="AppThemeCheckBoxStyle" parent="Widget.Material3.CompoundButton.CheckBox">
+        <item name="buttonTint">?attr/iconsColor</item>
+    </style>
+
+    <style name="WindowAnimationTransition">
+        <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
+        <item name="android:windowExitAnimation">@android:anim/fade_out</item>
+    </style>
+
+    <!-- Retro theme styles -->
+    <style name="AppThemeRetroCheckBoxStyle" parent="Widget.Material3.CompoundButton.CheckBox">
+        <item name="buttonTint">@color/retroThemeColorPrimary</item>
+    </style>
+
+    <style name="AppThemeRetroSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
+        <item name="android:textColor">@color/retroThemeColorPrimary</item>
+        <item name="android:textColorHint">@color/retroThemeColorPrimary</item>
+    </style>
+
+    <style name="AppThemeRetroConfirmDialog" parent="ThemeOverlay.Material3.Dialog.Alert">
+        <item name="android:background">@color/colorWhite</item>
+        <item name="android:textColorPrimary">@color/retroThemeTextColor</item>
+        <item name="android:textColor">@color/retroThemeTextColor</item>
+        <item name="colorControlNormal">@color/retroThemeTextColor</item>
+        <item name="colorControlActivated">@color/retroThemeColorPrimary</item>
+        <item name="buttonBarNegativeButtonStyle">@style/RetroNegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/RetroPositiveButtonStyle</item>
+        <item name="buttonBarNeutralButtonStyle">@style/RetroNeutralButtonStyle</item>
+        <item name="android:windowBackground">@drawable/shape_round_corners</item>
+    </style>
+
+    <style name="RetroNegativeButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="android:textColor">@color/retroThemeTextColor</item>
+        <item name="android:layout_marginEnd">@dimen/dimen16dp</item>
+    </style>
+
+    <style name="RetroPositiveButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="android:textColor">@color/darkRed</item>
+    </style>
+
+    <style name="RetroNeutralButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
+        <item name="android:textColor">@color/retroThemeColorPrimary</item>
+    </style>
+
+    <style name="AppThemeRetroPopupMenuStyle" parent="Widget.Material3.PopupMenu">
+        <item name="android:popupBackground">@color/colorWhite</item>
+        <item name="android:itemBackground">@color/retroThemeBackground</item>
+        <item name="android:textColor">@color/retroThemeTextColor</item>
+        <item name="android:layout_marginStart">@dimen/dimen4dp</item>
+        <item name="android:layout_marginEnd">@dimen/dimen4dp</item>
+    </style>
+    <!-- Retro theme styles -->
+
+    <!-- Pitch black theme styles -->
+    <style name="AppThemePitchBlackConfirmDialog" parent="Theme.Material3.Dark.Dialog.Alert">
+        <item name="android:background">@color/pitchBlackThemeGeneralBackgroundColor</item>
+        <item name="android:textColorPrimary">@color/pitchBlackThemeTextColor</item>
+        <item name="android:textColor">@color/pitchBlackThemeTextColor</item>
+        <item name="colorControlNormal">@color/pitchBlackThemeTextColor</item>
+        <item name="colorControlActivated">@color/darkGreen</item>
+        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+        <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
+        <item name="android:windowBackground">@drawable/shape_round_corners</item>
+    </style>
+
+    <style name="AppThemePitchBlackPopupMenuStyle" parent="Widget.Material3.PopupMenu">
+        <item name="android:popupBackground">@color/pitchBlackThemeGeneralBackgroundColor</item>
+        <item name="android:itemBackground">@color/pitchBlackThemeGeneralBackgroundColor</item>
+        <item name="android:textColor">@color/pitchBlackThemeTextColor</item>
+        <item name="android:layout_marginStart">@dimen/dimen4dp</item>
+        <item name="android:layout_marginEnd">@dimen/dimen4dp</item>
+    </style>
+    <!-- Pitch black theme styles -->
+
+    <!-- Codeberg dark theme styles -->
+    <style name="AppThemeCodebergDarkConfirmDialog" parent="Theme.Material3.Dark.Dialog.Alert">
+        <item name="android:background">@color/codebergDarkThemeGeneralBackgroundColor</item>
+        <item name="android:textColorPrimary">@color/codebergDarkThemeTextColor</item>
+        <item name="android:textColor">@color/codebergDarkThemeTextColor</item>
+        <item name="colorControlNormal">@color/codebergDarkThemeTextColor</item>
+        <item name="colorControlActivated">@color/codebergDarkThemeCardBackground</item>
+        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
+        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
+        <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
+        <item name="android:windowBackground">@drawable/shape_round_corners</item>
+    </style>
+
+    <style name="AppThemeCodebergDarkPopupMenuStyle" parent="Widget.Material3.PopupMenu">
+        <item name="android:popupBackground">@color/codebergDarkThemeGeneralBackgroundColor</item>
+        <item name="android:itemBackground">@color/codebergDarkThemeGeneralBackgroundColor</item>
+        <item name="android:textColor">@color/codebergDarkThemeTextColor</item>
+        <item name="android:layout_marginStart">@dimen/dimen4dp</item>
+        <item name="android:layout_marginEnd">@dimen/dimen4dp</item>
+    </style>
+    <!-- Codeberg dark theme styles -->
+
+    <style name="AppThemeSystem" parent="AppThemeLight"/>
+
+    <style name="AppThemeSystemPitchBlack" parent="AppThemeLight"/>
+
+    <style name="AppThemeDynamicSystem" parent="AppThemeLightDynamicColors"/>
+
+    <style name="CustomChipFilter" parent="Widget.Material3.Chip.Filter">
+        <item name="chipBackgroundColor">?attr/materialCardBackgroundColor</item>
+        <item name="chipStrokeWidth">0dp</item>
+        <item name="chipStrokeColor">@android:color/transparent</item>
+        <item name="android:textColor">?attr/primaryTextColor</item>
+        <item name="rippleColor">@android:color/transparent</item>
+        <item name="checkedIconTint">?attr/iconsColor</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index dd8465a5..a8786be0 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -3,7 +3,8 @@
 
     <!-- Dark theme - default -->
     <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@color/colorPrimary</item>
+        <item name="android:statusBarColor">@color/colorPrimary</item>
         <item name="android:windowLightStatusBar">false</item>
         <item name="android:typeface">monospace</item>
         <item name="colorAccent">@color/colorAccent</item>
@@ -15,6 +16,7 @@
         <item name="colorSecondaryContainer">@color/colorSecondaryContainer</item>
         <item name="materialCardBackgroundColor">@color/cardBackground</item>
 
+        <item name="navigationBarColor">@color/cardBackground</item>
         <item name="diffAddedColor">@color/diffAddedColor</item>
         <item name="diffRemovedColor">@color/diffRemovedColor</item>
         <item name="diffSelectedColor">@color/diffSelectedColor</item>
@@ -51,7 +53,8 @@
 
     <!-- Light theme -->
     <style name="AppThemeLight" parent="Theme.Material3.Light.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:navigationBarColor">@color/lightThemeBackground</item>
+        <item name="android:statusBarColor">@color/lightThemeBackground</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:typeface">monospace</item>
         <item name="colorAccent">@color/colorAccent</item>
@@ -63,6 +66,7 @@
         <item name="colorSecondaryContainer">@color/lightThemeColorSecondaryContainer</item>
         <item name="materialCardBackgroundColor">@color/lightThemeCardBackground</item>
 
+        <item name="navigationBarColor">@color/lightThemeCardBackground</item>
         <item name="diffAddedColor">@color/lightThemeDiffAddedColor</item>
         <item name="diffRemovedColor">@color/lightThemeDiffRemovedColor</item>
         <item name="diffSelectedColor">@color/lightThemeDiffSelectedColor</item>
@@ -98,7 +102,9 @@
 
     <!-- Retro theme -->
     <style name="AppThemeRetro" parent="Theme.Material3.Light.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/retroThemeBackground</item>
+        <item name="android:navigationBarColor">@color/retroThemeBackground</item>
+        <item name="android:windowLightStatusBar">true</item>
         <item name="android:typeface">monospace</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:textColorSecondary">@color/retroThemeTextColor</item>
@@ -108,6 +114,7 @@
         <item name="colorOnSurfaceVariant">@color/retroThemeTextColor</item>
         <item name="materialCardBackgroundColor">@color/retroThemeCardBackground</item>
 
+        <item name="navigationBarColor">@color/retroThemeCardBackground</item>
         <item name="diffAddedColor">@color/retroThemeDiffAddedColor</item>
         <item name="diffRemovedColor">@color/retroThemeDiffRemovedColor</item>
         <item name="diffSelectedColor">@color/retroThemeDiffSelectedColor</item>
@@ -143,7 +150,9 @@
 
     <!-- Pitch black theme -->
     <style name="AppThemePitchBlack" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/pitchBlackThemeBackground</item>
+        <item name="android:navigationBarColor">@color/pitchBlackThemeBackground</item>
+        <item name="android:windowLightStatusBar">false</item>
         <item name="android:typeface">monospace</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:textColorSecondary">@color/pitchBlackThemeTextColor</item>
@@ -154,6 +163,7 @@
         <item name="colorSecondaryContainer">@color/pitchBlackThemeColorSecondary</item>
         <item name="materialCardBackgroundColor">@color/pitchBlackThemeCardBackground</item>
 
+        <item name="navigationBarColor">@color/pitchBlackThemeCardBackground</item>
         <item name="diffAddedColor">@color/diffAddedColor</item>
         <item name="diffRemovedColor">@color/diffRemovedColor</item>
         <item name="diffSelectedColor">@color/diffSelectedColor</item>
@@ -190,7 +200,9 @@
 
     <!-- Codeberg dark theme -->
     <style name="AppThemeCodebergDark" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:statusBarColor">@color/codebergDarkThemeBackground</item>
+        <item name="android:navigationBarColor">@color/codebergDarkThemeBackground</item>
+        <item name="android:windowLightStatusBar">false</item>
         <item name="android:typeface">monospace</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:textColorSecondary">@color/codebergDarkThemeTextColor</item>
@@ -201,6 +213,7 @@
         <item name="colorSecondaryContainer">@color/codebergDarkThemeColorSecondary</item>
         <item name="materialCardBackgroundColor">@color/codebergDarkThemeCardBackground</item>
 
+        <item name="navigationBarColor">@color/codebergDarkThemeBackground</item>
         <item name="diffAddedColor">@color/diffAddedColor</item>
         <item name="diffRemovedColor">@color/diffRemovedColor</item>
         <item name="diffSelectedColor">@color/diffSelectedColor</item>
@@ -234,254 +247,4 @@
         <item name="isDark">1</item>
     </style>
     <!-- Codeberg dark theme -->
-
-    <style name="Widget.App.Switch" parent="Widget.Material3.CompoundButton.MaterialSwitch">
-        <item name="thumbTint">@color/colorWhite</item>
-        <item name="colorPrimary">?attr/fabColor</item>
-    </style>
-
-    <style name="m3SwitchStyle" parent="Widget.Material3.CompoundButton.MaterialSwitch">
-        <item name="materialThemeOverlay">@style/Widget.App.Switch</item>
-        <item name="thumbTint">@color/colorWhite</item>
-    </style>
-
-    <!-- Custom Material cards -->
-    <style name="CustomMaterCardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
-        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.card.custom.corners</item>
-    </style>
-
-    <style name="ShapeAppearanceOverlay.card.custom.corners" parent="">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSizeTopRight">@dimen/dimen32dp</item>
-        <item name="cornerSizeTopLeft">@dimen/dimen32dp</item>
-        <item name="cornerSizeBottomRight">0dp</item>
-        <item name="cornerSizeBottomLeft">0dp</item>
-    </style>
-
-    <style name="CustomMaterialCardStyle" parent="@style/Widget.MaterialComponents.CardView">
-        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlay.custom.card</item>
-    </style>
-
-    <style name="ShapeAppearanceOverlay.custom.card" parent="">
-        <item name="cornerFamily">rounded</item>
-    </style>
-
-    <style name="inputsMaterialComponentCorner" parent="ShapeAppearance.Material3.SmallComponent">
-        <item name="cornerFamily">rounded</item>
-        <item name="cornerSize">@dimen/dimen6dp</item>
-    </style>
-
-    <style name="customOverflowButtonStyle">
-        <item name="android:src">@drawable/ic_dotted_menu</item>
-        <item name="android:paddingStart">@dimen/dimen12dp</item>
-        <item name="android:paddingEnd">@dimen/dimen12dp</item>
-    </style>
-
-    <style name="customOverflowMenuStyle" parent="@style/Widget.Material3.PopupMenu.Overflow">
-        <item name="android:popupBackground">@drawable/shape_round_corners</item>
-    </style>
-
-    <style name="AppSearchViewStyle" parent="Widget.AppCompat.SearchView">
-        <item name="searchHintIcon">@drawable/ic_search</item>
-        <item name="searchIcon">@null</item>
-        <item name="queryBackground">@android:color/transparent</item>
-        <item name="closeIcon">@drawable/ic_close</item>
-    </style>
-
-    <style name="AppThemeDarkBottomSheetDialog" parent="Theme.Material3.Dark.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:windowSoftInputMode">adjustResize</item>
-        <item name="bottomSheetStyle">@style/AppBottomSheetModalStyle</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-
-    <style name="AppThemeLightBottomSheetDialog" parent="Theme.Material3.Light.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:windowSoftInputMode">adjustResize</item>
-        <item name="bottomSheetStyle">@style/AppBottomSheetModalStyle</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-
-    <style name="AppBottomSheetModalStyle" parent="Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@drawable/shape_bottom_sheet_top_corners</item>
-        <item name="behavior_peekHeight">420dp</item>
-    </style>
-
-    <style name="AppThemeLightSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
-        <item name="android:textColor">@color/lightThemeTextColor</item>
-        <item name="android:textColorHint">@color/lightThemeTextColor</item>
-    </style>
-
-    <style name="AppThemeDarkSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
-        <item name="android:textColor">@color/colorWhite</item>
-        <item name="android:textColorHint">@color/colorWhite</item>
-    </style>
-
-    <style name="AppThemeConfirmDialog" parent="Theme.Material3.Dark.Dialog.Alert">
-        <item name="android:background">@color/colorPrimary</item>
-        <item name="android:textColorPrimary">@color/colorWhite</item>
-        <item name="android:textColor">@color/colorWhite</item>
-        <item name="colorControlNormal">@color/colorWhite</item>
-        <item name="colorControlActivated">@color/darkGreen</item>
-        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
-        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
-        <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
-        <item name="android:windowBackground">@drawable/shape_round_corners</item>
-    </style>
-
-    <style name="AppThemeLightConfirmDialog" parent="Theme.Material3.Light.Dialog.Alert">
-        <item name="android:background">@color/colorWhite</item>
-        <item name="android:textColorPrimary">@color/lightThemeTextColor</item>
-        <item name="android:textColor">@color/lightThemeTextColor</item>
-        <item name="colorControlNormal">@color/lightThemeTextColor</item>
-        <item name="colorControlActivated">@color/darkGreen</item>
-        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
-        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
-        <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
-        <item name="android:windowBackground">@drawable/shape_round_corners</item>
-    </style>
-
-    <style name="NegativeButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
-        <item name="android:textColor">@color/darkRed</item>
-        <item name="android:layout_marginEnd">@dimen/dimen16dp</item>
-    </style>
-
-    <style name="PositiveButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
-        <item name="android:textColor">@color/darkGreen</item>
-    </style>
-
-    <style name="NeutralButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
-        <item name="android:textColor">@color/colorAccent</item>
-    </style>
-
-    <style name="AppThemePopupMenuStyle" parent="Widget.Material3.PopupMenu">
-        <item name="android:popupBackground">@color/colorPrimary</item>
-        <item name="android:textColor">@color/colorWhite</item>
-        <item name="android:layout_marginStart">@dimen/dimen4dp</item>
-        <item name="android:layout_marginEnd">@dimen/dimen4dp</item>
-    </style>
-
-    <style name="AppThemeLightPopupMenuStyle" parent="Widget.Material3.PopupMenu">
-        <item name="android:popupBackground">@color/colorWhite</item>
-        <item name="android:itemBackground">@color/lightThemeBackground</item>
-        <item name="android:textColor">@color/lightThemeTextColor</item>
-        <item name="android:layout_marginStart">@dimen/dimen4dp</item>
-        <item name="android:layout_marginEnd">@dimen/dimen4dp</item>
-    </style>
-
-    <style name="AppThemeLightCheckBoxStyle" parent="Widget.Material3.CompoundButton.CheckBox">
-        <item name="buttonTint">@color/colorDarkGreen</item>
-    </style>
-
-    <style name="AppThemeCheckBoxStyle" parent="Widget.Material3.CompoundButton.CheckBox">
-        <item name="buttonTint">?attr/iconsColor</item>
-    </style>
-
-    <style name="WindowAnimationTransition">
-        <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
-        <item name="android:windowExitAnimation">@android:anim/fade_out</item>
-    </style>
-
-    <!-- Retro theme styles -->
-    <style name="AppThemeRetroCheckBoxStyle" parent="Widget.Material3.CompoundButton.CheckBox">
-        <item name="buttonTint">@color/retroThemeColorPrimary</item>
-    </style>
-
-    <style name="AppThemeRetroSearchAutoCompleteTextView" parent="Widget.AppCompat.Light.AutoCompleteTextView">
-        <item name="android:textColor">@color/retroThemeColorPrimary</item>
-        <item name="android:textColorHint">@color/retroThemeColorPrimary</item>
-    </style>
-
-    <style name="AppThemeRetroConfirmDialog" parent="ThemeOverlay.Material3.Dialog.Alert">
-        <item name="android:background">@color/colorWhite</item>
-        <item name="android:textColorPrimary">@color/retroThemeTextColor</item>
-        <item name="android:textColor">@color/retroThemeTextColor</item>
-        <item name="colorControlNormal">@color/retroThemeTextColor</item>
-        <item name="colorControlActivated">@color/retroThemeColorPrimary</item>
-        <item name="buttonBarNegativeButtonStyle">@style/RetroNegativeButtonStyle</item>
-        <item name="buttonBarPositiveButtonStyle">@style/RetroPositiveButtonStyle</item>
-        <item name="buttonBarNeutralButtonStyle">@style/RetroNeutralButtonStyle</item>
-        <item name="android:windowBackground">@drawable/shape_round_corners</item>
-    </style>
-
-    <style name="RetroNegativeButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
-        <item name="android:textColor">@color/retroThemeTextColor</item>
-        <item name="android:layout_marginEnd">@dimen/dimen16dp</item>
-    </style>
-
-    <style name="RetroPositiveButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
-        <item name="android:textColor">@color/darkRed</item>
-    </style>
-
-    <style name="RetroNeutralButtonStyle" parent="Widget.Material3.Button.OutlinedButton">
-        <item name="android:textColor">@color/retroThemeColorPrimary</item>
-    </style>
-
-    <style name="AppThemeRetroPopupMenuStyle" parent="Widget.Material3.PopupMenu">
-        <item name="android:popupBackground">@color/colorWhite</item>
-        <item name="android:itemBackground">@color/retroThemeBackground</item>
-        <item name="android:textColor">@color/retroThemeTextColor</item>
-        <item name="android:layout_marginStart">@dimen/dimen4dp</item>
-        <item name="android:layout_marginEnd">@dimen/dimen4dp</item>
-    </style>
-    <!-- Retro theme styles -->
-
-    <!-- Pitch black theme styles -->
-    <style name="AppThemePitchBlackConfirmDialog" parent="Theme.Material3.Dark.Dialog.Alert">
-        <item name="android:background">@color/pitchBlackThemeGeneralBackgroundColor</item>
-        <item name="android:textColorPrimary">@color/pitchBlackThemeTextColor</item>
-        <item name="android:textColor">@color/pitchBlackThemeTextColor</item>
-        <item name="colorControlNormal">@color/pitchBlackThemeTextColor</item>
-        <item name="colorControlActivated">@color/darkGreen</item>
-        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
-        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
-        <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
-        <item name="android:windowBackground">@drawable/shape_round_corners</item>
-    </style>
-
-    <style name="AppThemePitchBlackPopupMenuStyle" parent="Widget.Material3.PopupMenu">
-        <item name="android:popupBackground">@color/pitchBlackThemeGeneralBackgroundColor</item>
-        <item name="android:itemBackground">@color/pitchBlackThemeGeneralBackgroundColor</item>
-        <item name="android:textColor">@color/pitchBlackThemeTextColor</item>
-        <item name="android:layout_marginStart">@dimen/dimen4dp</item>
-        <item name="android:layout_marginEnd">@dimen/dimen4dp</item>
-    </style>
-    <!-- Pitch black theme styles -->
-
-    <!-- Codeberg dark theme styles -->
-    <style name="AppThemeCodebergDarkConfirmDialog" parent="Theme.Material3.Dark.Dialog.Alert">
-        <item name="android:background">@color/codebergDarkThemeGeneralBackgroundColor</item>
-        <item name="android:textColorPrimary">@color/codebergDarkThemeTextColor</item>
-        <item name="android:textColor">@color/codebergDarkThemeTextColor</item>
-        <item name="colorControlNormal">@color/codebergDarkThemeTextColor</item>
-        <item name="colorControlActivated">@color/codebergDarkThemeCardBackground</item>
-        <item name="buttonBarNegativeButtonStyle">@style/NegativeButtonStyle</item>
-        <item name="buttonBarPositiveButtonStyle">@style/PositiveButtonStyle</item>
-        <item name="buttonBarNeutralButtonStyle">@style/NeutralButtonStyle</item>
-        <item name="android:windowBackground">@drawable/shape_round_corners</item>
-    </style>
-
-    <style name="AppThemeCodebergDarkPopupMenuStyle" parent="Widget.Material3.PopupMenu">
-        <item name="android:popupBackground">@color/codebergDarkThemeGeneralBackgroundColor</item>
-        <item name="android:itemBackground">@color/codebergDarkThemeGeneralBackgroundColor</item>
-        <item name="android:textColor">@color/codebergDarkThemeTextColor</item>
-        <item name="android:layout_marginStart">@dimen/dimen4dp</item>
-        <item name="android:layout_marginEnd">@dimen/dimen4dp</item>
-    </style>
-    <!-- Codeberg dark theme styles -->
-
-    <style name="AppThemeSystem" parent="AppThemeLight"/>
-
-    <style name="AppThemeSystemPitchBlack" parent="AppThemeLight"/>
-
-    <style name="AppThemeDynamicSystem" parent="AppThemeLightDynamicColors"/>
-
-    <style name="CustomChipFilter" parent="Widget.Material3.Chip.Filter">
-        <item name="chipBackgroundColor">?attr/materialCardBackgroundColor</item>
-        <item name="chipStrokeWidth">0dp</item>
-        <item name="chipStrokeColor">@android:color/transparent</item>
-        <item name="android:textColor">?attr/primaryTextColor</item>
-        <item name="rippleColor">@android:color/transparent</item>
-        <item name="checkedIconTint">?attr/iconsColor</item>
-    </style>
 </resources>