diff --git a/styles/src/themes/base16.ts b/styles/src/themes/base16.ts
index 0744611fce..07ffc59136 100644
--- a/styles/src/themes/base16.ts
+++ b/styles/src/themes/base16.ts
@@ -24,31 +24,31 @@ export function createTheme(name: string, isLight: boolean, neutral: ColorToken[
       base: neutral[1],
       hovered: withOpacity(neutral[2], blend),
       active: withOpacity(neutral[2], blend * 1.5),
-      focused: neutral[2],
+      focused: withOpacity(neutral[2], blend),
     },
     300: {
       base: neutral[1],
       hovered: withOpacity(neutral[2], blend),
       active: withOpacity(neutral[2], blend * 1.5),
-      focused: neutral[2],
+      focused: withOpacity(neutral[2], blend),
     },
     500: {
       base: neutral[0],
-      hovered: neutral[1],
-      active: neutral[1],
-      focused: neutral[1],
+      hovered: withOpacity(neutral[1], blend),
+      active: withOpacity(neutral[1], blend * 1.5),
+      focused: withOpacity(neutral[1], blend),
     },
     on300: {
       base: neutral[0],
-      hovered: neutral[1],
-      active: neutral[1],
-      focused: neutral[1],
+      hovered: withOpacity(neutral[1], blend),
+      active: withOpacity(neutral[1], blend * 2),
+      focused: withOpacity(neutral[1], blend),
     },
     on500: {
       base: neutral[1],
-      hovered: neutral[3],
-      active: neutral[3],
-      focused: neutral[3],
+      hovered: withOpacity(neutral[2], blend),
+      active: withOpacity(neutral[2], blend * 2),
+      focused: withOpacity(neutral[2], blend),
     },
     ok: {
       base: withOpacity(accent.green, 0.15),