diff --git a/Anikin/Views/AnimeItemView.xaml b/Anikin/Views/AnimeItemView.xaml
index 0dcd339..ad1a297 100644
--- a/Anikin/Views/AnimeItemView.xaml
+++ b/Anikin/Views/AnimeItemView.xaml
@@ -88,8 +88,13 @@
                                 <RoundRectangle CornerRadius="20,0,20,20" />
                             </Border.StrokeShape>
                             <HorizontalStackLayout Margin="10,5,5,0" Padding="0,0,0,15">
-                                <Label FontAttributes="Bold" Text="{Binding MeanScore, Converter={StaticResource RatingConverter}}" />
-                                <Image>
+                                <Label
+                                    FontAttributes="Bold"
+                                    FontSize="13"
+                                    Text="{Binding MeanScore, Converter={StaticResource RatingConverter}}"
+                                    TextColor="White"
+                                    VerticalTextAlignment="Center" />
+                                <Image VerticalOptions="Center">
                                     <Image.Source>
                                         <FontImageSource
                                             FontFamily="Material"
diff --git a/Anikin/Views/BottomSheets/ChangeSourceSheet.xaml b/Anikin/Views/BottomSheets/ChangeSourceSheet.xaml
index c2b5c9a..4a4b543 100644
--- a/Anikin/Views/BottomSheets/ChangeSourceSheet.xaml
+++ b/Anikin/Views/BottomSheets/ChangeSourceSheet.xaml
@@ -12,7 +12,8 @@
     x:Name="this"
     Margin="0"
     x:DataType="viewModels:EpisodeViewModel"
-    BackgroundColor="{StaticResource Gray900}"
+    BackgroundColor="{AppThemeBinding Light={StaticResource Gray100},
+                                      Dark={StaticResource Gray900}}"
     HandleColor="{StaticResource Gray800}"
     HasBackdrop="True"
     HasHandle="True"
@@ -72,7 +73,8 @@
                                         <DataTemplate x:DataType="{x:Type models:ProviderModel}">
                                             <Border
                                                 Margin="0,4"
-                                                BackgroundColor="{StaticResource Gray800}"
+                                                BackgroundColor="{AppThemeBinding Light={StaticResource Gray300},
+                                                                                  Dark={StaticResource Gray800}}"
                                                 StrokeThickness="0">
                                                 <Border.StrokeShape>
                                                     <RoundRectangle CornerRadius="18" />
@@ -129,7 +131,8 @@
                     <DataTemplate x:DataType="{x:Type models:ProviderModel}">
                         <Border
                             Margin="0,4"
-                            BackgroundColor="{StaticResource Gray800}"
+                            BackgroundColor="{AppThemeBinding Light={StaticResource Gray300},
+                                                              Dark={StaticResource Gray800}}"
                             StrokeThickness="0">
                             <Border.StrokeShape>
                                 <RoundRectangle CornerRadius="18" />
diff --git a/Anikin/Views/BottomSheets/CoverImageSheet.xaml b/Anikin/Views/BottomSheets/CoverImageSheet.xaml
index 1bb3e13..c821806 100644
--- a/Anikin/Views/BottomSheets/CoverImageSheet.xaml
+++ b/Anikin/Views/BottomSheets/CoverImageSheet.xaml
@@ -12,7 +12,8 @@
     x:Name="this"
     Margin="0"
     x:DataType="viewModels:EpisodeViewModel"
-    BackgroundColor="{StaticResource Gray900}"
+    BackgroundColor="{AppThemeBinding Light={StaticResource Gray100},
+                                      Dark={StaticResource Gray900}}"
     HasBackdrop="True"
     HasHandle="True"
     UseNavigationBarArea="False">
@@ -48,20 +49,24 @@
                 <Button
                     Grid.Column="0"
                     BackgroundColor="Transparent"
-                    BorderColor="White"
+                    BorderColor="{AppThemeBinding Light={StaticResource Black},
+                                                  Dark={StaticResource White}}"
                     BorderWidth="1"
                     FontSize="16"
                     Text="Download"
-                    TextColor="White" />
+                    TextColor="{AppThemeBinding Light={StaticResource Black},
+                                                Dark={StaticResource White}}" />
 
                 <Button
                     Grid.Column="1"
                     BackgroundColor="Transparent"
