diff --git a/src/main/res/drawable/bottom_corner.xml b/src/main/res/drawable/bottom_corner.xml
new file mode 100644
index 00000000..fd8f9d23
--- /dev/null
+++ b/src/main/res/drawable/bottom_corner.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners
+        android:bottomLeftRadius="@dimen/shape_large_corner"
+        android:bottomRightRadius="@dimen/shape_large_corner" />
+</shape>
\ No newline at end of file
diff --git a/src/main/res/layout/fragment.xml b/src/main/res/layout/fragment.xml
index 1361472d..0f144c87 100644
--- a/src/main/res/layout/fragment.xml
+++ b/src/main/res/layout/fragment.xml
@@ -5,45 +5,40 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:elevation="0dp"
-    android:orientation="vertical"
-    android:paddingHorizontal="10dp">
+    android:orientation="vertical">
 
     <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appbarlayout"
+        android:id="@+id/appbar_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@android:color/transparent"
+        android:background="@drawable/bottom_corner"
+        android:backgroundTint="?attr/colorSurface"
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsingtoolbarlayout"
-            style="?attr/collapsingToolbarLayoutMediumStyle"
+            android:id="@+id/collapsing_toolbar_layout"
+            style="?attr/collapsingToolbarLayoutLargeStyle"
             android:layout_width="match_parent"
-            android:layout_height="?attr/collapsingToolbarLayoutMediumSize"
-            android:background="@drawable/background_border"
-            android:backgroundTint="?attr/colorPrimarySurface"
-            app:contentScrim="@android:color/transparent"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+            android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
+            app:layout_scrollFlags="scroll|snap|exitUntilCollapsed">
 
-            <androidx.appcompat.widget.Toolbar
+            <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?actionBarSize"
-                android:background="@android:color/transparent"
                 app:layout_collapseMode="pin" />
         </com.google.android.material.appbar.CollapsingToolbarLayout>
 
         <FrameLayout
             android:id="@+id/toolbar_extra"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp" />
+            android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
         android:id="@+id/fragment_content"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:background="?android:attr/colorBackground"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/tabs_toolbar.xml b/src/main/res/layout/tabs_toolbar.xml
index 72ae7314..29d530b5 100644
--- a/src/main/res/layout/tabs_toolbar.xml
+++ b/src/main/res/layout/tabs_toolbar.xml
@@ -3,8 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/background_border"
-    android:backgroundTint="?attr/colorPrimarySurface"
     android:orientation="vertical">
 
     <com.google.android.material.tabs.TabLayout
@@ -34,10 +32,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:fontFamily="sans-serif-medium"
                 android:gravity="center_vertical"
-                android:paddingStart="10dp"
-                android:paddingEnd="10dp"
+                android:layout_marginStart="@dimen/text_margin"
                 android:textColor="?android:attr/textColor"
                 android:textSize="16sp" />
 
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index 3ecd7216..63b88ed9 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -10,13 +10,12 @@
         <item name="colorOnPrimary">@color/black</item>
         <item name="colorSurface">@color/green50</item>
         <item name="colorOnSurface">@color/black</item>
-        <item name="toolbarStyle">@style/Widget.Main.Toolbar</item>
         <item name="android:colorBackground">@color/white</item>
         <item name="colorOnBackground">@color/grey_dark</item>
         <item name="android:colorAccent">@color/accent_light</item>
         <item name="colorError">@color/error_light</item>
         <item name="android:textColor">@color/black</item>
-        <item name="android:textColorPrimary">@color/black</item>
+        <item name="android:textColorPrimary">@color/green900</item>
         <item name="android:fastScrollThumbDrawable">@drawable/scrollbar_thumb</item>
         <item name="android:fastScrollTrackDrawable">@drawable/scrollbar_track</item>
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
@@ -24,8 +23,10 @@
         <item name="materialAlertDialogTheme">@style/Theme.Alert</item>
         <item name="tabStyle">@style/Theme.Tab</item>
         <item name="textInputStyle">@style/Theme.EditText</item>
-        <item name="android:statusBarColor">@color/white</item>
+        <item name="android:statusBarColor">@color/green50</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
+        <item name="toolbarStyle">@style/Theme.Toolbar</item>
     </style>
 
     <style name="Theme.Main.Dark" parent="Theme.Material3.Dark.NoActionBar">
@@ -33,7 +34,6 @@
         <item name="colorOnPrimary">@color/black</item>
         <item name="colorSurface">@color/grey_dark</item>
         <item name="colorOnSurface">@color/green50</item>
-        <item name="toolbarStyle">@style/Widget.Main.Toolbar</item>
         <item name="android:colorBackground">@color/black</item>
         <item name="colorOnBackground">@color/green200</item>
         <item name="android:colorAccent">@color/accent_dark</item>
@@ -46,8 +46,10 @@
         <item name="materialAlertDialogTheme">@style/Theme.Alert</item>
         <item name="tabStyle">@style/Theme.Tab</item>
         <item name="textInputStyle">@style/Theme.EditText</item>
-        <item name="android:statusBarColor">@color/black</item>
+        <item name="android:statusBarColor">@color/grey_dark</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
+        <item name="toolbarStyle">@style/Theme.Toolbar</item>
     </style>
 
     <style name="Theme.Main.Amoled" parent="Theme.Material3.Dark.NoActionBar">
@@ -55,7 +57,6 @@
         <item name="colorOnPrimary">@color/black</item>
         <item name="colorSurface">@color/black</item>
         <item name="colorOnSurface">@color/green50</item>
-        <item name="toolbarStyle">@style/Widget.Main.Toolbar</item>
         <item name="android:colorBackground">@color/pitch_black</item>
         <item name="colorOnBackground">@color/green50</item>
         <item name="android:colorAccent">@color/accent_dark</item>
@@ -68,17 +69,18 @@
         <item name="materialAlertDialogTheme">@style/Theme.Alert</item>
         <item name="tabStyle">@style/Theme.Tab</item>
         <item name="textInputStyle">@style/Theme.EditText</item>
-        <item name="android:statusBarColor">@color/pitch_black</item>
+        <item name="android:statusBarColor">@color/black</item>
         <item name="android:navigationBarColor">@android:color/transparent</item>
+        <item name="collapsingToolbarLayoutLargeStyle">@style/Theme.CollapsingToolbar</item>
+        <item name="toolbarStyle">@style/Theme.Toolbar</item>
     </style>
 
-    <style name="Widget.Main.Toolbar" parent="Widget.Material3.Toolbar">
-        <item name="android:titleTextAppearance">
-            @android:style/TextAppearance.Material.Widget.Toolbar.Title
-        </item>
-        <item name="android:subtitleTextAppearance">
-            @android:style/TextAppearance.Material.Widget.Toolbar.Subtitle
-        </item>
+    <style name="Theme.CollapsingToolbar" parent="Widget.Material3.CollapsingToolbar.Large">
+        <item name="android:backgroundTint">?attr/colorSurface</item>
+    </style>
+
+    <style name="Theme.Toolbar" parent="Widget.Material3.Toolbar.Surface">
+        <item name="android:backgroundTint">?attr/colorSurface</item>
     </style>
 
     <style name="Theme.Tab" parent="Widget.Material3.TabLayout">