diff --git a/.gitignore b/.gitignore
index 2b27ef0..7b8b949 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ after
 **/.DS_Store
 lua/custom/secret
 lua/custom/configs/secret
+lua/settings/theme.lua
diff --git a/init.lua b/init.lua
index 14f0456..536bc39 100644
--- a/init.lua
+++ b/init.lua
@@ -126,7 +126,7 @@ opt.showcmd = false -- show command in status line
 opt.cmdheight = 0
 opt.cmdwinheight = 5 -- Command-line lines
 opt.equalalways = true -- Resize windows on split or close
-opt.colorcolumn = '+0' -- Column highlight at textwidth's max character-limit
+opt.colorcolumn = '80' -- Column highlight at textwidth's max character-limit
 
 opt.cursorline = true
 opt.cursorlineopt = { 'number', 'screenline' }
diff --git a/lua/custom/maps/init.lua b/lua/custom/maps/init.lua
index fb7d3f5..6918230 100644
--- a/lua/custom/maps/init.lua
+++ b/lua/custom/maps/init.lua
@@ -104,6 +104,9 @@ vim.keymap.set({ 'n', 'v' }, '<Down>', '<cmd> move+2<cr>', { desc = 'Move line d
 vim.keymap.set({ 'n', 'v' }, '<Left>', '<<', { desc = 'Less indentation' })
 vim.keymap.set({ 'n', 'v' }, '<Right>', '>>', { desc = 'More indentation' })
 
+-- format a long line into multiple with length 80
+vim.keymap.set({ 'v' }, '<leader>fl', ':!fmt -w80<CR>', { desc = '[F]ormat long [L]ines into smaller ones' })
+
 --------------------------------------------------------------------------------
 -- Formating
 --------------------------------------------------------------------------------
diff --git a/lua/custom/plugins/themes.lua b/lua/custom/plugins/themes.lua
index 96b8616..6657993 100644
--- a/lua/custom/plugins/themes.lua
+++ b/lua/custom/plugins/themes.lua
@@ -12,14 +12,39 @@ return {
     config = function()
       require('themery').setup {
         themes = {
+          -- Dark Themes
+          {
+            name = '==========Dark Themes==========',
+            colorscheme = '', -- this actually keeps the selected theme, but it wont work with persistence
+          },
+          {
+            name = 'nvim default',
+            colorscheme = 'default',
+          },
+          {
+            name = 'nvim lunaperche',
+            colorscheme = 'lunaperche',
+          },
+          {
+            name = 'nvim quiet',
+            colorscheme = 'quiet',
+          },
+          {
+            name = 'nvim retrobox',
+            colorscheme = 'retrobox',
+          },
+          {
+            name = 'nvim slate',
+            colorscheme = 'slate',
+          },
+          {
+            name = 'nvim vim',
+            colorscheme = 'vim',
+          },
           {
             name = 'tokyonight',
             colorscheme = 'tokyonight',
           },
-          {
-            name = 'tokyonight-day',
-            colorscheme = 'tokyonight-day',
-          },
           {
             name = 'tokyonight-moon',
             colorscheme = 'tokyonight-moon',
@@ -36,14 +61,23 @@ return {
             name = 'kanagawa-dragon',
             colorscheme = 'kanagawa-dragon',
           },
-          {
-            name = 'kanagawa-lotus',
-            colorscheme = 'kanagawa-lotus',
-          },
           {
             name = 'kanagawa-wave',
             colorscheme = 'kanagawa-wave',
           },
+          -- Light themes
+          {
+            name = '==========Light Themes==========',
+            colorscheme = '', -- this actually keeps the selected theme, but it wont work with persistence
+          },
+          {
+            name = 'tokyonight-day',
+            colorscheme = 'tokyonight-day',
+          },
+          {
+            name = 'kanagawa-lotus',
+            colorscheme = 'kanagawa-lotus',
+          },
         },
         themeConfigFile = '~/.config/nvim/lua/settings/theme.lua',
         livePreview = true, -- Apply theme while browsing. Default to true.
diff --git a/lua/settings/theme.lua b/lua/settings/theme.lua
deleted file mode 100644
index 55fb22d..0000000
--- a/lua/settings/theme.lua
+++ /dev/null
@@ -1,5 +0,0 @@
--- Themery block
--- This block will be replaced by Themery.
-vim.cmd("colorscheme kanagawa-wave")
-vim.g.theme_id = 8
--- end themery block