-                    BorderColor="White"
+                    BorderColor="{AppThemeBinding Light={StaticResource Black},
+                                                  Dark={StaticResource White}}"
                     BorderWidth="1"
                     FontSize="16"
                     Text="Share"
-                    TextColor="White" />
+                    TextColor="{AppThemeBinding Light={StaticResource Black},
+                                                Dark={StaticResource White}}" />
             </Grid>
         </VerticalStackLayout>
     </ScrollView>
diff --git a/Anikin/Views/BottomSheets/ProviderSearchSheet.xaml b/Anikin/Views/BottomSheets/ProviderSearchSheet.xaml
index 0114bcb..28560cd 100644
--- a/Anikin/Views/BottomSheets/ProviderSearchSheet.xaml
+++ b/Anikin/Views/BottomSheets/ProviderSearchSheet.xaml
@@ -13,7 +13,8 @@
     x:Name="this"
     Margin="0"
     x:DataType="viewModels:ProviderSearchViewModel"
-    BackgroundColor="{StaticResource Gray900}"
+    BackgroundColor="{AppThemeBinding Light={StaticResource Gray100},
+                                      Dark={StaticResource Gray900}}"
     HasBackdrop="True"
     HasHandle="True"
     UseNavigationBarArea="False">
diff --git a/Anikin/Views/BottomSheets/VideoSourceSheet.xaml b/Anikin/Views/BottomSheets/VideoSourceSheet.xaml
index 30e026f..52413a5 100644
--- a/Anikin/Views/BottomSheets/VideoSourceSheet.xaml
+++ b/Anikin/Views/BottomSheets/VideoSourceSheet.xaml
@@ -13,7 +13,8 @@
     x:Name="this"
     Margin="0"
     x:DataType="viewModels:VideoSourceViewModel"
-    BackgroundColor="{StaticResource Gray900}"
+    BackgroundColor="{AppThemeBinding Light={StaticResource Gray100},
+                                      Dark={StaticResource Gray900}}"
     HandleColor="{StaticResource Gray800}"
     HasBackdrop="True"
     HasHandle="True"
@@ -85,7 +86,8 @@
                     <DataTemplate x:DataType="{x:Type vmodels:VideoSource}">
                         <Border
                             Margin="0,4"
-                            BackgroundColor="{StaticResource Gray800}"
+                            BackgroundColor="{AppThemeBinding Light={StaticResource Gray300},
+                                                              Dark={StaticResource Gray800}}"
                             StrokeThickness="0">
                             <Border.StrokeShape>
                                 <RoundRectangle CornerRadius="18" />
@@ -121,7 +123,7 @@
                                             FontFamily="Material"
                                             Glyph="{x:Static materialDesign:MaterialDesignIcons.Download}"
                                             Size="25"
-                                            Color="{AppThemeBinding Light={StaticResource Black},
+                                            Color="{AppThemeBinding Light={StaticResource Primary},
                                                                     Dark={StaticResource White}}" />
                                     </Button.ImageSource>
                                 </Button>
diff --git a/Anikin/Views/Episodes/EpisodesTabView.xaml b/Anikin/Views/Episodes/EpisodesTabView.xaml
index 317c814..b8f4070 100644
--- a/Anikin/Views/Episodes/EpisodesTabView.xaml
+++ b/Anikin/Views/Episodes/EpisodesTabView.xaml
@@ -184,14 +184,14 @@
                 FontFamily="Material"
                 FontSize="25"
                 Text="{x:Static materialDesign:MaterialDesignIcons.ViewList}"
-                TextColor="{AppThemeBinding Light={StaticResource Black},
+                TextColor="{AppThemeBinding Light={StaticResource Gray500},
                                             Dark={StaticResource Gray800}}">
                 <Button.Triggers>
                     <DataTrigger
                         Binding="{Binding GridLayoutMode}"
                         TargetType="Button"
                         Value="{x:Static components:GridLayoutMode.Full}">
-                        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
+                        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
                     </DataTrigger>
                 </Button.Triggers>
             </Button>
@@ -206,14 +206,14 @@
                 FontFamily="Material"
                 FontSize="25"
                 Text="{x:Static materialDesign:MaterialDesignIcons.GridView}"
