diff --git a/samples/java_layout/src/main/res/values-night/colors.xml b/samples/java_layout/src/main/res/values-night/colors.xml
new file mode 100644
index 000000000..5afae8157
--- /dev/null
+++ b/samples/java_layout/src/main/res/values-night/colors.xml
@@ -0,0 +1,143 @@
+
+ #A6CDD4
+ #0C363C
+ #002C32
+ #93B9C0
+ #FFFFFF
+ #213615
+ #C2DDAE
+ #304523
+ #D5BFE0
+ #392A44
+ #30223B
+ #C1ACCD
+ #FFB4AB
+ #690005
+ #93000A
+ #FFDAD6
+ #121414
+ #E2E2E2
+ #121414
+ #E2E2E2
+ #414849
+ #C1C8C9
+ #8B9293
+ #414849
+ #000000
+ #E2E2E2
+ #2F3131
+ #3F646B
+ #C2E9F1
+ #001F24
+ #A6CDD4
+ #264C52
+ #D0EBBB
+ #0D2003
+ #B5CEA1
+ #374D29
+ #F1DBFD
+ #24162E
+ #D5BFE0
+ #51415C
+ #121414
+ #38393A
+ #0D0E0F
+ #1A1C1C
+ #1E2020
+ #282A2B
+ #333535
+ #AAD1D9
+ #001A1E
+ #71979E
+ #000000
+ #FFFFFF
+ #213615
+ #C2DDAE
+ #112406
+ #D9C3E5
+ #1E1029
+ #9D8AA9
+ #000000
+ #FFBAB1
+ #370001
+ #FF5449
+ #000000
+ #121414
+ #E2E2E2
+ #121414
+ #FBFBFB
+ #414849
+ #C5CCCD
+ #9DA4A6
+ #7D8486
+ #000000
+ #E2E2E2
+ #282A2B
+ #284D54
+ #C2E9F1
+ #001417
+ #A6CDD4
+ #133B41
+ #D0EBBB
+ #041500
+ #B5CEA1
+ #273C1A
+ #F1DBFD
+ #190B23
+ #D5BFE0
+ #3F304B
+ #121414
+ #38393A
+ #0D0E0F
+ #1A1C1C
+ #1E2020
+ #282A2B
+ #333535
+ #F1FDFF
+ #000000
+ #AAD1D9
+ #000000
+ #FFFFFF
+ #000000
+ #C2DDAE
+ #000000
+ #FFF9FB
+ #000000
+ #D9C3E5
+ #000000
+ #FFF9F9
+ #000000
+ #FFBAB1
+ #000000
+ #121414
+ #E2E2E2
+ #121414
+ #FFFFFF
+ #414849
+ #F5FCFD
+ #C5CCCD
+ #C5CCCD
+ #000000
+ #E2E2E2
+ #000000
+ #032F35
+ #C6EEF5
+ #000000
+ #AAD1D9
+ #001A1E
+ #D4EFBF
+ #000000
+ #B9D3A5
+ #071B01
+ #F5E0FF
+ #000000
+ #D9C3E5
+ #1E1029
+ #121414
+ #38393A
+ #0D0E0F
+ #1A1C1C
+ #1E2020
+ #282A2B
+ #333535
+
diff --git a/samples/java_layout/src/main/res/values-night/themes.xml b/samples/java_layout/src/main/res/values-night/themes.xml
index 57c3379e3..b0e9fa149 100644
--- a/samples/java_layout/src/main/res/values-night/themes.xml
+++ b/samples/java_layout/src/main/res/values-night/themes.xml
@@ -1,31 +1,50 @@
-
diff --git a/samples/java_layout/src/main/res/values/colors.xml b/samples/java_layout/src/main/res/values/colors.xml
index afce3f1ff..28a000934 100644
--- a/samples/java_layout/src/main/res/values/colors.xml
+++ b/samples/java_layout/src/main/res/values/colors.xml
@@ -3,72 +3,150 @@
- #3C437D
- #4D57A9
- #FFFFFF
- #DFE0FF
- #000A64
- #8B5000
- #FFFFFF
- #FFDCBE
- #2C1600
- #00658F
- #FFFFFF
- #C7E7FF
- #001E2E
- #BA1A1A
- #FFDAD6
- #FFFFFF
- #410002
- #FFFBFF
- #1B1B1F
- #FFFBFF
- #1B1B1F
- #E3E1EC
- #46464F
- #777680
- #F3F0F4
- #303034
- #BCC2FF
- #000000
- #4D57A9
- #C7C5D0
- #000000
- #BCC2FF
- #1C2678
- #343E90
- #DFE0FF
- #FFB870
- #4A2800
- #693C00
- #FFDCBE
- #85CFFF
- #00344C
- #004C6C
- #C7E7FF
- #FFB4AB
- #93000A
- #690005
- #FFDAD6
- #1B1B1F
- #E4E1E6
- #1B1B1F
- #E4E1E6
- #46464F
- #C7C5D0
- #91909A
- #1B1B1F
- #E4E1E6
- #4D57A9
- #000000
- #BCC2FF
- #46464F
- #000000
+ #002328
+ #FFFFFF
+ #1E444A
+ #B3DAE2
+ #4E653F
+ #FFFFFF
+ #E9FFD6
+ #445A36
+ #261831
+ #FFFFFF
+ #483853
+ #E1CBEC
+ #BA1A1A
+ #FFFFFF
+ #FFDAD6
+ #410002
+ #F9F9F9
+ #1A1C1C
+ #F9F9F9
+ #1A1C1C
+ #DDE4E5
+ #414849
+ #71787A
+ #C1C8C9
+ #000000
+ #2F3131
+ #F1F1F1
+ #A6CDD4
+ #C2E9F1
+ #001F24
+ #A6CDD4
+ #264C52
+ #D0EBBB
+ #0D2003
+ #B5CEA1
+ #374D29
+ #F1DBFD
+ #24162E
+ #D5BFE0
+ #51415C
+ #DADADA
+ #F9F9F9
+ #FFFFFF
+ #F4F3F3
+ #EEEEEE
+ #E8E8E8
+ #E2E2E2
+ #002328
+ #FFFFFF
+ #1E444A
+ #FFFFFF
+ #334926
+ #FFFFFF
+ #647B54
+ #FFFFFF
+ #261831
+ #FFFFFF
+ #483853
+ #FFFFFF
+ #8C0009
+ #FFFFFF
+ #DA342E
+ #FFFFFF
+ #F9F9F9
+ #1A1C1C
+ #F9F9F9
+ #1A1C1C
+ #DDE4E5
+ #3D4445
+ #596062
+ #757C7D
+ #000000
+ #2F3131
+ #F1F1F1
+ #A6CDD4
+ #557B81
+ #FFFFFF
+ #3D6268
+ #FFFFFF
+ #647B54
+ #FFFFFF
+ #4C623D
+ #FFFFFF
+ #806E8C
+ #FFFFFF
+ #675672
+ #FFFFFF
+ #DADADA
+ #F9F9F9
+ #FFFFFF
+ #F4F3F3
+ #EEEEEE
+ #E8E8E8
+ #E2E2E2
+ #002328
+ #FFFFFF
+ #1E444A
+ #FFFFFF
+ #132708
+ #FFFFFF
+ #334926
+ #FFFFFF
+ #261831
+ #FFFFFF
+ #483853
+ #FFFFFF
+ #4E0002
+ #FFFFFF
+ #8C0009
+ #FFFFFF
+ #F9F9F9
+ #1A1C1C
+ #F9F9F9
+ #000000
+ #DDE4E5
+ #1E2526
+ #3D4445
+ #3D4445
+ #000000
+ #2F3131
+ #FFFFFF
+ #CBF3FB
+ #22484E
+ #FFFFFF
+ #063238
+ #FFFFFF
+ #334926
+ #FFFFFF
+ #1E3212
+ #FFFFFF
+ #4D3D58
+ #FFFFFF
+ #362741
+ #FFFFFF
+ #DADADA
+ #F9F9F9
+ #FFFFFF
+ #F4F3F3
+ #EEEEEE
+ #E8E8E8
+ #E2E2E2
- @color/md_theme_light_primary
+ @color/md_theme_primary
diff --git a/samples/java_layout/src/main/res/values/themes.xml b/samples/java_layout/src/main/res/values/themes.xml
index c45707d79..8fd04fad6 100644
--- a/samples/java_layout/src/main/res/values/themes.xml
+++ b/samples/java_layout/src/main/res/values/themes.xml
@@ -1,32 +1,52 @@