diff --git a/.bashrc b/.bashrc
index f5c9328..97ac97b 100644
--- a/.bashrc
+++ b/.bashrc
@@ -7,8 +7,8 @@
 # My bash config. Not much to see here.  Some pretty standard stuff.
 
 PATH="$HOME/.local/bin${PATH:+:${PATH}}"
-EDITOR="emacsclient -c"
-export TERM="xterm-256color"
+EDITOR="vim"
+export TERM="st"
 
 [[ $- != *i* ]] && return
 
@@ -141,6 +141,9 @@ ex ()
 
 ### ALIASES ###
 
+# root privileges
+alias doas="doas --"
+
 # navigation
 alias	..='cd ..' \
 		...='cd ../..'
diff --git a/.config/qtile/config.py b/.config/qtile/config.py
index f3b1eda..0b65af2 100644
--- a/.config/qtile/config.py
+++ b/.config/qtile/config.py
@@ -34,7 +34,7 @@ from typing import List  # noqa: F401
 
 ##### DEFINING SOME VARIABLES #####
 mod = "mod4"                                     # Sets mod key to SUPER/WINDOWS
-myTerm = "alacritty"                             # My terminal of choice
+myTerm = "st"                                    # My terminal of choice
 myConfig = "/home/dt/.config/qtile/config.py"    # The Qtile config file location
 
 ##### KEYBINDINGS #####
@@ -46,7 +46,7 @@ keys = [
                 ),
             Key(
                 [mod, "shift"], "Return",              # Dmenu Run Launcher
-                lazy.spawn("dmenu_run -fn 'UbuntuMono Nerd Font:size=10' -nb '#282a36' -nf '#ffffff' -sb '#bd93f9' -sf '#282a36' -p 'dmenu:'")
+                lazy.spawn("dmenu_run -p 'Run: '")
                 ),
             Key(
                 [mod], "Tab",
diff --git a/.dmenu/dmenu-edit-configs.sh b/.dmenu/dmenu-edit-configs.sh
index 9c4fb3c..b1b43c5 100755
--- a/.dmenu/dmenu-edit-configs.sh
+++ b/.dmenu/dmenu-edit-configs.sh
@@ -120,4 +120,4 @@ case "$choice" in
 		exit 1
 	;;
 esac
-emacsclient -c "$choice"
+st -e vim "$choice"
diff --git a/.surf/styles/archlinux.css b/.surf/styles/archlinux.css
index 3699921..85b71a2 100644
--- a/.surf/styles/archlinux.css
+++ b/.surf/styles/archlinux.css
@@ -82,7 +82,7 @@ dd a{
 }
 #toc, .toc, .mw-warning, .toccolours {
     background-color: #000000 !important;
-    border: 1px solid #d7dfe3 !important;
+    border: 1px solid #666666 !important;
     color: #d0d0d0 !important;
 }
 .tocnumber, .toctogglelabel {
@@ -96,7 +96,7 @@ div#mw-head {
 }
 div.vectorTabs li.selected {
     border: 1px solid #666666 !important;
-    border-bottom-color: #000000 !important;
+    border-bottom-color: #666666 !important;
     background-color: #000000 !important;
     padding-bottom: 20px !important;
 }
@@ -107,7 +107,10 @@ div.vectorTabs li.selected {
     border: 1px solid #666666 !important;
     background-color: #000000 !important;
 }
-
+.mw-body, .parsoid-body {
+    color: #d0d0d0 !important;
+    font-size: 1.2em !important;
+}
 
 
 /* AUR */
@@ -153,3 +156,31 @@ tr.roweven {
 .pun .blocktable td {
     border-color: #444444 !important;
 }
+.pun .blockpost {
+    background: #282a36 !important;
+    border-color: #444444 !important;
+}
+.pun .blockpost h2 {
+    background: #000000 !important;
+    border: none !important;
+    color: #82aaff !important;
+}
+.pun .blockpost .postbody, .pun .blockpost .postfoot {
+    background: #282a36 !important;
+    border-color: #444444 !important;
+}
+#punviewtopic .blockpost dt, #punmoderate .blockpost dt {
+    top: -1.8em !important;
+    color: #ff8b92 !important;
+}
+.pun .postmsg, #punhelp code, #punhelp samp {
+    color: #d0d0d0 !important;
+}
+.pun .codebox {
+    border-color: #444444 !important;
+    background: #9cc4ff !important;
+    color: #000000 !important;
+}
+.pun .codebox pre {
+    border: none !important;
+}
diff --git a/.vimrc b/.vimrc
index d08e771..e4331c8 100644
--- a/.vimrc
+++ b/.vimrc
@@ -12,8 +12,7 @@ set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()		" required, all plugins must appear after this line.
 
 Plugin 'gmarik/Vundle.vim'							" Vundle
-Plugin 'vim-airline/vim-airline'					" Airline
-Plugin 'vim-airline/vim-airline-themes'				" Airline Themes
+Plugin 'itchyny/lightline.vim'                      " Lightline statusbar
 Plugin 'scrooloose/nerdtree'						" added nerdtree
 Plugin 'tiagofumo/vim-nerdtree-syntax-highlight'
 Plugin 'ryanoasis/vim-devicons'
@@ -46,39 +45,22 @@ filetype plugin indent on    " required
 "Remap ESC to ii
 :imap ii <Esc>
 
-"Disable arrow keys in Normal mode
-no <Up> <Nop>
-no <Down> <Nop>
-no <Left> <Nop>
-no <Right> <Nop>
-
-"Disable arrow keys in Insert mode
-ino <Up> <Nop>
-ino <Down> <Nop>
-ino <Left> <Nop>
-ino <Right> <Nop>
-
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 " => Powerline
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
-" Powerline
-set rtp+=/usr/share/powerline/bindings/vim/
+let g:lightline = {
+      \ 'colorscheme': 'darcula',
+      \ }
 
 " Always show statusline
 set laststatus=2
 
 " Use 256 colours (Use this setting only if your terminal supports 256 colours)
-" set t_Co=256
+set t_Co=256
 
 syntax enable   
 set relativenumber
 let g:rehash256 = 1
-let g:Powerline_symbols='unicode'
-let g:Powerline_theme='long'
-
-let g:airline#extensions#tabline#enabled = 1
-let g:airline_powerline_fonts = 1
-let g:airline_theme='angr'
 
 " Uncomment to prevent non-normal modes showing in powerline and below powerline.
 set noshowmode
@@ -148,4 +130,7 @@ set guioptions-=L  "remove left-hand scroll bar
 set ttymouse=sgr
 
 
-
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+" => Removes pipes | that act as seperators on splits
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+:set fillchars+=vert:\ 
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 1fad87c..4adaba1 100755
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -83,7 +83,6 @@ main = do
     xmproc1 <- spawnPipe "xmobar -x 1 /home/dt/.config/xmobar/xmobarrc2"
     xmproc2 <- spawnPipe "xmobar -x 2 /home/dt/.config/xmobar/xmobarrc1"
     -- the xmonad, ya know...what the WM is named after!
-
     xmonad $ ewmh desktopConfig
         { manageHook = ( isFullscreen --> doFullFloat ) <+> myManageHook <+> manageHook desktopConfig <+> manageDocks
         , logHook = dynamicLogWithPP xmobarPP