-                TextColor="{AppThemeBinding Light={StaticResource Black},
+                TextColor="{AppThemeBinding Light={StaticResource Gray500},
                                             Dark={StaticResource Gray800}}">
                 <Button.Triggers>
                     <DataTrigger
                         Binding="{Binding GridLayoutMode}"
                         TargetType="Button"
                         Value="{x:Static components:GridLayoutMode.Semi}">
-                        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
+                        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
                     </DataTrigger>
                 </Button.Triggers>
             </Button>
@@ -228,14 +228,14 @@
                 FontFamily="Material"
                 FontSize="25"
                 Text="{x:Static materialDesign:MaterialDesignIcons.GridOn}"
-                TextColor="{AppThemeBinding Light={StaticResource Black},
+                TextColor="{AppThemeBinding Light={StaticResource Gray500},
                                             Dark={StaticResource Gray800}}">
                 <Button.Triggers>
                     <DataTrigger
                         Binding="{Binding GridLayoutMode}"
                         TargetType="Button"
                         Value="{x:Static components:GridLayoutMode.Compact}">
-                        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Black}, Dark={StaticResource White}}" />
+                        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource White}}" />
                     </DataTrigger>
                 </Button.Triggers>
             </Button>
diff --git a/Anikin/Views/Templates/AnimeCarouselTemplateView.xaml b/Anikin/Views/Templates/AnimeCarouselTemplateView.xaml
index 82e4773..43fd001 100644
--- a/Anikin/Views/Templates/AnimeCarouselTemplateView.xaml
+++ b/Anikin/Views/Templates/AnimeCarouselTemplateView.xaml
@@ -87,7 +87,11 @@
                             <RoundRectangle CornerRadius="20,0,20,20" />
                         </Border.StrokeShape>
                         <HorizontalStackLayout Margin="13,8,5,0" Padding="0,0,0,18">
-                            <Label FontAttributes="Bold" Text="{Binding MeanScore, Converter={StaticResource RatingConverter}}" />
+                            <Label
+                                FontAttributes="Bold"
+                                Text="{Binding MeanScore, Converter={StaticResource RatingConverter}}"
+                                TextColor="White"
+                                VerticalTextAlignment="Center" />
                             <Image>
                                 <Image.Source>
                                     <FontImageSource
diff --git a/Anikin/Views/Templates/EpisodeTemplateView.xaml b/Anikin/Views/Templates/EpisodeTemplateView.xaml
index c8b89c0..db40848 100644
--- a/Anikin/Views/Templates/EpisodeTemplateView.xaml
+++ b/Anikin/Views/Templates/EpisodeTemplateView.xaml
@@ -23,7 +23,8 @@
     <Grid BackgroundColor="Transparent">
         <Border
             Grid.Column="0"
-            BackgroundColor="{StaticResource Gray900}"
+            BackgroundColor="{AppThemeBinding Light={StaticResource Gray200},
+                                              Dark={StaticResource Gray900}}"
             HorizontalOptions="FillAndExpand"
             Stroke="White"
             StrokeThickness="0"
diff --git a/Anikin/Views/Templates/FullEpisodeTemplateView.xaml b/Anikin/Views/Templates/FullEpisodeTemplateView.xaml
index 37dc257..ad1a060 100644
--- a/Anikin/Views/Templates/FullEpisodeTemplateView.xaml
+++ b/Anikin/Views/Templates/FullEpisodeTemplateView.xaml
@@ -12,7 +12,7 @@
     Padding="0"
     x:DataType="models:Episode"
     BackgroundColor="Transparent"
-    HeightRequest="125">
+    HeightRequest="122">
     <Border.Resources>
         <ResourceDictionary>
             <converters:WatchedEpisodeProgressConverter x:Key="WatchedEpisodeProgressConverter" />
@@ -20,9 +20,9 @@
         </ResourceDictionary>
     </Border.Resources>
     <Border.StrokeShape>
-        <RoundRectangle CornerRadius="10" />
+        <RoundRectangle CornerRadius="20" />
     </Border.StrokeShape>
-    <Grid BackgroundColor="{StaticResource Gray900}" ColumnDefinitions="auto,*">
+    <Grid BackgroundColor="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray900}}" ColumnDefinitions="auto,*">
         <Grid.Behaviors>
             <berry:TouchBehavior
                 Command="{Binding Parent.BindingContext.ItemClickCommand, Source={x:Reference this}}"
