diff --git a/.bash_aliases b/.bash_aliases
index 9d4f96a..dfc4e4e 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -9,20 +9,22 @@ alias cp='cp -i'
 alias mv='mv -i'
 
 # useful commands
-alias p="sudo pacman"
-alias y="yay"
-alias upgrade="sudo pacman -Syyu && yay -Syyu"
-alias ls="exa --group-directories-first -lh"
-alias l="exa --group-directories-first -lh"
-alias la="exa --group-directories-first -alh"
+alias pp="paruz -S"
+alias pr="paruz -R"
+alias upgrade="sudo pacman -Syyu"
+alias ls="exa --icons"
+alias l="exa --icons --group-directories-first -lh"
+alias la="exa --icons  --group-directories-first -alh"
+alias lt="exa --icons --group-directories-first -lh --tree"
+alias llt="exa --icons --group-directories-first -alh --tree"
 alias print="printf"
 alias q="exit"
-
+alias x="exit"
 # nvim edits
 alias cfi3="nvim ~/.config/i3/config"
 alias cfi3s="nvim ~/.config/i3status/config"
 alias cfn="nvim ~/.config/nvim/init.vim"
-alias e="nvim ."
+alias e="nvim"
 
 # cd commands
 alias c="cd ~/.config"
@@ -35,6 +37,14 @@ alias yt="youtube-viewer"
 alias gs="git status"
 alias gp="git push"
 alias ga="git add"
+alias gd="git diff origin/master"
 
 #cat is now bat!
 alias cat="bat"
+
+# kitty
+alias icat="kitty +kitten icat "
+
+function fman() {
+    man -k . | fzf -q "$1" --prompt='man> '  --preview $'echo {} | tr -d \'()\' | awk \'{printf "%s ", $2} {print $1}\' | xargs -r man' | tr -d '()' | awk '{printf "%s ", $2} {print $1}' | xargs -r man
+}
diff --git a/.bashrc b/.bashrc
index 485dc17..d636f83 100644
--- a/.bashrc
+++ b/.bashrc
@@ -5,16 +5,22 @@ export VISUAL=/usr/bin/nvim
 export EDITOR=/usr/bin/nvim
 export SPOTIPY_CLIENT_ID='aafa7f3fb81f46f681415f2cedfda2c8'
 export SPOTIPY_CLIENT_SECRET='6ebee1d932c34fcdb711d4bf14dac0de'
+export BW_SESSION="dFERFxdk1zdXiPxf54dULKCONLUSfUsg3KJ65lqIxhSy0SVbNCO5redWZ85YaGQ4ShGAV6zuKif7RO4dAy/K4g=="
 export BROWSER=brave
+#export GOROOT=/usr/local/go
+#export GOPATH=$HOME/go
+#export GOBIN=$HOME/go/bin
+#export PATH=$PATH:$GOROOT/bin:$GOPATH/bin:$GOBIN
 #export PASSWORD_STORE_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/password-store"
 #export GNUPGHOME="${XDG_DATA_HOME:-$HOME/.local/share}/gnupg"
 # - Ui4axsk9mwfw? - 
-
 set -o vi
 bind -m vi-command 'Control-l: clear-screen'
 bind -m vi-insert 'Control-l: clear-screen'
+
 #ufetch
