fix(theme): consistent theme

16 files changed, 673 insertions, 608 deletions

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index e92ca09..02d715e 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -15,6 +15,8 @@ set -g -x LS_COLORS 'ow=36:di=34:fi=0:ex=32:ln=35:'
 
 set -g -x JULIA_NUM_THREADS 4
 
+set -g -x GTK_THEME Gruvbox-Material-Dark
+
 # Set system apps
 set EDITOR nvim
 set BROWSER qutebrowser
diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables
index 33bb6b2..afb28e2 100644
--- a/.config/fish/fish_variables
+++ b/.config/fish/fish_variables
@@ -15,24 +15,24 @@ SETUVAR __fish_init_2_39_8:\x1d
 SETUVAR __fish_init_2_3_0:\x1d
 SETUVAR __fish_init_3_x:\x1d
 SETUVAR __fish_initialized:3100
-SETUVAR fish_color_autosuggestion:brblack
+SETUVAR fish_color_autosuggestion:585858
 SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:brgreen
-SETUVAR fish_color_comment:brmagenta
+SETUVAR fish_color_command:a1b56c
+SETUVAR fish_color_comment:f7ca88
 SETUVAR fish_color_cwd:green
 SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:brmagenta
-SETUVAR fish_color_error:brred
-SETUVAR fish_color_escape:brcyan
+SETUVAR fish_color_end:ba8baf
+SETUVAR fish_color_error:ab4642
+SETUVAR fish_color_escape:86c1b9
 SETUVAR fish_color_history_current:\x2d\x2dbold
 SETUVAR fish_color_host:normal
 SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
+SETUVAR fish_color_match:7cafc2
 SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:cyan
-SETUVAR fish_color_param:brblue
-SETUVAR fish_color_quote:yellow
-SETUVAR fish_color_redirection:bryellow
+SETUVAR fish_color_operator:7cafc2
+SETUVAR fish_color_param:d8d8d8
+SETUVAR fish_color_quote:f7ca88
+SETUVAR fish_color_redirection:d8d8d8
 SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
 SETUVAR fish_color_status:red
@@ -41,8 +41,8 @@ SETUVAR fish_color_valid_path:\x2d\x2dunderline
 SETUVAR fish_greeting:\x1d
 SETUVAR fish_key_bindings:fish_vi_key_bindings
 SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:yellow
-SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_description:B3A06D\x1eyellow
+SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
 SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
 SETUVAR fish_user_paths:/home/nolln/\x2epoetry/bin\x1e/home/nolln/root/bin\x1e/home/nolln/\x2eyarn/bin\x1e/home/nolln/code/bin\x1e/home/nolln/go/bin\x1e/home/nolln/\x2elocal/bin\x1e/home/nolln/code/muon/bin\x1e/home/nolln/\x2efzf/bin\x1e/home/nolln/opt/Vivado/2019\x2e2/bin
 SETUVAR pure_begin_prompt_with_current_directory:true
diff --git a/.config/mutt/colors b/.config/mutt/colors
index c34b1e9..d904ec1 100644
--- a/.config/mutt/colors
+++ b/.config/mutt/colors
@@ -1,51 +1,52 @@
 # Theme for Mutt
 
 # general ------------ foreground ---- background -----------------------------
-color error		        color196        default
-color indicator		    color215        default
+color error		        red             default
+color indicator		    brightblue      default
 color markers		    default         default
-color message		    color228        default
+color message		    white           default
 color normal		    default		    default
-color prompt		    color153        default
-color search		    color28         default
-color status 		    color153        default 
+color prompt		    brightwhite     default
+color search		    lightgreen      default
+color status 		    color243        default
 color tilde		        color159        default
-color tree		        color95         default
+color tree		        brightmagenta   default
 
 # message index ------ foreground ---- background -----------------------------
 color index_author     default     default     ".*"
-color index_author     default     default     ~F
+color index_author     blue        default     ~F
 color index_author     color243    default     ~Q
-color index_author     color36     default     ~N
-color index_author     color124    default     ~D
+color index_author     brightgreen default     ~N
+color index_author     brightred   default     ~D
 
 color index_subject    default     default     ".*"
-color index_subject    default     default     ~F
+color index_subject    blue        default     ~F
 color index_subject    color243    default     ~Q
-color index_subject    color36     default     ~N
-color index_subject    color161    default     ~D
+color index_subject    brightgreen default     ~N
+color index_subject    brightred   default     ~D
+color index_subject    white       default	   ~v
 
-color index		       default     default     ~F # flagged messages
-color index		       color36     default 	   ~N # new messages
+color index		       blue        default     ~F # flagged messages
+color index		       brightgreen default 	   ~N # new messages
 color index		       color243    default 	   ~Q # messages which have been replied to
-color index		       color161    default 	   ~D # deleted messages
+color index		       brightred   default 	   ~D # deleted messages
 color index		       default     default 	   ~T # tagged messages
-color index		       color95     default	   ~v # messages part of a collapsed thread
+color index            white       default	   ~v # messages part of a collapsed thread
 
 # message headers ---- foreground ---- background -----------------------------
-color hdrdefault	    color152    default
-color header		    color215    default		^Subject:.*
+color hdrdefault	    white             default
+color header		    brightblue        default		^Subject:.*
 
 # message body ------- foreground ---- background -----------------------------