@@ -33,24 +33,22 @@
         </Grid.Behaviors>
         <Border StrokeThickness="0">
             <Border.StrokeShape>
-                <RoundRectangle CornerRadius="10" />
+                <RoundRectangle CornerRadius="20" />
             </Border.StrokeShape>
             <Image
                 Aspect="AspectFill"
                 BackgroundColor="Transparent"
-                Opacity="0.8"
                 Source="{Binding Image}"
                 WidthRequest="200" />
         </Border>
 
         <!--  Display Progress  -->
-        <Grid IsVisible="{Binding Progress, Converter={StaticResource IsWatchedEpisodeProgressVisibleConverter}}">
+        <Grid IsVisible="{Binding Progress, Converter={StaticResource IsWatchedEpisodeProgressVisibleConverter}}" ZIndex="2">
             <ProgressBar
-                HeightRequest="5"
+                HeightRequest="4"
                 Progress="{Binding Progress, Converter={StaticResource WatchedEpisodeProgressConverter}}"
                 ProgressColor="{StaticResource Primary}"
-                VerticalOptions="End"
-                ZIndex="2" />
+                VerticalOptions="End" />
             <Grid
                 BackgroundColor="White"
                 HeightRequest="5"
@@ -77,12 +75,13 @@
             <Label
                 Padding="15,8,10,6"
                 FontAttributes="Bold"
+                FontFamily="SoraBold"
                 FontSize="20"
                 HorizontalTextAlignment="Start"
                 LineBreakMode="TailTruncation"
-                Opacity="0.9"
+                Opacity="0.92"
                 Text="{Binding Number}"
-                TextColor="#E9FFFFFF"
+                TextColor="White"
                 VerticalTextAlignment="Start" />
         </Border>
 
@@ -97,7 +96,8 @@
             LineBreakMode="TailTruncation"
             Opacity="0.7"
             Text="{Binding Name}"
-            TextColor="#E9FFFFFF"
+            TextColor="{AppThemeBinding Light={StaticResource Black},
+                                        Dark={StaticResource White}}"
             VerticalOptions="Center"
             VerticalTextAlignment="End" />
     </Grid>
diff --git a/Anikin/Views/Templates/SemiEpisodeTemplateView.xaml b/Anikin/Views/Templates/SemiEpisodeTemplateView.xaml
index e23a3fa..b55db5a 100644
--- a/Anikin/Views/Templates/SemiEpisodeTemplateView.xaml
+++ b/Anikin/Views/Templates/SemiEpisodeTemplateView.xaml
@@ -42,16 +42,23 @@
         <Image
             Aspect="AspectFill"
             BackgroundColor="Transparent"
-            Source="{Binding Image}" />
+            Source="{Binding Image}"
+            ZIndex="0" />
+
+        <Grid
+            BackgroundColor="Black"
+            HorizontalOptions="FillAndExpand"
+            Opacity="0.4"
+            VerticalOptions="FillAndExpand"
+            ZIndex="1" />
 
         <!--  Display Progress  -->
-        <Grid IsVisible="{Binding Progress, Converter={StaticResource IsWatchedEpisodeProgressVisibleConverter}}">
+        <Grid IsVisible="{Binding Progress, Converter={StaticResource IsWatchedEpisodeProgressVisibleConverter}}" ZIndex="2">
             <ProgressBar
-                HeightRequest="5"
+                HeightRequest="4"
                 Progress="{Binding Progress, Converter={StaticResource WatchedEpisodeProgressConverter}}"
                 ProgressColor="{StaticResource Primary}"
-                VerticalOptions="End"
-                ZIndex="2" />
+                VerticalOptions="End" />
             <Grid
                 BackgroundColor="White"
                 HeightRequest="5"
@@ -68,7 +75,8 @@
             Opacity="0.9"
             Text="{Binding Name}"
             TextColor="#E9FFFFFF"
-            VerticalTextAlignment="Start" />
+            VerticalTextAlignment="Start"
+            ZIndex="2" />
         <Label
             Padding="8,5"
             FontAttributes="Bold"
@@ -79,6 +87,7 @@
             Opacity="0.7"
             Text="{Binding Number}"
             TextColor="#E9FFFFFF"
-            VerticalTextAlignment="End" />
+            VerticalTextAlignment="End"
+            ZIndex="2" />
     </Grid>
 </Border>
\ No newline at end of file