diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 3c61e7a7..41f660d1 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -8,55 +8,49 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
-      - uses: actions/checkout@v2
-      - name: set up JDK 17
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: 17
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          # Key inspired from here -
-          # https://medium.com/@ychescale9/running-android-instrumented-tests-on-ci-from-bitrise-io-to-github-actions-a611e57ce71f
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle-
+
+      - name: Cache Gradle dependencies
+        uses: gradle/actions/setup-gradle@v3
+
       - name: Run Checks
         run: ./gradlew check --stacktrace
 
   paparazi-screenshot-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: set up JDK 17
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: 17
-      - name: Checkout Branch
-        uses: actions/checkout@v2
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          # Key inspired from here -
-          # https://medium.com/@ychescale9/running-android-instrumented-tests-on-ci-from-bitrise-io-to-github-actions-a611e57ce71f
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle-
+
+      - name: Cache Gradle dependencies
+        uses: gradle/actions/setup-gradle@v3
 
       - name: Run Paparazzi Screenshot Tests
         run: ./gradlew :showkase-screenshot-testing-paparazzi-sample:verifyPaparazziDebug -PuseKsp=true --stacktrace
 
       - name: Upload Screenshot Test Report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: reports
           path: showkase-screenshot-testing-paparazzi-sample/build/reports/tests/testDebugUnitTest/
           retention-days: 1
+
       - name: Upload Screenshot Failure Differences
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: failure()
         with:
           name: reports
@@ -64,79 +58,128 @@ jobs:
           retention-days: 1
 
   ui-testing:
-    runs-on: macos-11
+    runs-on: ubuntu-latest
     strategy:
       matrix:
-        api-level: [ 26, 29 ]
+        api-level: [ 26 ]
         target: [ default, google_apis ]
+
     steps:
-      - uses: actions/checkout@v2
-      - name: set up JDK 17
-        uses: actions/setup-java@v1
+      - uses: actions/checkout@v4
+
+      - name: Enable KVM
+        run: |
+          echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
+          sudo udevadm control --reload-rules
+          sudo udevadm trigger --name-match=kvm
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
         with:
+          distribution: 'temurin'
           java-version: 17
-      - name: Checkout Branch
-        uses: actions/checkout@v2
-      - uses: actions/cache@v1
-        with:
-          path: ~/.gradle/caches
-          # Key inspired from here -
-          # https://medium.com/@ychescale9/running-android-instrumented-tests-on-ci-from-bitrise-io-to-github-actions-a611e57ce71f
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
-          restore-keys: ${{ runner.os }}-gradle-
 
