diff --git a/CHANGELOG.md b/CHANGELOG.md
index db271aff..8e93f2f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Custom [nvim-web-devicons](https://github.com/kyazdani42/nvim-web-devicons) colors (releated to #16)
 - `msgAreaStyle` config added
 - `border` color added in `colors.lua`
+- Set `border` colors according to `themeStyle`
 
 ### Fixes
 
diff --git a/lua/github-theme/colors.lua b/lua/github-theme/colors.lua
index 0fdf85fc..704272a7 100644
--- a/lua/github-theme/colors.lua
+++ b/lua/github-theme/colors.lua
@@ -45,6 +45,8 @@ function M.setup(config)
     bg_visual_selection = themes({dark = "#284566", dimmed = "#264466", light = "#dbe9f9"}),
     bg_highlight = themes({dark = "#2c313a", dimmed = "#2d333b", light = "#f6f8fa"}),
 
+    border = themes({dark = "#c9d1d9", dimmed = "#444c56", light = "#044289"}),
+
     fg = themes({dark = "#c9d1d9", dimmed = "#adbac7", light = "#24292e"}),
     fg_light = themes({dark = "#d1d5da", dimmed = "#adbac7", light = "#586069"}),
     fg_gutter = themes({dark = "#e1e4e8", dimmed = "#768390", light = "#babbbd"}),
@@ -150,7 +152,6 @@ function M.setup(config)
   colors.eob = config.transparent and colors.fg_light or colors.eob
 
   colors.fg_search = colors.none
-  colors.border = colors.bg_visual
   colors.border_highlight = colors.blue
   colors.bg_statusline = colors.blue
 
diff --git a/lua/github-theme/theme.lua b/lua/github-theme/theme.lua
index 8b5a5676..03d08adf 100644
--- a/lua/github-theme/theme.lua
+++ b/lua/github-theme/theme.lua
@@ -50,7 +50,7 @@ function M.setup(config)
     NormalNC = {fg = c.fg, bg = config.transparent and c.none or c.bg}, -- normal text in non-current windows
     NormalSB = {fg = c.fg, bg = c.bg_sidebar}, -- normal text in non-current windows
     NormalFloat = {fg = c.fg, bg = c.bg_float}, -- Normal text in floating windows.
-    FloatBorder = {fg = c.boder},
+    FloatBorder = {fg = c.border},
     Pmenu = {bg = c.pmenu.bg, fg = c.fg}, -- Popup menu: normal item.
     PmenuSel = {bg = c.pmenu.select, fg = c.fg}, -- Popup menu: selected item.
     PmenuSbar = {bg = c.pmenu.bg}, -- Popup menu: scrollbar.