diff --git a/.config/ags/scss/_osk.scss b/.config/ags/scss/_osk.scss
index d5e62fffd..6c42a1085 100644
--- a/.config/ags/scss/_osk.scss
+++ b/.config/ags/scss/_osk.scss
@@ -11,7 +11,7 @@ $osk_key_fontsize: 1.091rem;
     @include elevation2;
     // min-height: 29.591rem;
     // min-width: 50rem;
-    background-color: $t_background;
+    background-color: $layer0;
 }
 
 .osk-body {
@@ -32,7 +32,7 @@ $osk_key_fontsize: 1.091rem;
 
 .osk-dragline {
     @include full-rounding;
-    background-color: $surfaceVariant;
+    background-color: $onLayer0Inactive;
     min-height: 0.273rem;
     min-width: 10.227rem;
     margin-top: 0.545rem;
@@ -41,8 +41,8 @@ $osk_key_fontsize: 1.091rem;
 
 .osk-key {
     border-radius: $osk_key_rounding;
-    background-color: $t_surfaceVariant;
-    color: $onSurfaceVariant;
+    background-color: $layer1;
+    color: $onLayer1;
     padding: $osk_key_padding;
     font-weight: 500;
     font-size: $osk_key_fontsize;
@@ -50,16 +50,16 @@ $osk_key_fontsize: 1.091rem;
 
 .osk-key:hover,
 .osk-key:focus {
-    background-color: $hovercolor;
+    background-color: $layer1Hover;
 }
 
 .osk-key:active {
-    background-color: $activecolor;
+    background-color: $layer1Active;
     font-size: $osk_key_fontsize;
 }
 
 .osk-key-active {
-    background-color: $activecolor;
+    background-color: $layer1Active;
 }
 
 .osk-key-normal {
@@ -95,8 +95,8 @@ $osk_key_fontsize: 1.091rem;
 
 .osk-control-button {
     border-radius: $osk_key_rounding;
-    background-color: $t_surfaceVariant;
-    color: $onSurfaceVariant;
+    background-color: $layer1;
+    color: $onLayer1;
     font-weight: 500;
     font-size: $osk_key_fontsize;
     padding: 0.682rem;
@@ -104,11 +104,11 @@ $osk_key_fontsize: 1.091rem;
 
 .osk-control-button:hover,
 .osk-control-button:focus {
-    background-color: mix($t_surfaceVariant, $t_onSurfaceVariant, 90%);
+    background-color: $layer1Hover;
 }
 
 .osk-control-button:active {
-    background-color: mix($t_surfaceVariant, $t_onSurfaceVariant, 70%);
+    background-color: $layer1Active;
     font-size: $osk_key_fontsize;
 }