-      - name: Run UI Tests w/ KAPT
+      - name: Cache Gradle dependencies
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: AVD cache
+        uses: actions/cache@v4
+        id: avd-cache
+        with:
+          path: |
+            ~/.android/avd/*
+            ~/.android/adb*
+          key: avd-${{ matrix.api-level }}
+
+      - name: Prepare script to run
+        id: script
+        env:
+          SCRIPT: |
+            # Workaround for https://github.com/ReactiveCircus/android-emulator-runner/issues/373
+            pre_terminate_crashpad() {
+              # For some reason pgrep/pkill sees only crashpad_handle, not crashpad_handler,
+              # but it's definitely called ${ANDROID_HOME}/emulator/crashpad_handler.
+            
+              # Best-effort gracefully terminate all crashpad_handler processes.
+              pkill --exact --echo --signal SIGTERM crashpad_handle || return
+              sleep 10
+              pkill --exact --echo --signal SIGKILL crashpad_handle || return
+            }
+            trap pre_terminate_crashpad EXIT
+            
+            ${{ inputs.script }}
+        run: |
+          script_file="${RUNNER_TEMP}/reactivecircus-android-emulator-runner-prepared-script.sh"
+          echo "${SCRIPT}" > "${script_file}"
+          echo "file=${script_file}" >> "${GITHUB_OUTPUT}"
+
+      - name: Create AVD and generate snapshot for caching
+        if: steps.avd-cache.outputs.cache-hit != 'true'
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          emulator-build: 7425822
           api-level: ${{ matrix.api-level }}
-          target: ${{ matrix.target }}
-          arch: x86_64
-          script: ./gradlew connectedCheck --no-daemon --stacktrace --debug
+          force-avd-creation: false
+          emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: false
+          script: echo "Generated AVD snapshot for caching."
 
-      - name: Run UI Tests w/ KSP
+      - name: Start emulator and run UI Tests w/ KAPT
+        uses: reactivecircus/android-emulator-runner@v2
+        with:
+          api-level: ${{ matrix.api-level }}
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: |
+            adb devices -l
+            bash --noprofile --norc -eo pipefail "${{ steps.script.outputs.file }}"
+            ./gradlew connectedCheck --no-daemon --stacktrace
+           
+
+      - name: Start emulator and run UI Tests w/ KSP
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          emulator-build: 7425822
           api-level: ${{ matrix.api-level }}
-          target: ${{ matrix.target }}
-          arch: x86_64
-          script: ./gradlew connectedCheck --no-daemon --stacktrace -PuseKsp=true --debug
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
+          script: |
+            adb devices -l
+            bash --noprofile --norc -eo pipefail "${{ steps.script.outputs.file }}"     
+            ./gradlew connectedCheck --no-daemon --stacktrace -PuseKsp=true
 
       - name: Run Screenshot Tests
         uses: reactivecircus/android-emulator-runner@v2
         with:
-          emulator-build: 7425822
           api-level: ${{ matrix.api-level }}
-          target: ${{ matrix.target }}
-          arch: x86_64
+          force-avd-creation: false
+          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+          disable-animations: true
           script: ./gradlew executeScreenshotTests -PdirectorySuffix=Api${{ matrix.api-level }} -PprintBase64
 
+
       - name: Upload screenshot testing report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: reports
+          name: reports-${{ matrix.api-level }}-${{ matrix.target }}
           path: sample/build/reports/shot/debug/Api${{ matrix.api-level }}/verification/
           retention-days: 1
 
-### Uncomment the jobs below if you want to generate and record screenshots. Once you download the
-### artifact, place them under sample/screenshots/debug/
+# Uncomment the jobs below if you want to generate and record screenshots. Once you download the
+# artifact, place them under sample/screenshots/debug/
 
 #      - name: Record screenshots
 #        uses: reactivecircus/android-emulator-runner@v2
 #        with:
-#          emulator-build: 7425822
 #          api-level: ${{ matrix.api-level }}
-#          target: ${{ matrix.target }}
-#          arch: x86_64
-#          script: ./gradlew executeScreenshotTests -PdirectorySuffix=Api${{ matrix.api-level }} -Precord
+#          force-avd-creation: false
+#          emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
+#          disable-animations: true
+#          script: ./gradlew executeScreenshotTests -PdirectorySuffix=Api${{ matrix.api-level }}-${{ matrix.target }} -Precord
 #
 #      - name: Upload screenshots in an artifact
-#        uses: actions/upload-artifact@v3
+#        uses: actions/upload-artifact@v4
 #        with:
-#          name: Api${{ matrix.api-level }}
-#          path: sample/screenshots/debug/Api${{ matrix.api-level }}
+#          name: Api${{ matrix.api-level }}-${{ matrix.target }}
+#          path: sample/screenshots/debug/Api${{ matrix.api-level }}-${{ matrix.target }}
 #          retention-days: 1
-
-
-
diff --git a/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png b/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png
new file mode 100644
index 00000000..bded99a3
Binary files /dev/null and b/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png differ
diff --git a/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png b/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png
new file mode 100644
index 00000000..c70f7953
Binary files /dev/null and b/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png
index 09bd8417..61b0f63a 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png
index 3109aba6..e8fa4515 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png
index 80135b8e..09bd8417 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png
index 80135b8e..3109aba6 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png
index 01be0547..80135b8e 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png
index 61b0f63a..80135b8e 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png
index e8fa4515..01be0547 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png
index 13f1b6b3..00cdbd21 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png
index 9da9ec40..f04dc21e 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png
index c3a617e3..5e99c999 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png
index 6f9d181e..b2382815 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png
index e3f0c332..007fd76f 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png
index 02a82d27..34c2aaf1 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png
index 97e96b5b..501ccff2 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png
index eeeb14a2..505a064f 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png
index eeeb14a2..505a064f 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_17.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_17.png
index b1789b1e..2bb1fd16 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_17.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_17.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_18.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_18.png
index d3eb3eaa..e9d298e3 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_18.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_18.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_19.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_19.png
index 2a0dd82f..e63f4f06 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_19.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_19.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png
index fa575c36..7933546e 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png
index 8e146d3e..27c63cb4 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png
index 2b828395..1e68e97a 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png
index 50982e5a..350b7f82 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png
index 05643801..151b83fb 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png
index 60da5874..ace14e0d 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png
index d3588928..bec7f232 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png
index 5536ce79..fd43aa5c 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png
index 6734a1b7..643aeab2 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png
index 4e1395ba..a889037a 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png
index 4d5ac4e2..1b60370c 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png
index 10672eba..98453897 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png
index 4c13d6a7..88aa1288 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png
index e71df8f8..d5973463 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png
index d5bad136..90fc85b2 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png
index 039aba93..d168a426 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png
index 83cf5616..7234bd34 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png
index ee4445d7..c0ad4dc5 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png
index d257473f..e3a98321 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png differ
diff --git a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png
index acae2765..8f8b7217 100644
Binary files a/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png and b/sample/screenshots/debug/Api26/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png
deleted file mode 100644
index 0e7082af..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png
deleted file mode 100644
index 0d3d6ebd..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png
deleted file mode 100644
index ca53037d..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png
deleted file mode 100644
index ca53037d..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png
deleted file mode 100644
index 2064bd90..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png
deleted file mode 100644
index 8ba282e3..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png
deleted file mode 100644
index 8bb5bd46..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_7.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_7.png
deleted file mode 100644
index f027eb81..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_7.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png
deleted file mode 100644
index c119792e..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png
deleted file mode 100644
index 6b36763d..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png
deleted file mode 100644
index b4d400af..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png
deleted file mode 100644
index 19f7294e..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png
deleted file mode 100644
index 215ae0dc..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png
deleted file mode 100644
index d0eb79f7..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png
deleted file mode 100644
index d0eb79f7..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png
deleted file mode 100644
index 47b77383..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png
deleted file mode 100644
index 6f945260..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png
deleted file mode 100644
index 25c78681..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png
deleted file mode 100644
index a3b9aed6..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png
deleted file mode 100644
index 7a47171b..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png
deleted file mode 100644
index 879b32c9..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png
deleted file mode 100644
index f7bf59eb..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png
deleted file mode 100644
index a98e810a..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png
deleted file mode 100644
index 65c20b0d..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png
deleted file mode 100644
index 64050b28..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png
deleted file mode 100644
index b3ce1d02..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png
deleted file mode 100644
index fb817b0b..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png
deleted file mode 100644
index 688ebb44..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png
deleted file mode 100644
index 0ea6e542..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png
deleted file mode 100644
index b6aed32d..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png
deleted file mode 100644
index 487429d8..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png
deleted file mode 100644
index cc401376..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_4.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_4.png
deleted file mode 100644
index 84cb6046..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_4.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png
deleted file mode 100644
index 2547b640..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png
deleted file mode 100644
index 7e211547..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png
deleted file mode 100644
index 46af192e..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png
deleted file mode 100644
index d810ec78..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png b/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png
deleted file mode 100644
index 7f822e60..00000000
Binary files a/sample/screenshots/debug/Api28/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png and /dev/null differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png
index 09bd8417..61b0f63a 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_0.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png
index 3109aba6..e8fa4515 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_1.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png
index 80135b8e..09bd8417 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_2.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png
index 80135b8e..3109aba6 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_3.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png
index 01be0547..80135b8e 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_4.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png
index 61b0f63a..80135b8e 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_5.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png
index e8fa4515..01be0547 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_color_screenshot_test_6.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png
index 87dbc877..a57251c0 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_0.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png
index c4d6bcbd..6f642ddd 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_1.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png
index cad0074c..1ce95fc4 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_10.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png
index 25d22d1b..25ce80af 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_11.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png
index 58dbcd90..3bca17ae 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_12.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png
index 90a3f672..1a718076 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_13.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png
index 245338f7..0c32dad5 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_14.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png
index e7db397a..4eb14d36 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_15.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png
index e7db397a..4eb14d36 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_16.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_17.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_17.png
index aacd619c..e22e816d 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_17.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_17.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_18.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_18.png
index 6aeeda0a..1616f8cc 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_18.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_18.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_19.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_19.png
index 3208dbb9..1ccf6737 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_19.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_19.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png
index f8932391..d4db152a 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_2.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png
index 6132baec..22a436a4 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_3.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png
index f409ad5a..18090019 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_4.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png
index d357b80a..55ead892 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_5.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png
index af381f75..c703ac4a 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_6.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png
index 730a4813..05987ac1 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_7.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png
index fbab8de1..9e8abe73 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_8.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png
index 639ec2c1..1b1ed30a 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_composable_screenshot_test_9.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png
index d911a181..7163f29e 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_0.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png
index 62e503c5..91c9d680 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_1.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png
index 0ca1a331..f444b8e4 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_10.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png
index 31734684..59040d83 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_11.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png
index b20be36e..828f6a7f 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_12.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png
index 24c26b7a..35073415 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_2.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png
index cdb2390b..1c0409d5 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_3.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png
index 4be83e89..1e841e23 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_5.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png
index d489ba94..b750721e 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_6.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png
index 8afc7f61..d0ef2791 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_7.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png
index 830708d8..eb836564 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_8.png differ
diff --git a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png
index 806e7902..017f1164 100644
Binary files a/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png and b/sample/screenshots/debug/Api29/com.airbnb.android.showkasesample.MyScreenshotTest_ShowkaseCodegen_typography_screenshot_test_9.png differ