-color attachment	    color216    default
-color body		        default     default		[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+               # email addresses
-color body		        color159    default		(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+        # URLs
-color body		        color170    default		(^|[[:space:]])\\*[^[:space:]]+\\*([[:space:]]|$) # *bold* text
-color body		        color183    default		(^|[[:space:]])_[^[:space:]]+_([[:space:]]|$)     # _underlined_ text
-color body		        default     default		(^|[[:space:]])/[^[:space:]]+/([[:space:]]|$)     # /italic/ text
-color quoted		    color138    default
-color quoted1		    color243    default
-color quoted2		    color242    default
-color quoted3		    color241    default
-color quoted4		    color240    default
-color signature		    default     default
+color attachment	    brightwhite  default
+color body		        white        default		[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+               # email addresses
+color body		        brightcyan   default		(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+        # URLs
+color body		        brightwhite  default		(^|[[:space:]])\\*[^[:space:]]+\\*([[:space:]]|$) # *bold* text
+color body		        white        default		(^|[[:space:]])_[^[:space:]]+_([[:space:]]|$)     # _underlined_ text
+color body		        default      default		(^|[[:space:]])/[^[:space:]]+/([[:space:]]|$)     # /italic/ text
+color quoted		    color244     default
+color quoted1		    color242     default
+color quoted2		    color240     default
+color quoted3		    color238     default
+color quoted4		    color236     default
+color signature		    white        default
diff --git a/.config/mutt/mail b/.config/mutt/mail
index bc98f1f..4b845d3 100644
--- a/.config/mutt/mail
+++ b/.config/mutt/mail
@@ -7,6 +7,8 @@ set realname     = "Nicholas B. Noll"
 set editor       = "nvim +':set textwidth=0' +':set wrapmargin=0' +':set wrap'"
 set send_charset = "utf-8"
 
+alternative_order text/plain text/enriched text/html
+
 set delete
 unset confirmappend
 set quit
@@ -17,7 +19,7 @@ set message_cachedir = "~/.cache/mutt/body"
 
 # encrypt
 set pgp_sign_as=0x866A118A49FDD67D1DEF1537D857DC73F04B8EC3
-set crypt_autosign
+# set crypt_autosign
 set crypt_replyencrypt
 set crypt_replysign
 set crypt_replysignencrypted
diff --git a/.config/mutt/mailcap b/.config/mutt/mailcap
index 95c723f..01dbaa1 100644
--- a/.config/mutt/mailcap
+++ b/.config/mutt/mailcap
@@ -11,7 +11,8 @@ image/gif; ~/.config/mutt/view_attachment.sh %s gif
 application/pdf; ~/.config/mutt/view_attachment.sh %s pdf
 
 # Explicitly render in browser with "v" (view attachment):
-text/html; CHARSET=%{charset} ~/.config/mutt/view_attachment.sh %s html
+# text/html; CHARSET=%{charset} ~/.config/mutt/view_attachment.sh %s html
+text/html; w3m -I %{charset} -T text/html; copiousoutput;
 text/plain; ~/.config/mutt/view_mail.sh %s %{charset}; needsterminal
 
 # Unidentified files
diff --git a/.config/mutt/muttrc b/.config/mutt/muttrc
index c214105..587c545 100644
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@@ -9,6 +9,8 @@ source $HOME/.config/mutt/colors
 auto_view text/plain text/html
 set sleep_time = 0
 
+set signature = $HOME/.config/mutt/signature
+
 # sidebar
 set sidebar_visible
 set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
diff --git a/.config/mutt/usr/gmail b/.config/mutt/usr/gmail
index b256faa..e2a3f0d 100644
--- a/.config/mutt/usr/gmail
+++ b/.config/mutt/usr/gmail
@@ -6,7 +6,7 @@ set spoolfile  = "+gmail/INBOX"
 set postponed  = "+gmail/[Gmail].Drafts"
 set trash      = "+gmail/[Gmail].Trash"
 set record     = "+gmail/[Gmail].Sent Mail"
-set sendmail   = "/usr/bin/msmtp -a gmail"
+set sendmail   = "email gmail"
 set copy       = no
 
 # account specific macros
diff --git a/.config/mutt/usr/main b/.config/mutt/usr/main
index 9df3df5..4f470f2 100644
--- a/.config/mutt/usr/main
+++ b/.config/mutt/usr/main
@@ -7,7 +7,7 @@ set record     = "+main/Sent"
 set postponed  = "+main/Drafts"
 set trash      = "+main/Trash"
 set mbox       = "+main/Archive"
-set sendmail   = "/usr/bin/msmtp -a main"
+set sendmail   = "email main"
 set copy       = yes
 
 # account specific macros
diff --git a/.config/nvim/lua/keybind.lua b/.config/nvim/lua/keybind.lua
index 9f33083..28b8171 100644
--- a/.config/nvim/lua/keybind.lua
+++ b/.config/nvim/lua/keybind.lua
@@ -33,6 +33,8 @@ vim.api.nvim_set_keymap("n", "<Leader><Leader>d",     ":Termdebug<CR>", { norema
 vim.api.nvim_set_keymap("n", "<Leader><Leader>b",     ":Break<CR>",     { noremap = true, silent = true })
 vim.api.nvim_set_keymap("n", "<Leader><Leader><S-b>", ":Clear<CR>",     { noremap = true, silent = true })
 
+vim.api.nvim_set_keymap("n", "ga", ":EasyAlign<CR>", { noremap = true })
+
 --------------------------------------------------------------------------
 -- insert
 
@@ -46,6 +48,8 @@ vim.api.nvim_set_keymap("x", "<C-j>", "<C-w>j", { noremap = true })
 vim.api.nvim_set_keymap("x", "<C-k>", "<C-w>k", { noremap = true })
 vim.api.nvim_set_keymap("x", "<C-l>", "<C-w>l", { noremap = true })
 
+vim.api.nvim_set_keymap("x", "ga", ":EasyAlign<CR>", { noremap = true })
+
 --------------------------------------------------------------------------
 -- keybind
 
@@ -55,4 +59,4 @@ vim.api.nvim_set_keymap("c", "<C-e>", "<End>",  { noremap = true })
 --------------------------------------------------------------------------
 -- netrw
 
-vim.cmd("nmap <unique> <C-r> <Plug>NetrwRefresh")
+vim.cmd("nmap <unique> <C-;> <Plug>NetrwRefresh")
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index e9238b4..1bf8452 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -51,6 +51,7 @@ if vi then
 end
 
 opt.modelines      = 5    -- scan this many lines looking for modeline
+opt.mouse          = 'a'  -- all modes allow mouse
 opt.number         = true -- show line numbers in gutter
 opt.pumblend       = 10   -- pseudo-transparency for popup-menu
 opt.relativenumber = true -- show relative numbers in gutter
diff --git a/.config/nvim/lua/theme.lua b/.config/nvim/lua/theme.lua
index 8b14485..6e297ca 100644
--- a/.config/nvim/lua/theme.lua
+++ b/.config/nvim/lua/theme.lua
@@ -1,171 +1,186 @@
 vim.cmd("hi clear")
 
-local theme = {
-    [22]  = '#006F00', [23]  = '#007173', [24]  = '#007299', [25]  = '#0074BE',
-    [30]  = '#009799', [31]  = '#0099BD', [38]  = '#00BDDF', [52]  = '#730B00',
-    [58]  = '#727100', [59]  = '#727272', [65]  = '#719872', [66]  = '#719899',
-    [67]  = '#7299BC', [68]  = '#719CDF', [73]  = '#6FBCBD', [74]  = '#70BDDF',
-    [88]  = '#9B1300', [89]  = '#9B1D72', [94]  = '#9A7200', [95]  = '#9A7372',
-    [96]  = '#9A7599', [101] = '#999872', [103] = '#999ABD', [108] = '#98BC99',
-    [109] = '#98BCBD', [110] = '#98BEDE', [116] = '#97DDDF', [125] = '#BF2172',
-    [131] = '#BE7572', [137] = '#BE9873', [143] = '#BDBB72', [144] = '#BDBC98',
-    [145] = '#BDBDBD', [151] = '#BCDDBD', [152] = '#BCDEDE', [153] = '#BCE0FF',
-    [161] = '#E12672', [168] = '#E17899', [173] = '#E19972', [174] = '#E09B99',
-    [179] = '#DFBC72', [181] = '#E0BEBC', [184] = '#DEDC00', [186] = '#DEDD99',
-    [187] = '#DFDEBD', [189] = '#DFDFFF', [216] = '#FFBD98', [217] = '#FFBFBD',
-    [218] = '#FFC0DE', [220] = '#FFDD00', [222] = '#FFDE99', [224] = '#FFDFDF',
-    [230] = '#FFFFDF', [231] = '#FFFFFF', [232] = '#060606', [233] = '#171717',
-    [234] = '#252525', [235] = '#333233', [236] = '#3F3F3F', [237] = '#4B4B4B',
-    [238] = '#565656', [239] = '#616161', [240] = '#6B6B6B', [241] = '#757575',
-    [249] = '#BFBFBF', [250] = '#C8C8C8', [251] = '#D1D0D1', [252] = '#D9D9D9',
-    [253] = '#E1E1E1', [254] = '#E9E9E9', [255] = '#F1F1F1',
-
-    ['nil']  = "",
-    ['none'] = 'NONE',
-}
-
 function highlight(group, color)
-    local style = color.style and "gui="   .. color.style or "gui=NONE"
-    local fg    = color.fg    and "guifg=" .. color.fg    or "guifg=NONE"
-    local bg    = color.bg    and "guibg=" .. color.bg    or "guibg=NONE"
-    local sp    = color.sp    and "guisp=" .. color.sp    or ""
-
-    local hl = "highlight " .. group .. " " .. style .. " " .. fg .. " " .. bg .. " " .. sp
-
-    vim.cmd(hl)
-
-    if color.link then vim.cmd("highlight! link " .. group .. " " .. color.link) end
+    local gui = {
+        style = color.gui      and  "gui="   .. color.gui      or "gui=NONE",
+        fg    = color.guifg    and  "guifg=" .. color.guifg    or "guifg=NONE",
+        bg    = color.guibg    and  "guibg=" .. color.guibg    or "guibg=NONE",
+        sp    = color.guisp    and  "guisp=" .. color.guisp    or "guisp=NONE",
+    }
+
+    local term = {
+        style = color.cterm      and  "cterm="   .. color.cterm      or "cterm=NONE",
+        fg    = color.ctermfg    and  "ctermfg=" .. color.ctermfg    or "ctermfg=NONE",
+        bg    = color.ctermbg    and  "ctermbg=" .. color.ctermbg    or "ctermbg=NONE",
+        sp    = ""
+    }
+
+    function serialize(options)
+        return " " .. options.style .. " " .. options.fg .. " " .. options.bg .. " " .. options.sp
+    end
+
+    local hi = "highlight " .. group .. serialize(term) .. serialize(gui)
+
+    vim.cmd(hi)
 end
 
-local editor = {
-    Normal           = {},
-    EndOfBuffer      = {},
-    SignColumn       = {},
-    NormalFloat      = { fg = theme[252], bg = theme[237] },
-
-    Special          = { fg = theme[216] },
-    SpecialKey       = { fg = theme[59]  },
-    NonText          = { fg = theme[237] },
-    VertSplit        = { fg = theme[239] },
-
-    LineNr           = { fg = theme[101] },
-    CursorLineNr     = { fg = theme[131] },
-    CursorLine       = { bg = theme[236] },
-
-    Search           = { fg = theme[252], bg = theme[24]  },
-    IncSearch        = { fg = theme[220], bg = theme[238] },
-
-    StatusLine       = { fg = theme[95],  bg = theme[187], style='reverse,bold' },
-    StatusLineNC     = { fg = theme[239], bg = theme[187], style='reverse,bold' },
-    StatusLineTerm   = { fg = theme[95],  bg = theme[187], style='reverse,bold' },
-    StatusLineTermNC = { fg = theme[239], bg = theme[187], style='reverse,bold' },
-
-    TabLineFill      = { fg = theme[239] },
-    TabLineSel       = { fg = theme[187], bg = theme[23] },
-    TabLine          = { fg = theme[249], bg = theme[241] },
-    WildMenu         = { fg = theme[95],  bg = theme[185] },
-
-    Title            = { fg = theme[181] },
-    Question         = { fg = theme[179] },
-    Conceal          = { fg = theme[254], bg = theme[236] },
-    Ignore           = { fg = theme[240], bg = theme[237] },
-
-    Visual           = { bg = theme[23] },
-    VisualNOS        = { bg = theme[23] },
-
-    Folded           = { fg = theme[101], bg = theme[238] },
-    FoldColumn       = { fg = theme[144], bg = theme[94]  },
-
-    Pmenu            = { fg = theme[238], bg = theme[224] },
-    PmenuSel         = { fg = theme[252], bg = theme[89] },
-    PmenuSbar        = { bg = theme[65] },
-    PmenuThumb       = { bg = theme[23] },
-
-    SpellBad         = { fg = theme[168], style = 'italic,undercurl' },
-    SpellCap         = { fg = theme[110], style = 'italic,undercurl' },
-    SpellLocal       = { fg = theme[153], style = 'italic,undercurl' },
-    SpellRare        = { fg = theme[218], style = 'italic,undercurl' },
-
-    DiffAdd          = { bg = theme[22]  },
-    DiffDelete       = { bg = theme[95]  },
-    DiffChange       = { bg = theme[235] },
-    DiffText         = { bg = theme[52]  },
+function link(from, to)
+    for i in ipairs(from)
+    do
+        local hi = "hi! link " .. from[i] .. " " .. to
+        vim.cmd(hi)
+    end
+end
 
-    Directory        = { fg = theme[109] },
+local color = {
+    none = "NONE",
+    blue = {
+        [1] = "#83a598",
+        [2] = "#458588",
+    },
+    yellow = {
+        [1] = "#fabd2f",
+        [2] = "#eecf9",
+    },
+    red = {
+        [1] = "#d75f5f",
+        [2] = "#e96862",
+    },
+    orange = {
+        [1] = "#d65d0e",
+        [2] = "#feb67b",
+    },
+    aqua = {
+        [1] = "#8ec07c",
+        [2] = "#8cb48d",
+    },
+    purple = {
+        [0] = "#a68390",
+        [1] = "#d3869b",
+        [2] = "#b16286",
+    },
+    white = {
+        [1] = "#fbf1c7",
+        [2] = "#ebdbb2",
+        [3] = "#d5c4a1",
+        [4] = "#bdae93",
+        [5] = "#a89984",
+    },
+    gray = {
+        [1] = "#928374",
+        [2] = "#7c6f64",
+        [3] = "#665c54",
+        [4] = "#504945",
+        [5] = "#3c3836",
+    },
+    black = {
+        [0] = "#32302f",
+        [1] = "#282828",
+        [2] = "#1d2021",
+    },
 }
 
-for group, colors in pairs(editor) do highlight(group, colors) end
-
-local syntax = {
-    Number          = { fg = theme[222] },
-    Float           = { fg = theme[222] },
-    Boolean         = { fg = theme[103] },
-    Constant        = { fg = theme[73]  },
-    Character       = { fg = theme[174] },
-    String          = { fg = theme[109] },
-    Identifier      = { fg = theme[217] },
-    Delimiter       = { fg = theme[137] },
-    StringDelimiter = { fg = theme[137] },
-
-    Type            = { fg = theme[179], style='bold' },
-    Keyword         = { fg = theme[168] },
-    Operator        = { fg = theme[186] },
-    Structure       = { fg = theme[116] },
-
-    Label           = { fg = theme[151], style='bold' },
-    Statement       = { fg = theme[108] },
-    Conditional     = { fg = theme[110] },
-    Repeat          = { fg = theme[68], },
-    Function        = { fg = theme[187] },
-
-    PreProc         = { fg = theme[143] },
-    Comment         = { fg = theme[65],  style='italic' },
-    Todo            = { fg = theme[161], bg = theme[235], style='bold' },
-
-    Define          = { fg = theme[173] },
-    Macro           = { fg = theme[173] },
-    Include         = { fg = theme[173] },
-    PreCondit       = { fg = theme[173] },
-
-    Exception       = { fg = theme[161] },
-    Underlined      = { fg = theme[181] },
-    Error           = { fg = theme[252], bg = theme[52] },
-    ErrorMsg        = { fg = theme[252], bg = theme[52] },
+-- TODO: cterm options have not been checked
+local theme = {
+    Normal            = { },
+    EndOfBuffer       = { },
+    NonText           = { ctermfg="238", guifg=color.gray[4] },
+    Comment           = { ctermfg="241", guifg=color.gray[3], gui="italic" },
+    Conceal           = { ctermfg="241", guifg=color.gray[2] },
+    Constant          = { ctermfg="140", guifg=color.orange[2] },
+    String            = { ctermfg="140", guifg=color.blue[1] },
+    Identifier        = { ctermfg="251", guifg=color.white[2], gui="bold" },
+    Statement         = { ctermfg="243", guifg=color.aqua[2] },
+    Operator          = { ctermfg="251", guifg=color.white[3] },
+    PreProc           = { ctermfg="243", guifg=color.red[2] },
+    Type              = { ctermfg="251", guifg=color.yellow[2], gui="bold" },
+    Special           = { ctermfg="243", guifg=color.gray[1] },
+    Error             = { ctermfg="132", guifg=color.orange[1] },
+    Warning           = { ctermfg="179", guifg=color.yellow[1] },
+    ModeMsg           = { ctermfg="243", guifg=color.gray[2] },
+    Todo              = { ctermfg="167", cterm="bold", guifg=color.red[1], guibg=color.black[1], gui="bold" },
+    Underlined        = { ctermfg="251", cterm="underline", guifg=color.white[3], gui="underline" },
+    StatusLine        = { ctermbg="237", ctermfg="140", guibg=color.white[5], guifg=color.gray[5], gui="bold" },
+    StatusLineNC      = { ctermbg="236", ctermfg="243", guibg=color.gray[4], guifg=color.white[3] },
+    WildMenu          = { ctermbg="236", ctermfg="167", guibg=color.gray[5], guifg=color.red[1] },
+    VertSplit         = { ctermbg="236", ctermfg="236", guibg=color.black[0], guifg=color.gray[2] },
+    Title             = { ctermfg="251", cterm="bold", guifg=color.white[3], gui="bold" },
+    LineNr            = { ctermfg="241", guifg=color.gray[2] },
+    CursorLineNr      = { ctermbg="236", ctermfg="140", guifg=color.blue[1] },
+    Cursor            = { ctermbg="140", ctermfg="251", guibg=color.blue[1], guifg=color.white[3] },
+    CursorLine        = { ctermbg="236", guibg=color.black[0] },
+    ColorColumn       = { ctermbg="234", guibg=color.black[1] },
+    SignColumn        = { ctermfg="243", guifg=color.gray[2] },
+    Visual            = { ctermbg="237", guibg=color.gray[3] },
+    VisualNOS         = { ctermbg="238", guibg=color.gray[1] },
+    Pmenu             = { ctermbg="237", guibg=color.gray[3], guifg=color.white[2] },
+    PmenuSbar         = { ctermbg="236", guibg=color.black[0] },
+    PmenuSel          = { ctermbg="236", ctermfg="140", guibg=color.gray[5], guifg=color.blue[1] },
+    PmenuThumb        = { ctermbg="167", guibg=color.red[1] },
+    FoldColumn        = { ctermfg="241", guifg=color.gray[2] },
+    Folded            = { ctermbg="234", ctermfg="243", guibg=color.black[0], guifg=color.white[5] },
+    SpecialKey        = { ctermfg="243", guifg=color.gray[4] },
+    IncSearch         = { ctermbg="167", ctermfg="235", guibg=color.aqua[1], guifg=color.black[1] },
+    Search            = { ctermbg="140", ctermfg="235", guibg=color.blue[1], guifg=color.black[1] },
+    Directory         = { ctermfg="140", guifg=color.blue[1] },
+    MatchParen        = { ctermfg="167", cterm="bold", guifg=color.aqua[1], gui="bold" },
+    SpellBad          = { ctermfg="132", cterm="underline", guifg=color.purple[1], gui="underline" },
+    SpellCap          = { ctermfg="108", cterm="underline", guifg=color.aqua[1], gui="underline" },
+    SpellLocal        = { ctermfg="179", cterm="underline", guifg=color.yellow[1], gui="underline" },
+    QuickFixLine      = { ctermbg="234", guibg=color.black[1] },
+    DiffAdd           = { ctermbg="236", ctermfg="108", guibg=color.gray[5], guifg=color.aqua[1] },
+    DiffChange        = { ctermbg="236", guifg=color.yellow[1] },
+    DiffDelete        = { ctermbg="236", ctermfg="132", guibg=color.gray[5], guifg=color.purple[1] },
+    DiffText          = { ctermbg="236", ctermfg="179", guibg=color.gray[5], guifg=color.yellow[1] },
+    helpHyperTextJump = { ctermfg="140",  guifg=color.blue[1] },
 }
 
-for group, colors in pairs(syntax) do highlight(group, colors) end
+local links = {
+    Constant     = { "Boolean", "Character", "Number" },
+    CursorLine   = { "CursorColumn" },
+    DiffAdd      = { "diffAdded", "GitSignsAdd" },
+    DiffChange   = { "GitSignsChange" },
+    DiffDelete   = { "diffRemoved", "GitSignsDelete" },
+    Error        = { "ErrorMsg" },
+    htmlTag      = { "htmlEndTag" },
+    htmlTagName  = { "htmlTag" },
+    Identifier   = { "Function" },
+    ModeMsg      = { "MoreMsg", "Question" },
+    NonText      = { "Ignore" },
+    Number       = { "Float" },
+    PreProc      = { "Define", "Include", "Macro", "PreCondit" },
+    Special      = { "Debug", "Delimiter", "SpecialChar", "SpecialComment", "Tag" },
+    SpellLocal   = { "SpellRare" },
+    Statement    = { "Conditonal", "Exception", "Keyword", "Label", "Repeat" },
+    StatusLineNC = { "StatusLineTermNC", "TabLine", "TabLineFill" },
+    StatusLine   = { "StatusLineTerm", "TabLineSel" },
+    Title        = { "gitcommitSummary" },
+    Type         = { "StorageClass", "Structure", "Typedef" },
+    Warning      = { "WarningMsg" },
+}
 
--- TODO: don't hardcode these
-vim.g.terminal_color_0  = "#4E4E4D"
-vim.g.terminal_color_1  = "#D68787"
-vim.g.terminal_color_2  = "#5F865F"
-vim.g.terminal_color_3  = "#D8AF5F"
-vim.g.terminal_color_4  = "#85ADD4"
-vim.g.terminal_color_5  = "#D7AFAF"
-vim.g.terminal_color_6  = "#87AFAF"
-vim.g.terminal_color_7  = "#D0D0D0"
-vim.g.terminal_color_8  = "#626262"
-vim.g.terminal_color_9  = "#D75F87"
-vim.g.terminal_color_10 = "#87AF87"
-vim.g.terminal_color_11 = "#FFD787"
-vim.g.terminal_color_12 = "#ADD4FB"
-vim.g.terminal_color_13 = "#FFAFAF"
-vim.g.terminal_color_14 = "#87D7D7"
-vim.g.terminal_color_15 = "#E4E4E4"
+for group,  colors in pairs(theme) do highlight(group, colors) end
+for parent, groups in pairs(links) do link(groups, parent)     end
+
+vim.g.terminal_color_0  = "#282828"
+vim.g.terminal_color_1  = "#ea6962"
+vim.g.terminal_color_2  = "#a9b665"
+vim.g.terminal_color_3  = "#d8a657"
+vim.g.terminal_color_4  = "#7daea3"
+vim.g.terminal_color_5  = "#d3869b"
+vim.g.terminal_color_6  = "#89b482"
+vim.g.terminal_color_7  = "#d4be98"
+vim.g.terminal_color_8  = "#928374"
+vim.g.terminal_color_9  = "#ef938e"
+vim.g.terminal_color_10 = "#bbc585"
+vim.g.terminal_color_11 = "#e1bb7e"
+vim.g.terminal_color_12 = "#9dc2ba"
+vim.g.terminal_color_13 = "#e1acbb"
+vim.g.terminal_color_14 = "#a7c7a2"
+vim.g.terminal_color_15 = "#e2d3ba"
 
 vim.g.fzf_colors = {
     ["fg"]      = {'fg', 'NormalFloat'},
     ["bg"]      = {'bg', 'NormalFloat'},
     ["fg+"]     = {'bg', 'StatusLine'},
 }
-
-vim.o.pumblend = 20
-
--- dark-fg = 252, dark-bg = 237
-local plugins = {
-    GitSignsAdd    = { fg = theme[65]  },
-    GitSignsChange = { fg = theme[108] },
-    GitSignsDelete = { fg = theme[161] },
-}
-
-for group, colors in pairs(plugins) do highlight(group, colors) end
diff --git a/.config/nvim/pack/vendor/packages b/.config/nvim/pack/vendor/packages
index 0fb301d..5b668a4 100644
--- a/.config/nvim/pack/vendor/packages
+++ b/.config/nvim/pack/vendor/packages
@@ -9,6 +9,7 @@ TimUntersberger/neogit
 lewis6991/gitsigns.nvim
 
 junegunn/fzf.vim
+junegunn/vim-easy-align
 
 tpope/vim-surround
 tpope/vim-repeat
diff --git a/.config/picom/config b/.config/picom/config
index 2037f1f..81faf30 100644
--- a/.config/picom/config
+++ b/.config/picom/config
@@ -42,22 +42,22 @@ rounded-corners-exclude = [
 
 wintypes:
 {
-    dropdown_menu = { shadow = false; opacity = 1.0 };
-    popup_menu    = { shadow = false; opacity = 1.0 };
-    utility       = { shadow = false; opacity = 1.0 };
+    tooltip       = { shadow = false; opacity = 1.0; focus = true; blur = false; };
+    dropdown_menu = { shadow = false; opacity = 1.0; focus = true; blur = false; };
+    popup_menu    = { shadow = false; opacity = 1.0; focus = true; blur = false; };
+    utility       = { shadow = false; opacity = 1.0; focus = true; blur = false; };
 };
 
 # ------------------------------------------------------------------------
 # opacity
 
-inactive-opacity          = 0.85;
-active-opacity            = 0.95;
-frame-opacity             = 0.85;
-detect-client-opacity     = true;
-inactive-opacity-override = false;
+inactive-opacity          = 0.50;
+active-opacity            = 0.92;
+frame-opacity             = 0.92;
+detect-client-opacity     = false;
+inactive-opacity-override = true;
 
 opacity-rule = [
-    "99:class_g = 'qutebrowser'",
     "99:class_g = 'Chromium'",
     "99:class_g = 'Inkscape'",
     "99:class_g = 'Gimp'",
diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py
index 1a18a43..92b8254 100644
--- a/.config/qutebrowser/config.py
+++ b/.config/qutebrowser/config.py
@@ -3,342 +3,339 @@ from qutebrowser.api import interceptor, message
 
 config.load_autoconfig(False)
 
-nord = {
-    # Polar Night
-    'nord0': '#2e3440',
-    'nord1': '#3b4252',
-    'nord2': '#434c5e',
-    'nord3': '#4c566a',
-    # Snow Storm
-    'nord4': '#d8dee9',
-    'nord5': '#e5e9f0',
-    'nord6': '#eceff4',
-    # Frost
-    'nord7': '#8fbcbb',
-    'nord8': '#88c0d0',
-    'nord9': '#81a1c1',
-    'nord10': '#5e81ac',
-    # Aurora
-    'nord11': '#bf616a',
-    'nord12': '#d08770',
-    'nord13': '#ebcb8b',
-    'nord14': '#a3be8c',
-    'nord15': '#b48ead',
-}
+# gruvbox dark hard qutebrowser theme by Florian Bruhin <me@the-compiler.org>
+#
+# Originally based on:
+#   base16-qutebrowser (https://github.com/theova/base16-qutebrowser)
+#   Base16 qutebrowser template by theova and Daniel Mulford
+#   Gruvbox dark, hard scheme by Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)
+
+bg0_hard = "#1d2021"
+bg0_soft = '#32302f'
+bg0_normal = '#282828'
+
+bg0 = "#3c3836"
+bg1 = bg0_normal
+bg2 = "#504945"
+bg3 = "#665c54"
+bg4 = "#7c6f64"
+
+fg0 = "#fbf1c7"
+fg1 = "#ebdbb2"
+fg2 = "#d5c4a1"
+fg3 = "#bdae93"
+fg4 = "#a89984"
+
+bright_red = "#fb4934"
+bright_green = "#b8bb26"
+bright_yellow = "#fabd2f"
+bright_blue = "#83a598"
+bright_purple = "#d3869b"
+bright_aqua = "#8ec07c"
+bright_gray = "#928374"
+bright_orange = "#fe8019"
+
+dark_red = "#cc241d"
+dark_green = "#98971a"
+dark_yellow = "#d79921"
+dark_blue = "#458588"
+dark_purple = "#b16286"
+dark_aqua = "#689d6a"
+dark_gray = "#a89984"
+dark_orange = "#d65d0e"
+
+### Completion
+
+# Text color of the completion widget. May be a single color to use for
+# all columns or a list of three colors, one for each column.
+c.colors.completion.fg = [fg1, bright_blue, fg4]
+
+# Background color of the completion widget for odd rows.
+c.colors.completion.odd.bg = bg0
+
+# Background color of the completion widget for even rows.
+c.colors.completion.even.bg = bg0
+
+# Foreground color of completion widget category headers.
+c.colors.completion.category.fg = bright_blue
+
+# Background color of the completion widget category headers.
+c.colors.completion.category.bg = bg1
+
+# Top border color of the completion widget category headers.
+c.colors.completion.category.border.top = c.colors.completion.category.bg
+
+# Bottom border color of the completion widget category headers.
+c.colors.completion.category.border.bottom = c.colors.completion.category.bg
+
+# Foreground color of the selected completion item.
+c.colors.completion.item.selected.fg = fg0
+
+# Background color of the selected completion item.
+c.colors.completion.item.selected.bg = bg4
+
+# Top border color of the selected completion item.
+c.colors.completion.item.selected.border.top = bg2
+
+# Bottom border color of the selected completion item.
+c.colors.completion.item.selected.border.bottom = c.colors.completion.item.selected.border.top
+
+# Foreground color of the matched text in the selected completion item.
+c.colors.completion.item.selected.match.fg = dark_yellow
+
+# Foreground color of the matched text in the completion.
+c.colors.completion.match.fg = c.colors.completion.item.selected.match.fg
+
+# Color of the scrollbar handle in the completion view.
+c.colors.completion.scrollbar.fg = c.colors.completion.item.selected.fg
+
+# Color of the scrollbar in the completion view.
+c.colors.completion.scrollbar.bg = c.colors.completion.category.bg
+
+### Context menu
+
+# Background color of disabled items in the context menu.
+c.colors.contextmenu.disabled.bg = bg3
+
+# Foreground color of disabled items in the context menu.
+c.colors.contextmenu.disabled.fg = fg3
+
+# Background color of the context menu. If set to null, the Qt default is used.
+c.colors.contextmenu.menu.bg = bg0
+
+# Foreground color of the context menu. If set to null, the Qt default is used.
+c.colors.contextmenu.menu.fg =  fg2
+
+# Background color of the context menu’s selected item. If set to null, the Qt default is used.
+c.colors.contextmenu.selected.bg = bg2
+
+#Foreground color of the context menu’s selected item. If set to null, the Qt default is used.
+c.colors.contextmenu.selected.fg = c.colors.contextmenu.menu.fg
+
+### Downloads
+
+# Background color for the download bar.
+c.colors.downloads.bar.bg = bg0
+
+# Color gradient start for download text.
+c.colors.downloads.start.fg = bg0
+
+# Color gradient start for download backgrounds.
+c.colors.downloads.start.bg = bright_blue
+
+# Color gradient end for download text.
+c.colors.downloads.stop.fg = c.colors.downloads.start.fg
+
+# Color gradient stop for download backgrounds.
+c.colors.downloads.stop.bg = bright_aqua
+
+# Foreground color for downloads with errors.
+c.colors.downloads.error.fg = bright_red
+
+### Hints
+
+# Font color for hints.
+c.colors.hints.fg = bg0
+
+# Background color for hints.
+c.colors.hints.bg = bright_yellow
+
+# Font color for the matched part of hints.
+c.colors.hints.match.fg = bg4
+
+### Keyhint widget
+
+# Text color for the keyhint widget.
+c.colors.keyhint.fg = fg4
+
+# Highlight color for keys to complete the current keychain.
+c.colors.keyhint.suffix.fg = fg0
+
+# Background color of the keyhint widget.
+c.colors.keyhint.bg = bg0
+
+### Messages
+
+# Foreground color of an error message.
+c.colors.messages.error.fg = bg0
+
+# Background color of an error message.
+c.colors.messages.error.bg = bright_red
+
+# Border color of an error message.
+c.colors.messages.error.border = c.colors.messages.error.bg
+
+# Foreground color of a warning message.
+c.colors.messages.warning.fg = bg0
+
+# Background color of a warning message.
+c.colors.messages.warning.bg = bright_purple
+
+# Border color of a warning message.
+c.colors.messages.warning.border = c.colors.messages.warning.bg
 
-## Background color of the completion widget category headers.
-## Type: QssColor
-c.colors.completion.category.bg = nord['nord0']
-
-## Bottom border color of the completion widget category headers.
-## Type: QssColor
-c.colors.completion.category.border.bottom = nord['nord0']
-
-## Top border color of the completion widget category headers.
-## Type: QssColor
-c.colors.completion.category.border.top = nord['nord0']
-
-## Foreground color of completion widget category headers.
-## Type: QtColor
-c.colors.completion.category.fg = nord['nord5']
-
-## Background color of the completion widget for even rows.
-## Type: QssColor
-c.colors.completion.even.bg = nord['nord1']
-
-## Background color of the completion widget for odd rows.
-## Type: QssColor
-c.colors.completion.odd.bg = nord['nord2']
-
-## Text color of the completion widget.
-## Type: QtColor
-c.colors.completion.fg = nord['nord4']
-
-## Background color of the selected completion item.
-## Type: QssColor
-c.colors.completion.item.selected.bg = nord['nord3']
-
-## Bottom border color of the selected completion item.
-## Type: QssColor
-c.colors.completion.item.selected.border.bottom = nord['nord3']
-
-## Top border color of the completion widget category headers.
-## Type: QssColor
-c.colors.completion.item.selected.border.top = nord['nord3']
-
-## Foreground color of the selected completion item.
-## Type: QtColor
-c.colors.completion.item.selected.fg = nord['nord6']
-
-## Foreground color of the matched text in the completion.
-## Type: QssColor
-c.colors.completion.match.fg = nord['nord13']
-
-## Color of the scrollbar in completion view
-## Type: QssColor
-c.colors.completion.scrollbar.bg = nord['nord1']
-
-## Color of the scrollbar handle in completion view.
-## Type: QssColor
-c.colors.completion.scrollbar.fg = nord['nord5']
-
-## Background color for the download bar.
-## Type: QssColor
-c.colors.downloads.bar.bg = nord['nord0']
-
-## Background color for downloads with errors.
-## Type: QtColor
-c.colors.downloads.error.bg = nord['nord11']
-
-## Foreground color for downloads with errors.
-## Type: QtColor
-c.colors.downloads.error.fg = nord['nord5']
-
-## Color gradient stop for download backgrounds.
-## Type: QtColor
-c.colors.downloads.stop.bg = nord['nord15']
-
-## Color gradient interpolation system for download backgrounds.
-## Type: ColorSystem
-## Valid values:
-##   - rgb: Interpolate in the RGB color system.
-##   - hsv: Interpolate in the HSV color system.
-##   - hsl: Interpolate in the HSL color system.
-##   - none: Don't show a gradient.
-c.colors.downloads.system.bg = 'none'
-
-## Background color for hints. Note that you can use a `rgba(...)` value
-## for transparency.
-## Type: QssColor
-c.colors.hints.bg = nord['nord13']
+# Foreground color of an info message.
+c.colors.messages.info.fg = fg2
 
-## Font color for hints.
-## Type: QssColor
-c.colors.hints.fg = nord['nord0']
+# Background color of an info message.
+c.colors.messages.info.bg = bg0
 
-## Font color for the matched part of hints.
-## Type: QssColor
-c.colors.hints.match.fg = nord['nord10']
+# Border color of an info message.
+c.colors.messages.info.border = c.colors.messages.info.bg
 
-## Background color of the keyhint widget.
-## Type: QssColor
-c.colors.keyhint.bg = nord['nord1']
+### Prompts
 
-## Text color for the keyhint widget.
-## Type: QssColor
-c.colors.keyhint.fg = nord['nord5']
-
-## Highlight color for keys to complete the current keychain.
-## Type: QssColor
-c.colors.keyhint.suffix.fg = nord['nord13']
-
-## Background color of an error message.
-## Type: QssColor
-c.colors.messages.error.bg = nord['nord11']
-
-## Border color of an error message.
-## Type: QssColor
-c.colors.messages.error.border = nord['nord11']
-
-## Foreground color of an error message.
-## Type: QssColor
-c.colors.messages.error.fg = nord['nord5']
-
-## Background color of an info message.
-## Type: QssColor
-c.colors.messages.info.bg = nord['nord8']
-
-## Border color of an info message.
-## Type: QssColor
-c.colors.messages.info.border = nord['nord8']
-
-## Foreground color an info message.
-## Type: QssColor
-c.colors.messages.info.fg = nord['nord5']
-
-## Background color of a warning message.
-## Type: QssColor
-c.colors.messages.warning.bg = nord['nord12']
-
-## Border color of a warning message.
-## Type: QssColor
-c.colors.messages.warning.border = nord['nord12']
-
-## Foreground color a warning message.
-## Type: QssColor
-c.colors.messages.warning.fg = nord['nord5']
-
-## Background color for prompts.
-## Type: QssColor
-c.colors.prompts.bg = nord['nord2']
-
-# ## Border used around UI elements in prompts.
-# ## Type: String
-c.colors.prompts.border = '1px solid ' + nord['nord0']
-
-## Foreground color for prompts.
-## Type: QssColor
-c.colors.prompts.fg = nord['nord5']
-
-## Background color for the selected item in filename prompts.
-## Type: QssColor
-c.colors.prompts.selected.bg = nord['nord3']
-
-## Background color of the statusbar in caret mode.
-## Type: QssColor
-c.colors.statusbar.caret.bg = nord['nord15']
-
-## Foreground color of the statusbar in caret mode.
-## Type: QssColor
-c.colors.statusbar.caret.fg = nord['nord5']
-
-## Background color of the statusbar in caret mode with a selection.
-## Type: QssColor
-c.colors.statusbar.caret.selection.bg = nord['nord15']
-
-## Foreground color of the statusbar in caret mode with a selection.
-## Type: QssColor
-c.colors.statusbar.caret.selection.fg = nord['nord5']
-
-## Background color of the statusbar in command mode.
-## Type: QssColor
-c.colors.statusbar.command.bg = nord['nord2']
-
-## Foreground color of the statusbar in command mode.
-## Type: QssColor
-c.colors.statusbar.command.fg = nord['nord5']
-
-## Background color of the statusbar in private browsing + command mode.
-## Type: QssColor
-c.colors.statusbar.command.private.bg = nord['nord2']
-
-## Foreground color of the statusbar in private browsing + command mode.
-## Type: QssColor
-c.colors.statusbar.command.private.fg = nord['nord5']
-
-## Background color of the statusbar in insert mode.
-## Type: QssColor
-c.colors.statusbar.insert.bg = nord['nord14']
-
-## Foreground color of the statusbar in insert mode.
-## Type: QssColor
-c.colors.statusbar.insert.fg = nord['nord1']
-
-## Background color of the statusbar.
-## Type: QssColor
-c.colors.statusbar.normal.bg = nord['nord0']
-
-## Foreground color of the statusbar.
-## Type: QssColor
-c.colors.statusbar.normal.fg = nord['nord5']
-
-## Background color of the statusbar in passthrough mode.
-## Type: QssColor
-c.colors.statusbar.passthrough.bg = nord['nord10']
-
-## Foreground color of the statusbar in passthrough mode.
-## Type: QssColor
-c.colors.statusbar.passthrough.fg = nord['nord5']
-
-## Background color of the statusbar in private browsing mode.
-## Type: QssColor
-c.colors.statusbar.private.bg = nord['nord3']
-
-## Foreground color of the statusbar in private browsing mode.
-## Type: QssColor
-c.colors.statusbar.private.fg = nord['nord5']
-
-## Background color of the progress bar.
-## Type: QssColor
-c.colors.statusbar.progress.bg = nord['nord5']
-
-## Foreground color of the URL in the statusbar on error.
-## Type: QssColor
-c.colors.statusbar.url.error.fg = nord['nord11']
-
-## Default foreground color of the URL in the statusbar.
-## Type: QssColor
-c.colors.statusbar.url.fg = nord['nord5']
-
-## Foreground color of the URL in the statusbar for hovered links.
-## Type: QssColor
-c.colors.statusbar.url.hover.fg = nord['nord8']
-
-## Foreground color of the URL in the statusbar on successful load
-## (http).
-## Type: QssColor
-c.colors.statusbar.url.success.http.fg = nord['nord5']
-
-## Foreground color of the URL in the statusbar on successful load
-## (https).
-## Type: QssColor
-c.colors.statusbar.url.success.https.fg = nord['nord14']
-
-## Foreground color of the URL in the statusbar when there's a warning.
-## Type: QssColor
-c.colors.statusbar.url.warn.fg = nord['nord12']
-
-## Background color of the tab bar.
-## Type: QtColor
-c.colors.tabs.bar.bg = nord['nord3']
-
-## Background color of unselected even tabs.
-## Type: QtColor
-c.colors.tabs.even.bg = nord['nord3']
-
-## Foreground color of unselected even tabs.
-## Type: QtColor
-c.colors.tabs.even.fg = nord['nord5']
-
-## Color for the tab indicator on errors.
-## Type: QtColor
-c.colors.tabs.indicator.error = nord['nord11']
-
-## Color gradient start for the tab indicator.
-## Type: QtColor
-# c.colors.tabs.indicator.start = nord['violet']
-
-## Color gradient end for the tab indicator.
-## Type: QtColor
-# c.colors.tabs.indicator.stop = nord['orange']
-
-## Color gradient interpolation system for the tab indicator.
-## Type: ColorSystem
-## Valid values:
-##   - rgb: Interpolate in the RGB color system.
-##   - hsv: Interpolate in the HSV color system.
-##   - hsl: Interpolate in the HSL color system.
-##   - none: Don't show a gradient.
-c.colors.tabs.indicator.system = 'none'
-
-## Background color of unselected odd tabs.
-## Type: QtColor
-c.colors.tabs.odd.bg = nord['nord3']
-
-## Foreground color of unselected odd tabs.
-## Type: QtColor
-c.colors.tabs.odd.fg = nord['nord5']
-
-# ## Background color of selected even tabs.
-# ## Type: QtColor
-c.colors.tabs.selected.even.bg = nord['nord0']
-
-# ## Foreground color of selected even tabs.
-# ## Type: QtColor
-c.colors.tabs.selected.even.fg = nord['nord5']
-
-# ## Background color of selected odd tabs.
-# ## Type: QtColor
-c.colors.tabs.selected.odd.bg = nord['nord0']
-
-# ## Foreground color of selected odd tabs.
-# ## Type: QtColor
-c.colors.tabs.selected.odd.fg = nord['nord5']
-
-## Background color for webpages if unset (or empty to use the theme's
-## color)
-## Type: QtColor
-# c.colors.webpage.bg = 'white'
+# Foreground color for prompts.
+c.colors.prompts.fg = fg2
+
+# Border used around UI elements in prompts.
+c.colors.prompts.border = f'1px solid {bg1}'
+
+# Background color for prompts.
+c.colors.prompts.bg = bg3
+
+# Background color for the selected item in filename prompts.
+c.colors.prompts.selected.bg = bg2
+
+### Statusbar
+
+# Foreground color of the statusbar.
+c.colors.statusbar.normal.fg = fg2
+
+# Background color of the statusbar.
+c.colors.statusbar.normal.bg = bg0
+
+# Foreground color of the statusbar in insert mode.
+c.colors.statusbar.insert.fg = bg0
+
+# Background color of the statusbar in insert mode.
+c.colors.statusbar.insert.bg = bright_blue
+
+# Foreground color of the statusbar in passthrough mode.
+c.colors.statusbar.passthrough.fg = bg0
+
+# Background color of the statusbar in passthrough mode.
+c.colors.statusbar.passthrough.bg = dark_blue
+
+# Foreground color of the statusbar in private browsing mode.
+c.colors.statusbar.private.fg = bright_purple
+
+# Background color of the statusbar in private browsing mode.
+c.colors.statusbar.private.bg = bg0
+
+# Foreground color of the statusbar in command mode.
+c.colors.statusbar.command.fg = fg3
+
+# Background color of the statusbar in command mode.
+c.colors.statusbar.command.bg = bg1
+
+# Foreground color of the statusbar in private browsing + command mode.
+c.colors.statusbar.command.private.fg = c.colors.statusbar.private.fg
+
+# Background color of the statusbar in private browsing + command mode.
+c.colors.statusbar.command.private.bg = c.colors.statusbar.command.bg
+
+# Foreground color of the statusbar in caret mode.
+c.colors.statusbar.caret.fg = bg0
+
+# Background color of the statusbar in caret mode.
+c.colors.statusbar.caret.bg = dark_purple
+
+# Foreground color of the statusbar in caret mode with a selection.
+c.colors.statusbar.caret.selection.fg = c.colors.statusbar.caret.fg
+
+# Background color of the statusbar in caret mode with a selection.
+c.colors.statusbar.caret.selection.bg = bright_purple
+
+# Background color of the progress bar.
+c.colors.statusbar.progress.bg = bright_blue
+
+# Default foreground color of the URL in the statusbar.
+c.colors.statusbar.url.fg = fg4
+
+# Foreground color of the URL in the statusbar on error.
+c.colors.statusbar.url.error.fg = dark_red
+
+# Foreground color of the URL in the statusbar for hovered links.
+c.colors.statusbar.url.hover.fg = bright_orange
+
+# Foreground color of the URL in the statusbar on successful load
+# (http).
+c.colors.statusbar.url.success.http.fg = bright_red
+
+# Foreground color of the URL in the statusbar on successful load
+# (https).
+c.colors.statusbar.url.success.https.fg = fg0
+
+# Foreground color of the URL in the statusbar when there's a warning.
+c.colors.statusbar.url.warn.fg = bright_purple
+
+### tabs
+
+# Background color of the tab bar.
+c.colors.tabs.bar.bg = bg0
+
+# Color gradient start for the tab indicator.
+c.colors.tabs.indicator.start = bright_blue
+
+# Color gradient end for the tab indicator.
+c.colors.tabs.indicator.stop = bright_aqua
+
+# Color for the tab indicator on errors.
+c.colors.tabs.indicator.error = bright_red
+
+# Foreground color of unselected odd tabs.
+c.colors.tabs.odd.fg = fg2
+
+# Background color of unselected odd tabs.
+c.colors.tabs.odd.bg = bg3
+
+# Foreground color of unselected even tabs.
+c.colors.tabs.even.fg = c.colors.tabs.odd.fg
+
+# Background color of unselected even tabs.
+c.colors.tabs.even.bg = bg3
+
+# Foreground color of selected odd tabs.
+c.colors.tabs.selected.odd.fg = fg0
+
+# Background color of selected odd tabs.
+c.colors.tabs.selected.odd.bg = bg0
+
+# Foreground color of selected even tabs.
+c.colors.tabs.selected.even.fg = c.colors.tabs.selected.odd.fg
+
+# Background color of selected even tabs.
+c.colors.tabs.selected.even.bg = bg0
+
+# Background color of pinned unselected even tabs.
+c.colors.tabs.pinned.even.bg = bright_green
+
+# Foreground color of pinned unselected even tabs.
+c.colors.tabs.pinned.even.fg = bg2
+
+# Background color of pinned unselected odd tabs.
+c.colors.tabs.pinned.odd.bg = bright_green
+
+# Foreground color of pinned unselected odd tabs.
+c.colors.tabs.pinned.odd.fg = c.colors.tabs.pinned.even.fg
+
+# Background color of pinned selected even tabs.
+c.colors.tabs.pinned.selected.even.bg = bg0
+
+# Foreground color of pinned selected even tabs.
+c.colors.tabs.pinned.selected.even.fg = c.colors.tabs.selected.odd.fg
+
+# Background color of pinned selected odd tabs.
+c.colors.tabs.pinned.selected.odd.bg = c.colors.tabs.pinned.selected.even.bg
+
+# Foreground color of pinned selected odd tabs.
+c.colors.tabs.pinned.selected.odd.fg = c.colors.tabs.selected.odd.fg
+
+# Background color for webpages if unset (or empty to use the theme's
+# color).
+# c.colors.darkmode.enabled = True
+# c.colors.webpage.bg = bg4
 
 # ------------------------------------------------------------------------
 # fonts
@@ -405,6 +402,7 @@ c.content.javascript.enabled = False
 js_whitelist = [
         "*://localhost/*",
         "*://github.com/*",
+        "*://gitlab.com/*",
         "*://news.ycombinator.com/*",
         "*://hn.algolia.com/*",
         "*://duckduckgo.com/*",
diff --git a/.config/tmux/config b/.config/tmux/config
index 983b70c..a8e9d49 100644
--- a/.config/tmux/config
+++ b/.config/tmux/config
@@ -30,10 +30,10 @@ bind C-L send-keys 'C-L'
 bind R source-file ~/.config/tmux/config
 
 # Pane-switching (interfaces with vim)
-bind -n C-j run "fish -c tmux_send_down"
-bind -n C-k run "fish -c tmux_send_up"
-bind -n C-h run "fish -c tmux_send_left"
-bind -n C-l run "fish -c tmux_send_right"
+bind -n C-j run "tmux-send down"
+bind -n C-k run "tmux-send up"
+bind -n C-h run "tmux-send left"
+bind -n C-l run "tmux-send right"
 
 # Layout rotation
 bind-key C-o rotate-window
@@ -71,6 +71,9 @@ set -q -g status-utf8 on
 # Address vim mode switching
 set -sg escape-time 0 
 
+set -g base-index 1
+setw -g pane-base-index 1
+
 # loud or quiet?
 set-option -g visual-activity off
 set-option -g visual-bell off
@@ -78,48 +81,69 @@ set-option -g visual-silence off
 set-window-option -g monitor-activity off
 set-option -g bell-action none
 
-#  modes
-setw -g clock-mode-colour colour5
-setw -g mode-style 'fg=colour3,bg=colour8,bold'
+######################
+# colors
+######################
+
+### theme settings ###
+
+# window separators
+set-option -wg window-status-separator ""
+
+# monitor window changes
+set-option -wg monitor-activity on
+set-option -wg monitor-bell on
+
+# set statusbar update interval
+set-option -g status-interval 1
+
+### colorscheme ###
+
+# change window screen colors
+set-option -wg mode-style bg="#A89984",fg="#3C3836"
+
+# default statusbar colors (terminal bg should be #282828)
+set-option -g status-style bg=terminal,fg="#A89984"
+
+# default window title colors
+set-option -wg window-status-style bg="#3C3836",fg="#7C6F64"
 
-# panes
-set -g pane-border-style 'bg=default,fg=colour8'
-set -g pane-active-border-style 'bg=default,fg=colour2'
+# colors for windows with activity
+set-option -wg window-status-activity-style bg="#3C3836",fg="#A89984"
 
-# statusbar
-set -g status-position bottom
-set -g status-justify centre
-set -g status-style 'fg=colour0,bg=colour0,dim'
-set -g status-right-length 3
-set -g status-left-length 3
+# colors for windows with bells
+set-option -wg window-status-bell-style bg="#3C3836",fg="#FE8019"
 
-# window focus
-set -g window-style 'fg=default,bg=default'
+# active window title colors
+set-option -wg window-status-current-style bg="#FE8019",fg="#3C3836"
 
-# window 
-setw -g window-status-current-style 'fg=colour2,bg=colour8,bold'
-setw -g window-status-current-format ' #I#[fg=colour2]:#[fg=colour2]#W#[fg=colour2]#F '
+# pane border
+set-option -g pane-active-border-style fg="#83a598"
+set-option -g pane-border-style fg="#504945"
 
-setw -g window-status-style 'fg=colour250,bg=colour8,bold'
-setw -g window-status-format ' #I#[fg=colour250]:#[fg=colour250]#W#[fg=colour250]#F '
+# message info
+set-option -g message-style bg="#A89984",fg="#3C3836"
 
-setw -g window-status-bell-style 'fg=colour255,bg=colour1,bold'
+# writing commands inactive
+set-option -g message-command-style bg="#A89984",fg="#3C3836"
 
-# messages
-set -g message-style 'fg=colour1,bg=colour8'
+# pane number display
+set-option -g display-panes-active-colour "#83a598"
+set-option -g display-panes-colour "#A89984"
 
-#################################
-# Plugins
-#################################
+# clock
+set-option -wg clock-mode-colour "#FE8019"
 
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'tmux-plugins/tmux-continuum'
+# copy mode highlighting
+%if #{>=:#{version},3.2}
+    set-option -wg copy-mode-match-style "bg=#A89984,fg=#3C3836"
+    set-option -wg copy-mode-current-match-style "bg=#A9b665,fg=#3C3836"
+%endif
 
-#################################
-# Plugin variables
-#################################
-#
-set -g @continuum-restore 'on'
+# statusbar formatting
+# "#fe8019" MUST be in lowercase here (conflicts with statusline alias otherwise)
+set-option -g status-left "#[bg=#A89984, fg=#3C3836]#{?client_prefix,#[bg=#bbc585],#[bg=#A89984]} #{session_name} "
+set-option -g status-right "#[bg=#A89984, fg=#3C3836]#{?client_prefix,#[bg=#bbc585],#[bg=#A89984]} #{host_short} "
 
-run -b '~/.tmux/plugins/tpm/tpm'
+set-option -wg window-status-current-format "#{?window_zoomed_flag,#[fg=default bold],#[fg=default]}#[bg=#83a598] #{window_index}:#{?window_zoomed_flag,*, }#{window_name}#{?window_zoomed_flag,*, }"
+set-option -wg window-status-format "#{?window_zoomed_flag,#[fg=#fbf1c7 bold],#[fg=#fbf1c7]}#[bg=#504945] #{window_index}: #{window_name} "
diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc
index 17c68ab..897e9bf 100644
--- a/.config/zathura/zathurarc
+++ b/.config/zathura/zathurarc
@@ -8,7 +8,7 @@
 set adjust-open "best-fit"
 
 # Font size
-set font "Ubuntu 12"
+set font "Consolas 12"
 
 # Zoom size
 set zoom-step 20
@@ -28,31 +28,46 @@ set scroll-step 80
 # System colors + display
 #####################
 
-# Colors of search
-set highlight-color "#8fbcbb"
-set highlight-active-color "#ebcb8b"
-
-# BG color
-set default-bg "#3b4252"
-
-# Toolbar colors
-set statusbar-fg "#a3be8c"
-set statusbar-bg "#2e3440"
-
-set inputbar-fg "#d8dee9"
-set inputbar-bg "#3b4252"
-
-set notification-error-fg "#d8dee9"
-set notification-error-bg "#bf616a"
-
-set notification-warning-fg "#d8dee9"
-set notification-warning-bg "#bf616a"
-
-set completion-fg "#e5e9f0"
-set completion-bg "#2e3440"
-
-set completion-highlight-fg "#5e81ac"
-set completion-highlight-bg "#4c566a"
+set notification-error-bg       "#3c3836" # bg
+set notification-error-fg       "#fb4934" # bright:red
+set notification-warning-bg     "#3c3836" # bg
+set notification-warning-fg     "#fabd2f" # bright:yellow
+set notification-bg             "#3c3836" # bg
+set notification-fg             "#b8bb26" # bright:green
+
+set completion-bg               "#504945" # bg2
+set completion-fg               "#ebdbb2" # fg
+set completion-group-bg         "#3c3836" # bg1
+set completion-group-fg         "#928374" # gray
+set completion-highlight-bg     "#83a598" # bright:blue
+set completion-highlight-fg     "#504945" # bg2
+
+# Define the color in index mode
+set index-bg                    "#504945" # bg2
+set index-fg                    "#ebdbb2" # fg
+set index-active-bg             "#83a598" # bright:blue
+set index-active-fg             "#504945" # bg2
+
+set inputbar-bg                 "#3c3836" # bg
+set inputbar-fg                 "#ebdbb2" # fg
+
+set statusbar-bg                "#504945" # bg2
+set statusbar-fg                "#ebdbb2" # fg
+
+set highlight-color             "#fabd2f" # bright:yellow
+set highlight-active-color      "#fe8019" # bright:orange
+
+set default-bg                  "#3c3836" # bg
+set default-fg                  "#ebdbb2" # fg
+set render-loading              true
+set render-loading-bg           "#3c3836" # bg
+set render-loading-fg           "#ebdbb2" # fg
+
+# Recolor book content's color
+set recolor-lightcolor          "#3c3836" # bg
+set recolor-darkcolor           "#ebdbb2" # fg
+set recolor                     "true"
+# set recolor-keephue             true      # keep original color
 
 # Distance between successive pages.
 set page-padding 10
@@ -63,4 +78,3 @@ set page-padding 10
 
 map <S-=> zoom in
 map - zoom
-