-bash ~/Git/fetch.sh/fetch.sh
+#bash ~/Git/fetch.sh/fetch.sh
+#bash ~/.scripts/we
 
 #(cat $HOME/.config/wpg/sequences &)
 function lazygit() {
@@ -166,3 +172,8 @@ eval "$(zoxide init bash)"
 eval "$(starship init bash)"
 
 
+# BEGIN_KITTY_SHELL_INTEGRATION
+if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
+# END_KITTY_SHELL_INTEGRATION
+
+source /home/simon/.config/broot/launcher/bash/br
diff --git a/i3/config b/i3/config
index fc36ddb..4ec23c6 100644
--- a/i3/config
+++ b/i3/config
@@ -3,8 +3,6 @@
 #
 # Should you change your keyboard layout some time, delete
 # this file and re-run i3-config-wizard(1).
-#
-
 # i3 config file (v4)
 #
 # Please see https://i3wm.org/docs/userguide.html for a complete reference!
@@ -66,9 +64,6 @@ client.placeholder      #282A36 #282A36 #F8F8F2 #282A36   #282A36
 
 client.background       #F8F8F2
 
-
-
-
 # The combination of xss-lock, nm-applet and pactl is a popular choice, so
 # they are included here as an example. Modify as you see fit.
 
@@ -76,6 +71,7 @@ client.background       #F8F8F2
 # screen before suspend. Use loginctl lock-session to lock your screen.
 exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork --color=000000
 exec --no-startup-id setxkbmap -option
+exec --no-startup-id autotiling
 # NetworkManager is the most popular way to manage wireless networks on Linux,
 # and nm-applet is a desktop environment-independent system tray GUI for it.
 exec --no-startup-id nm-applet
@@ -85,7 +81,6 @@ exec --no-startup-id picom -c
 exec --no-startup-id xfce4-power-manager
 exec --no-startup-id gammy 
 
-
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
@@ -96,7 +91,6 @@ bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ to
 bindsym $mod+KP_Add  exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
 bindsym $mod+KP_Subtract exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
 bindsym $mod+KP_Multiply exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
-
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
 
 # Binds for SHIFT - and + for brightness on keypad!
@@ -110,6 +104,7 @@ bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOU
 bindsym $mod+KP_End exec --no-startup-id bash ~/.scripts/laptop
 bindsym $mod+KP_Down exec --no-startup-id bash ~/.scripts/ultrawide
 bindsym $mod+KP_Next exec --no-startup-id bash ~/.scripts/tf2
+bindsym $mod+KP_Left exec --no-startup-id bash ~/.scripts/one-mon.sh
 
 # Make a note and push via gotify
 bindsym $mod+n exec --no-startup-id bash ~/.scripts/gnote
@@ -144,7 +139,6 @@ bindsym $mod+Shift+Down move down
 bindsym $mod+Shift+Up move up
 bindsym $mod+Shift+Right move right
 
-
 bindsym $mod+Ctrl+Right resize shrink width 1 px or 1 ppt
 bindsym $mod+Ctrl+Up resize grow height 1 px or 1 ppt
 bindsym $mod+Ctrl+Down resize shrink height 1 px or 1 ppt
@@ -206,7 +200,6 @@ bindsym $mod+shift+o			gaps outer current minus 5
 bindsym $mod+BackSpace			gaps inner all set 14; gaps outer all set 14
 bindsym $mod+shift+BackSpace	gaps inner all set 0; gaps outer all set 0
 
-
 #### Programs
 bindsym $mod+Return exec kitty 
 bindsym $mod+Shift+Return exec alacritty -e ~/.scripts/web
@@ -221,26 +214,25 @@ bindsym $mod+Ctrl+f exec --no-startup-id alacritty -e ranger
 # Print Screen :::
 #WHOLE SCREEN
 bindsym Print exec scrot $HOME/Pictures/Screenshots/`date +%Y-%m-%d_%H:%M:%S`.png
-
 #APPLICATION
 bindsym $mod+Print exec scrot -u $HOME/Pictures/Screenshots/`date +%Y-%m-%d_%H:%M:%S`.png
-
 ##SELECT
 #bindsym --release $mod+Shift+Print exec --no-startup-id scrot -s $HOME/Pictures/Screenshots/`date +%Y-%m-%d_%H:%M:%S`.png
 bindsym --release $mod+Shift+Print exec --no-startup-id bash /home/simon/.scripts/vscrnpaste
-
 ##OPEN DIR
 bindsym $mod+s exec --no-startup-id nautilus ~/Pictures/Screenshots/ 
 
 #### ROFI
-bindsym $mod+e exec --no-startup-id rofi -show
+#bindsym $mod+e exec --no-startup-id rofi -show
+bindsym Menu exec --no-startup-id rofi -show
 bindsym $mod+Shift+e exec --no-startup-id rofi -show emoji -modi emoji
 bindsym $mod+d exec rofi -show run 
 bindsym $mod+Shift+d exec rofi -show drun -show-icons true
 
 #neomutt mail
 #bindsym $mod+m exec --no-startup-id alacritty -e neomutt
-bindsym $mod+m exec --no-startup-id kitty -e neomutt
+bindsym $mod+m exec --no-startup-id kitty -e neomutt 
+#bindsym $mod+Shift+m exec --no-startup-id mullvad-vpn #not used atm!
 
 #float certian windows
 for_window [class="feh" instance="feh"] floating enable
@@ -338,10 +330,9 @@ mode "resize" {
         bindsym $mod+r mode "default"
 }
 
-bindsym $mod+r mode "resize"
+#bindsym $mod+r mode "resize" #not used!
 
 set $Locker i3lock --color=000000 && sleep 1
-
 set $mode_system (l)lock  (e)logout  (s)suspend  (h)hibernate  (r)reboot  (Shift+s)shutdown
  
 mode "$mode_system" {
@@ -356,10 +347,8 @@ mode "$mode_system" {
 	bindsym Return mode "default"
 	bindsym Escape mode "default"
 }
-
 bindsym $mod+Escape mode "$mode_system"
 
-#
 #set $coloract "#6a8e7a"
 #set $colorin "#3c5045"
 #set_from_resource $white i3wm.color15 "#fefbec"
@@ -400,9 +389,5 @@ bar {
     urgent_workspace   #FF5555 #FF5555 #F8F8F2
     binding_mode       #FF5555 #FF5555 #F8F8F2
   }
-
-
-
 }
-
 bindsym $mod+b bar mode toggle 
diff --git a/kitty/kitty.conf b/kitty/kitty.conf
index 5591845..25eb419 100644
--- a/kitty/kitty.conf
+++ b/kitty/kitty.conf
@@ -762,7 +762,7 @@ background #282828
 
 #: The foreground and background colors
 
- background_opacity 0.92
+ background_opacity 1
 
 #: The opacity of the background. A number between 0 and 1, where 1 is
 #: opaque and 0 is fully transparent.  This will only work if
diff --git a/nvim/init.vim b/nvim/init.vim
index ce9c577..9067ef7 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -1,6 +1,22 @@
 call plug#begin('~/local/share/nvim/plugged')
 
+" Lightline
 Plug 'itchyny/lightline.vim'
+let g:lightline ={
+    \ 'colorscheme' : 'dracula',
+    \ 'component_function': {
+     \   'filetype': 'MyFiletype',
+     \   'fileformat': 'MyFileformat',
+     \ }
+    \}
+function! MyFiletype()
+  return winwidth(0) > 70 ? (strlen(&filetype) ? &filetype . ' ' . WebDevIconsGetFileTypeSymbol() : 'no ft') : ''
+endfunction
+
+function! MyFileformat()
+  return winwidth(0) > 70 ? (&fileformat . ' ' . WebDevIconsGetFileFormatSymbol()) : ''
+endfunction
+
 Plug 'editorconfig/editorconfig-vim'
 
 " Fzf
@@ -20,8 +36,8 @@ Plug 'scrooloose/syntastic'
 Plug 'jiangmiao/auto-pairs'
 
 "Airline
-Plug 'vim-airline/vim-airline'
-Plug 'vim-airline/vim-airline-themes'
+"Plug 'vim-airline/vim-airline'
+"Plug 'vim-airline/vim-airline-themes'
 Plug 'prabirshrestha/vim-lsp'
 
 " Themes
@@ -40,6 +56,7 @@ autocmd FileType java setlocal omnifunc=javacomplete#Complete
 "Plug 'Valloric/YouCompleteMe', { 'do': './install.py' }
 Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 Plug 'zchee/deoplete-jedi'
+Plug 'deoplete-plugins/deoplete-clang'
 Plug 'davidhalter/jedi-vim'
 
 Plug 'rust-lang/rust.vim'
@@ -108,8 +125,14 @@ call plug#end()
 
 "let g:molokai_original = 1
 "let g:airline_theme='onedark'
-let g:airline_theme='dracula'
-let g:ale_enable=0
+"let g:airline_theme='dracula'
+let g:ale_enable=1
+let g:ale_linters = {
+    \ 'python': ['pylint'],
+    \ 'vim': ['vint'],
+    \ 'cpp': ['clang'],
+    \ 'c': ['clang']
+\}
 syntax on
 filetype plugin indent on
 set shiftwidth=4
@@ -117,13 +140,13 @@ set softtabstop=4
 set tabstop=4
 set expandtab
 set number relativenumber
-"colorscheme onedark
 colorscheme dracula
 set nocompatible
 set encoding=UTF-8
 set clipboard+=unnamedplus
 set mouse=a
 set laststatus=3
+set termguicolors 
 
 " Map Leader
 let mapleader = ","
@@ -174,7 +197,6 @@ let g:python3_host_prog = '/usr/bin/python3'
 " Limeligt + Goyo Binds
 nnoremap <Leader>l :Limelight!!<CR>
 nnoremap <Leader>g :Goyo<CR>
-set termguicolors 
 let g:limelight_conceal_guifg = 'DarkGray'
 let g:limelight_conceal_guifg = '#777777'
 let g:limelight_conceal_ctermfg = 'gray'
diff --git a/nvim/spell/en.utf-8.add b/nvim/spell/en.utf-8.add
index c27d65e..0076ea3 100644
--- a/nvim/spell/en.utf-8.add
+++ b/nvim/spell/en.utf-8.add
@@ -156,3 +156,27 @@ max
 of
 maxptr
 scanf
+Fediverse
+microblogging
+fediverse
+indeti
+ActivityPub
+W3C
+linuxrocks
+lgbt
+flexability
+simonkellet
+Pixelfed
+Instagram
+Bookwyrm
+BookWyrm
+WebTorrent
+Peertube
+YouTuber's
+PeerTube
+Y4
+2nd
+malloc
+JVM
+Naur
+BNF
diff --git a/nvim/spell/en.utf-8.add.spl b/nvim/spell/en.utf-8.add.spl
index 6cb867d..4eecc9a 100644
Binary files a/nvim/spell/en.utf-8.add.spl and b/nvim/spell/en.utf-8.add.spl differ
diff --git a/qutebrowser/config.py b/qutebrowser/config.py
index a05b632..e5e7126 100644
--- a/qutebrowser/config.py
+++ b/qutebrowser/config.py
@@ -228,7 +228,6 @@ config.bind('xx', 'config-cycle tabs.show always never;; config-cycle statusbar.
 
 c.url.searchengines["g"] = "https://www.google.co.uk/search?q={}"
 c.url.searchengines = {'DEFAULT': 'https://www.google.co.uk/search?q={}'}
-c.url.searchengines["ddg"] = "https://www.duckduckgo.com/?q={}"
 c.url.searchengines["b"] = "https://search.brave.com/search?q={}"
 c.url.searchengines["aw"] = "https://wiki.archlinux.org/?search={}"
 c.url.searchengines["yt"] = "http://www.youtube.com/results?search_query={}"