diff --git a/DSKitExplorer/ScreenView.swift b/DSKitExplorer/ScreenView.swift
index c7ad079..5238a36 100644
--- a/DSKitExplorer/ScreenView.swift
+++ b/DSKitExplorer/ScreenView.swift
@@ -17,13 +17,13 @@ struct ScreenView: View {
     var body: some View {
         switch screen {
         case .newsScreen1:
-            NewsScreen1()
-                .navigationTitle("News")
+            Testable_NewsScreen1()
                 .environment(\.appearance, appearance)
+                .navigationBarHidden(true)
         case .newsScreen2:
-            NewsScreen2()
-                .navigationTitle("Bookmarks")
+            Testable_NewsScreen2()
                 .environment(\.appearance, appearance)
+                .navigationBarHidden(true)
         case .cartScreen1:
             CartScreen1()
                 .navigationTitle("My Cart")
@@ -66,19 +66,19 @@ struct ScreenView: View {
                 .environment(\.appearance, appearance)
                 .navigationBarTitleDisplayMode(.inline)
         case .homeScreen1:
-            HomeScreen1()
+            Testable_HomeScreen1()
                 .navigationBarHidden(true)
                 .environment(\.appearance, appearance)
         case .homeScreen2:
-            HomeScreen2()
+            Testable_HomeScreen2()
                 .navigationBarHidden(true)
                 .environment(\.appearance, appearance)
         case .homeScreen3:
-            HomeScreen3()
+            Testable_HomeScreen3()
                 .navigationBarHidden(true)
                 .environment(\.appearance, appearance)
         case .homeScreen4:
-            HomeScreen4()
+            Testable_HomeScreen4()
                 .navigationBarHidden(true)
                 .environment(\.appearance, appearance)
         case .profileScreen1:
diff --git a/DSKitExplorer/Screens/HomeScreen1.swift b/DSKitExplorer/Screens/HomeScreen1.swift
index f42e0c6..1b6f8ac 100644
--- a/DSKitExplorer/Screens/HomeScreen1.swift
+++ b/DSKitExplorer/Screens/HomeScreen1.swift
@@ -94,8 +94,33 @@ final class HomeScreen1Model: ObservableObject {
 // MARK: - Testable
 
 struct Testable_HomeScreen1: View {
+    @Environment(\.dismiss) var dismiss
     var body: some View {
-        HomeScreen1()
+        TabView {
+            HomeScreen1()
+            .tabItem {
+                Image(systemName: "house.fill")
+                Text("Home")
+            }
+            Text("Shop")
+                .tabItem {
+                    Image(systemName: "magnifyingglass")
+                    Text("Shop")
+                }
+            Text("Cart")
+                .tabItem {
+                    Image(systemName: "cart.fill")
+                    Text("Cart")
+                }
+            DSVStack {
+                DSButton(title: "Dismiss", style: .clear) {
+                    dismiss()
+                }
+            }.tabItem {
+                Image(systemName: "gearshape")
+                Text("Settings")
+            }
+        }
     }
 }
 
@@ -103,7 +128,9 @@ struct Testable_HomeScreen1: View {
 
 struct HomeScreen1_Previews: PreviewProvider {
     static var previews: some View {
-        DSPreviewForEachAppearance { HomeScreen1() }
+        DSPreviewForEachAppearance {
+            Testable_HomeScreen1()
+        }
     }
 }
 
diff --git a/DSKitExplorer/Screens/HomeScreen2.swift b/DSKitExplorer/Screens/HomeScreen2.swift
index 8369985..5479e94 100644
--- a/DSKitExplorer/Screens/HomeScreen2.swift
+++ b/DSKitExplorer/Screens/HomeScreen2.swift
@@ -171,8 +171,33 @@ final class HomeScreen2Model: ObservableObject {
 // MARK: - Testable
 
 struct Testable_HomeScreen2: View {
+    @Environment(\.dismiss) var dismiss
     var body: some View {
-        HomeScreen2()
+        TabView {
+            HomeScreen2()
+            .tabItem {
+                Image(systemName: "house.fill")
+                Text("Home")
+            }
+            Text("Shop")
+                .tabItem {
+                    Image(systemName: "magnifyingglass")
+                    Text("Shop")
+                }
+            Text("Cart")
+                .tabItem {
+                    Image(systemName: "cart.fill")
+                    Text("Cart")
+                }
+            DSVStack {
+                DSButton(title: "Dismiss", style: .clear) {
+                    dismiss()
+                }
+            }.tabItem {
+                Image(systemName: "gearshape")
+                Text("Settings")
+            }
+        }
     }
 }
 
@@ -180,7 +205,9 @@ struct Testable_HomeScreen2: View {
 
 struct HomeScreen2_Previews: PreviewProvider {
     static var previews: some View {
-        DSPreviewForEachAppearance { HomeScreen2() }
+        DSPreviewForEachAppearance {
+            Testable_HomeScreen2()
+        }
     }
 }
 
diff --git a/DSKitExplorer/Screens/HomeScreen3.swift b/DSKitExplorer/Screens/HomeScreen3.swift
index b33823f..baac25e 100644
--- a/DSKitExplorer/Screens/HomeScreen3.swift
+++ b/DSKitExplorer/Screens/HomeScreen3.swift
@@ -156,8 +156,33 @@ final class HomeScreen3Model: ObservableObject {
 // MARK: - Testable
 
 struct Testable_HomeScreen3: View {
+    @Environment(\.dismiss) var dismiss
     var body: some View {
-        HomeScreen3()
+        TabView {
+            HomeScreen3()
+            .tabItem {
+                Image(systemName: "house.fill")
+                Text("Home")
+            }
+            Text("Shop")
+                .tabItem {
+                    Image(systemName: "magnifyingglass")
+                    Text("Shop")
+                }
+            Text("Cart")
+                .tabItem {
+                    Image(systemName: "cart.fill")
+                    Text("Cart")
+                }
+            DSVStack {
+                DSButton(title: "Dismiss", style: .clear) {
+                    dismiss()
+                }
+            }.tabItem {
+                Image(systemName: "gearshape")
+                Text("Settings")
+            }
+        }
     }
 }
 
@@ -165,7 +190,9 @@ struct Testable_HomeScreen3: View {
 
 struct HomeScreen3_Previews: PreviewProvider {
     static var previews: some View {
-        DSPreviewForEachAppearance { HomeScreen3() }
+        DSPreviewForEachAppearance {
+            Testable_HomeScreen3()
+        }
     }
 }
 
diff --git a/DSKitExplorer/Screens/HomeScreen4.swift b/DSKitExplorer/Screens/HomeScreen4.swift
index 0dbf0de..26c4afd 100644
--- a/DSKitExplorer/Screens/HomeScreen4.swift
+++ b/DSKitExplorer/Screens/HomeScreen4.swift
@@ -231,8 +231,33 @@ final class HomeScreen4Model: ObservableObject {
 // MARK: - Testable
 
 struct Testable_HomeScreen4: View {
+    @Environment(\.dismiss) var dismiss
     var body: some View {
-        HomeScreen4()
+        TabView {
+            HomeScreen4()
+            .tabItem {
+                Image(systemName: "house.fill")
+                Text("Home")
+            }
+            Text("Shop")
+                .tabItem {
+                    Image(systemName: "magnifyingglass")
+                    Text("Shop")
+                }
+            Text("Cart")
+                .tabItem {
+                    Image(systemName: "cart.fill")
+                    Text("Cart")
+                }
+            DSVStack {
+                DSButton(title: "Dismiss", style: .clear) {
+                    dismiss()
+                }
+            }.tabItem {
+                Image(systemName: "gearshape")
+                Text("Settings")
+            }
+        }
     }
 }
 
@@ -240,7 +265,9 @@ struct Testable_HomeScreen4: View {
 
 struct HomeScreen4_Previews: PreviewProvider {
     static var previews: some View {
-        DSPreviewForEachAppearance { HomeScreen4() }
+        DSPreviewForEachAppearance {
+            Testable_HomeScreen4()
+        }
     }
 }
 
diff --git a/DSKitExplorer/Screens/NewsScreen1.swift b/DSKitExplorer/Screens/NewsScreen1.swift
index cea7fc1..28b9464 100644
--- a/DSKitExplorer/Screens/NewsScreen1.swift
+++ b/DSKitExplorer/Screens/NewsScreen1.swift
@@ -194,10 +194,30 @@ final class NewsScreen1Model {
 // MARK: - Testable
 
 struct Testable_NewsScreen1: View {
+    @Environment(\.dismiss) var dismiss
     var body: some View {
-        NavigationView {
-            NewsScreen1()
-                .navigationTitle("News")
+        TabView {
+            NavigationView {
+                NewsScreen1()
+                    .navigationTitle("News")
+            }
+            .tabItem {
+                Image(systemName: "newspaper.fill")
+                Text("Home")
+            }
+            Text("Bookmarks")
+                .tabItem {
+                    Image(systemName: "bookmark")
+                    Text("Bookmarks")
+                }
+            DSVStack {
+                DSButton(title: "Dismiss", style: .clear) {
+                    dismiss()
+                }.dsPadding()
+            }.tabItem {
+                Image(systemName: "gearshape")
+                Text("Settings")
+            }
         }
     }
 }
@@ -207,23 +227,7 @@ struct Testable_NewsScreen1: View {
 struct NewsScreen1_Previews: PreviewProvider {
     static var previews: some View {
         DSPreviewForEachAppearance {
-            TabView {
-                Testable_NewsScreen1()
-                    .tabItem {
-                        Image(systemName: "newspaper.fill")
-                        Text("Home")
-                    }
-                Text("Empty")
-                    .tabItem {
-                        Image(systemName: "bookmark")
-                        Text("Bookmarks")
-                    }
-                Text("Empty")
-                    .tabItem {
-                        Image(systemName: "gearshape")
-                        Text("Settings")
-                    }
-            }
+            Testable_NewsScreen1()
         }
     }
 }
diff --git a/DSKitExplorer/Screens/NewsScreen2.swift b/DSKitExplorer/Screens/NewsScreen2.swift
index 1b8f281..0a6fc91 100644
--- a/DSKitExplorer/Screens/NewsScreen2.swift
+++ b/DSKitExplorer/Screens/NewsScreen2.swift
@@ -147,10 +147,32 @@ final class NewsScreen2Model {
 // MARK: - Testable
 
 struct Testable_NewsScreen2: View {
+    @Environment(\.dismiss) var dismiss
+    @State var selectedTab: Int = 1
     var body: some View {
-        NavigationView {
-            NewsScreen2()
-                .navigationTitle("Bookmarks")
+        TabView(selection: $selectedTab) {
+            Text("Home")
+                .tabItem {
+                    Image(systemName: "newspaper.fill")
+                    Text("Home")
+                }.tag(0)
+            NavigationView {
+                NewsScreen2()
+                    .navigationTitle("Bookmarks")
+            }
+                .tabItem {
+                    Image(systemName: "bookmark")
+                    Text("Bookmarks")
+                }.tag(1)
+            DSVStack {
+                DSButton(title: "Dismiss", style: .clear) {
+                    dismiss()
+                }.dsPadding()
+            }
+                .tabItem {
+                    Image(systemName: "gearshape")
+                    Text("Settings")
+                }.tag(2)
         }
     }
 }
@@ -159,25 +181,8 @@ struct Testable_NewsScreen2: View {
 
 struct NewsScreen2_Previews: PreviewProvider {
     static var previews: some View {
-        @State var selectedTab: Int = 1
         DSPreviewForEachAppearance {
-            TabView(selection: $selectedTab) {
-                Text("Empty")
-                    .tabItem {
-                        Image(systemName: "newspaper.fill")
-                        Text("Home")
-                    }.tag(0)
-                Testable_NewsScreen2()
-                    .tabItem {
-                        Image(systemName: "bookmark")
-                        Text("Bookmarks")
-                    }.tag(1)
-                Text("Empty")
-                    .tabItem {
-                        Image(systemName: "gearshape")
-                        Text("Settings")
-                    }.tag(2)
-            }
+            Testable_NewsScreen2()
         }
     }
 }
diff --git a/DSKitExplorer/ScreensView.swift b/DSKitExplorer/ScreensView.swift
index 9620276..1e18df4 100644
--- a/DSKitExplorer/ScreensView.swift
+++ b/DSKitExplorer/ScreensView.swift
@@ -30,7 +30,7 @@ struct ScreensView: View {
                     }
                 }
             }
-            .navigationTitle(appearance.title)
+            .navigationTitle("Screens")
             .safeAreaInset(edge: .bottom) {
                 DSBottomContainer {
                     DSButton(title: "Change Appearance", action: { dismiss() })
diff --git a/DSKitExplorerTests/AssertSnapshot.swift b/DSKitExplorerTests/AssertSnapshot.swift
index 8e24e16..46be1d9 100644
--- a/DSKitExplorerTests/AssertSnapshot.swift
+++ b/DSKitExplorerTests/AssertSnapshot.swift
@@ -22,18 +22,25 @@ extension XCTestCase {
     ) {
         SnapshotTesting.diffTool = "open"
         isRecording = false
-        UIView.setAnimationsEnabled(false)
-        let view = UIHostingController(rootView: testView)
-        view.overrideUserInterfaceStyle = .light
+       // UIView.setAnimationsEnabled(false)
+       // let view = UIHostingController(rootView: testView)
+       // view.overrideUserInterfaceStyle = .light
         
 //        guard let window = UIApplication.shared.windows.first(where: { $0.isKeyWindow }) else {
 //            fatalError("A key window is required for UI operations")
 //        }
         //window.rootViewController = view
+        let testView = VStack {
+            Spacer().frame(height: 47)
+            testView.frame(width: 393, height: 852)
+                .safeAreaInset(edge: .bottom) {
+                    Spacer().frame(height: 34)
+                }
+        }.dsAppearance(DSKitAppearance())
         
         SnapshotTesting.assertSnapshot(
-            matching: view,
-            as: .wait(for: 0.1 , on: .image(on: .iPhone13Pro)),
+            of: testView, 
+            as: .wait(for: 0.05, on: .image(drawHierarchyInKeyWindow: true)),
             named: "snapshot",
             record: record,
             timeout: timeout,
@@ -41,6 +48,17 @@ extension XCTestCase {
             testName: named,
             line: line
         )
+        
+//        SnapshotTesting.assertSnapshot(
+//            matching: testView,
+//            as: .image(on: .iPhone13Pro),
+//            named: "snapshot",
+//            record: record,
+//            timeout: timeout,
+//            file: file,
+//            testName: named,
+//            line: line
+//        )
     }
 }
 
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen1.snapshot.png
index 710f345..631f61f 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen2.snapshot.png
index 106a702..7a5f18a 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen3.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen3.snapshot.png
index 752550e..35a5d2a 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen3.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen3.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen4.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen4.snapshot.png
index 9174b3e..3547f5c 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen4.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen4.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen5.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen5.snapshot.png
index a23dbcf..44a3057 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen5.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/CartScreen5.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories1.snapshot.png
index 4d406aa..af8e88d 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories2.snapshot.png
index 76f13f1..38a0ee0 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories3.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories3.snapshot.png
index e3cc989..d0c5663 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories3.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories3.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories4.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories4.snapshot.png
index ce03677..6d12d5a 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories4.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories4.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories5.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories5.snapshot.png
index 0192a7f..8be4476 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories5.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Categories5.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters1.snapshot.png
index fe34e72..99b0b66 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters2.snapshot.png
index fe34e72..99b0b66 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters3.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters3.snapshot.png
index b1da57f..d23206f 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters3.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Filters3.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen1.snapshot.png
index de2896c..0f45aec 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen2.snapshot.png
index d550468..0ebb4cf 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen3.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen3.snapshot.png
index c0cc211..15a9a0f 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen3.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen3.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen4.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen4.snapshot.png
index edd8858..5940cc1 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen4.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/HomeScreen4.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails1.snapshot.png
index b1303ab..a09fade 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails2.snapshot.png
index 500dc7a..7c3b76b 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails3.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails3.snapshot.png
index c7c6388..517b147 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails3.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails3.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails4.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails4.snapshot.png
index c354233..c3b5ee5 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails4.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails4.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails5.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails5.snapshot.png
index 0bbe430..f45ad10 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails5.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ItemDetails5.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items1.snapshot.png
index 21aba09..7ab1f33 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items2.snapshot.png
index c648dec..20dcaaf 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items3.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items3.snapshot.png
index ce2859d..c18e6af 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items3.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items3.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items4.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items4.snapshot.png
index 3bd384a..006f1ce 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items4.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items4.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items5.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items5.snapshot.png
index fe4debf..1245ce9 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items5.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items5.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items6.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items6.snapshot.png
index 7990c93..0e9d9ae 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items6.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items6.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items7.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items7.snapshot.png
index 49461c9..ae7cc61 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items7.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items7.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items8.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items8.snapshot.png
index cb76bea..ab99bc0 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items8.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Items8.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen1.snapshot.png
index bb35ced..d91756c 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen2.snapshot.png
index 1421f1d..1bfaebd 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen3.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen3.snapshot.png
index 3f76161..2b92ef1 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen3.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen3.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen4.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen4.snapshot.png
index 990bba4..362b82e 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen4.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/LogInScreen4.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NewsScreen1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NewsScreen1.snapshot.png
index cf4b54e..8783ee2 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NewsScreen1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NewsScreen1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NewsScreen2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NewsScreen2.snapshot.png
index d065147..4e9406b 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NewsScreen2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NewsScreen2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NotificationsScreen1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NotificationsScreen1.snapshot.png
index fd52943..b0a7082 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NotificationsScreen1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/NotificationsScreen1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order1.snapshot.png
index d98451c..aabece8 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order2.snapshot.png
index edf92f3..d460a1e 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order3.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order3.snapshot.png
index 47676ea..8339737 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order3.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order3.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order4.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order4.snapshot.png
index cc8fe3c..f8f811c 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order4.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Order4.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Payment1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Payment1.snapshot.png
index d55b43d..c9d463d 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Payment1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Payment1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen1.snapshot.png
index e1f0c15..98408c7 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen2.snapshot.png
index 8172538..67d72c3 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen3.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen3.snapshot.png
index f6805ce..572bd34 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen3.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/ProfileScreen3.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Shipping1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Shipping1.snapshot.png
index 51ab4db..0b1b450 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Shipping1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Shipping1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Shipping2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Shipping2.snapshot.png
index 73dbb1f..01d6e84 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Shipping2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/Shipping2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen1.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen1.snapshot.png
index 0e42499..0af7718 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen1.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen1.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen2.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen2.snapshot.png
index b151df7..e0be165 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen2.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen2.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen3.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen3.snapshot.png
index 407f54f..e7d289b 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen3.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen3.snapshot.png differ
diff --git a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen4.snapshot.png b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen4.snapshot.png
index aecee6f..2236f0d 100644
Binary files a/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen4.snapshot.png and b/DSKitExplorerTests/__Snapshots__/DSKitExplorerTests/SignUpScreen4.snapshot.png differ