diff --git a/extension.toml b/extension.toml
index bac6998..b68922c 100644
--- a/extension.toml
+++ b/extension.toml
@@ -1,6 +1,6 @@
 id = "github-theme"
 name = "Github Theme"
-version = "0.1.1"
+version = "0.1.2"
 schema_version = 1
 authors = ["Pyae Sone Aung <pyaesoneaungrgn@gmail.com>", "Clay Tercek"]
 description = "GitHub themes for Zed"
diff --git a/src/theme.js b/src/theme.js
index e513ce4..cf6eebd 100644
--- a/src/theme.js
+++ b/src/theme.js
@@ -102,7 +102,7 @@ export function getTheme({ themeKey, name, type }) {
       "element.hover": tokens['bgColor/neutral-muted'],
       "element.selected": tokens['bgColor/neutral-muted'],
 
-      "elevated_surface.background": tokens['bgColor/muted'],
+      "elevated_surface.background": tokens['overlay/bgColor'],
 
       "error": tokens['fgColor/danger'],
       "error.background": tokens['bgColor/muted'],
@@ -111,7 +111,7 @@ export function getTheme({ themeKey, name, type }) {
       "ghost_element.active": tokens['bgColor/neutral-muted'],
       "ghost_element.background": tokens['bgColor/transparent'],
       "ghost_element.disabled": tokens['bgColor/disabled'],
-      "ghost_element.hover": tokens['bgColor/default'],
+      "ghost_element.hover": tokens['bgColor/neutral-muted'],
       "ghost_element.selected": tokens['bgColor/neutral-muted'],
 
       "hidden": tokens['fgColor/disabled'],
diff --git a/themes/github_theme.json b/themes/github_theme.json
index b897538..6db9c5f 100644
--- a/themes/github_theme.json
+++ b/themes/github_theme.json
@@ -42,14 +42,14 @@
         "element.disabled": "#eff2f5ff",
         "element.hover": "#818b981f",
         "element.selected": "#818b981f",
-        "elevated_surface.background": "#f6f8faff",
+        "elevated_surface.background": "#ffffffff",
         "error": "#d1242fff",
         "error.background": "#f6f8faff",
         "error.border": "#d1d9e0b3",
         "ghost_element.active": "#818b981f",
         "ghost_element.background": "#ffffff00",
         "ghost_element.disabled": "#eff2f5ff",
-        "ghost_element.hover": "#ffffffff",
+        "ghost_element.hover": "#818b981f",
         "ghost_element.selected": "#818b981f",
         "hidden": "#818b98ff",
         "hidden.background": "#eff2f5ff",
@@ -423,14 +423,14 @@
         "element.disabled": "#eff2f5ff",
         "element.hover": "#818b981f",
         "element.selected": "#818b981f",
-        "elevated_surface.background": "#f6f8faff",
+        "elevated_surface.background": "#ffffffff",
         "error": "#be4e02ff",
         "error.background": "#f6f8faff",
         "error.border": "#d1d9e0b3",
         "ghost_element.active": "#818b981f",
         "ghost_element.background": "#ffffff00",
         "ghost_element.disabled": "#eff2f5ff",
-        "ghost_element.hover": "#ffffffff",
+        "ghost_element.hover": "#818b981f",
         "ghost_element.selected": "#818b981f",
         "hidden": "#818b98ff",
         "hidden.background": "#eff2f5ff",
@@ -804,14 +804,14 @@
         "element.disabled": "#e0e6ebff",
         "element.hover": "#e0e6ebff",
         "element.selected": "#e0e6ebff",
-        "elevated_surface.background": "#e6eaefff",
+        "elevated_surface.background": "#ffffffff",
         "error": "#8a071eff",
         "error.background": "#e6eaefff",
         "error.border": "#454c54ff",
         "ghost_element.active": "#e0e6ebff",
         "ghost_element.background": "#ffffff00",
         "ghost_element.disabled": "#e0e6ebff",
-        "ghost_element.hover": "#ffffffff",
+        "ghost_element.hover": "#e0e6ebff",
         "ghost_element.selected": "#e0e6ebff",
         "hidden": "#59636eff",
         "hidden.background": "#e0e6ebff",
@@ -1185,14 +1185,14 @@
         "element.disabled": "#eff2f5ff",
         "element.hover": "#818b981f",
         "element.selected": "#818b981f",
-        "elevated_surface.background": "#f6f8faff",
+        "elevated_surface.background": "#ffffffff",
         "error": "#d1242fff",
         "error.background": "#f6f8faff",
         "error.border": "#d1d9e0b3",
         "ghost_element.active": "#818b981f",
         "ghost_element.background": "#ffffff00",
         "ghost_element.disabled": "#eff2f5ff",
-        "ghost_element.hover": "#ffffffff",
+        "ghost_element.hover": "#818b981f",
         "ghost_element.selected": "#818b981f",
         "hidden": "#818b98ff",
         "hidden.background": "#eff2f5ff",
@@ -1573,7 +1573,7 @@
         "ghost_element.active": "#656c7633",
         "ghost_element.background": "#00000000",
         "ghost_element.disabled": "#212830ff",
-        "ghost_element.hover": "#0d1117ff",
+        "ghost_element.hover": "#656c7633",
         "ghost_element.selected": "#656c7633",
         "hidden": "#656c7699",
         "hidden.background": "#212830ff",
@@ -1954,7 +1954,7 @@
         "ghost_element.active": "#656c7633",
         "ghost_element.background": "#00000000",
         "ghost_element.disabled": "#212830ff",
-        "ghost_element.hover": "#0d1117ff",
+        "ghost_element.hover": "#656c7633",
         "ghost_element.selected": "#656c7633",
         "hidden": "#656c7699",
         "hidden.background": "#212830ff",
@@ -2335,7 +2335,7 @@
         "ghost_element.active": "#212830ff",
         "ghost_element.background": "#00000000",
         "ghost_element.disabled": "#262c36ff",
-        "ghost_element.hover": "#010409ff",
+        "ghost_element.hover": "#212830ff",
         "ghost_element.selected": "#212830ff",
         "hidden": "#9198a199",
         "hidden.background": "#262c36ff",
@@ -2716,7 +2716,7 @@
         "ghost_element.active": "#656c7633",
         "ghost_element.background": "#00000000",
         "ghost_element.disabled": "#212830ff",
-        "ghost_element.hover": "#0d1117ff",
+        "ghost_element.hover": "#656c7633",
         "ghost_element.selected": "#656c7633",
         "hidden": "#656c7699",
         "hidden.background": "#212830ff",
@@ -3090,14 +3090,14 @@
         "element.disabled": "#2a313cff",
         "element.hover": "#656c7633",
         "element.selected": "#656c7633",
-        "elevated_surface.background": "#262c36ff",
+        "elevated_surface.background": "#2a313cff",
         "error": "#e5534bff",
         "error.background": "#262c36ff",
         "error.border": "#3d444db3",
         "ghost_element.active": "#656c7633",
         "ghost_element.background": "#00000000",
         "ghost_element.disabled": "#2a313cff",
-        "ghost_element.hover": "#212830ff",
+        "ghost_element.hover": "#656c7633",
         "ghost_element.selected": "#656c7633",
         "hidden": "#656c76ff",
         "hidden.background": "#2a313cff",