diff --git a/.config/cmus/autosave b/.config/cmus/autosave
index ff06b3c..74ca091 100644
--- a/.config/cmus/autosave
+++ b/.config/cmus/autosave
@@ -26,11 +26,11 @@ set color_trackwin_album_bg=default
 set color_trackwin_album_fg=white
 set color_win_attr=default
 set color_win_bg=default
-set color_win_cur=white
+set color_win_cur=lightblue
 set color_win_cur_attr=default
 set color_win_cur_sel_attr=default
 set color_win_cur_sel_bg=blue
-set color_win_cur_sel_fg=white
+set color_win_cur_sel_fg=lightblue
 set color_win_dir=white
 set color_win_fg=default
 set color_win_inactive_cur_sel_attr=default
@@ -41,12 +41,12 @@ set color_win_inactive_sel_bg=gray
 set color_win_inactive_sel_fg=black
 set color_win_sel_attr=default
 set color_win_sel_bg=blue
-set color_win_sel_fg=gray
+set color_win_sel_fg=white
 set color_win_title_attr=default
 set color_win_title_bg=default
 set color_win_title_fg=white
 set confirm_run=true
-set continue=false
+set continue=true
 set continue_album=true
 set device=/dev/cdrom
 set display_artist_sort_name=false
diff --git a/.config/i3/config b/.config/i3/config
index 4c808ed..758a413 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -146,8 +146,9 @@ bindsym $mod+Shift+0 move container to workspace number $ws10
 # EDIT:
 #bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
-bindsym $mod+Shift+r restart
-bindsym $mod+Shift+b exec --no-startup-id /usr/bin/xbattbar -a -c -t 2 -I "#333333" -O white -i white -o "#333333"
+#bindsym $mod+Shift+r restart
+bindsym $mod+Shift+r exec ~/.config/i3/scripts/i3restart.sh
+#bindsym $mod+Shift+b exec --no-startup-id killall xbattbar && /usr/bin/xbattbar -a -c -t 2 -I "#333333" -O white -i white -o "#333333"
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
 
diff --git a/.config/i3/i3blocks.conf b/.config/i3/i3blocks.conf
index 1433dfc..d1317cb 100644
--- a/.config/i3/i3blocks.conf
+++ b/.config/i3/i3blocks.conf
@@ -11,7 +11,7 @@
 
 [notifications]
 full_text=available
-command=~/.scripts/togglenotify.sh
+command=~.config/i3/scripts/togglenotify.sh
 color=#91E78B
 
 # exchange rate(s)
@@ -48,7 +48,7 @@ interval=10
 color=#A4C2F4
 
 [mail]
-command=~/.scripts/mailnotify2.sh
+command=~/.config/i3/scripts/mailnotify.sh
 interval=60
 color=#91E78B
 
diff --git a/.config/i3/locked.png b/.config/i3/locked.png
new file mode 100644
index 0000000..aeb8e6e
Binary files /dev/null and b/.config/i3/locked.png differ
diff --git a/.config/i3/scripts/i3restart.sh b/.config/i3/scripts/i3restart.sh
new file mode 100755
index 0000000..fe7ea8b
--- /dev/null
+++ b/.config/i3/scripts/i3restart.sh
@@ -0,0 +1,3 @@
+i3-msg restart
+/usr/bin/killall xbattbar
+/usr/bin/xbattbar -a -c -t 2 -I "#333333" -O white -i white -o "#333333"
diff --git a/.scripts/lock.sh b/.config/i3/scripts/lock.sh
similarity index 100%
rename from .scripts/lock.sh
rename to .config/i3/scripts/lock.sh
diff --git a/.scripts/mailnotify2.sh b/.config/i3/scripts/mailnotify.sh
similarity index 85%
rename from .scripts/mailnotify2.sh
rename to .config/i3/scripts/mailnotify.sh
index b92876d..ad930af 100755
--- a/.scripts/mailnotify2.sh
+++ b/.config/i3/scripts/mailnotify.sh
@@ -5,7 +5,7 @@ function extract_sender {
     grep -o '^From: \(.*\)$' $1 | sed "s/^From: //g"
 }
 function extract_subject {
-	~/.scripts/decode_header.py `grep -o '^Subject: \(.*\)$' $1 | sed "s/^Subject: //g"`
+	~/.config/i3/scripts/decode_header.py `grep -o '^Subject: \(.*\)$' $1 | sed "s/^Subject: //g"`
 }
 
 prevmsgs=/tmp/oimapprevmsg
diff --git a/.config/i3/scripts/screencut.sh b/.config/i3/scripts/screencut.sh
index f49c9b8..abbe681 100755
--- a/.config/i3/scripts/screencut.sh
+++ b/.config/i3/scripts/screencut.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 maim -u -g `slop -b 3 -c 1,0,0` | convert - -alpha off ~/CUTS/`date +%s`.jpg
-adb root
-adb push ~/CUTS /storage/emulated/0/Download/
+#adb root
+#adb push ~/CUTS /storage/emulated/0/Download/
diff --git a/.scripts/togglenotify.sh b/.config/i3/scripts/togglenotify.sh
similarity index 100%
rename from .scripts/togglenotify.sh
rename to .config/i3/scripts/togglenotify.sh
diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc
index 67b0f81..e535b70 100755
--- a/.config/vifm/vifmrc
+++ b/.config/vifm/vifmrc
@@ -169,6 +169,8 @@ command! reload :write | restart
 " You can also add %CLEAR if you want to clear screen before running FUSE
 " program.
 
+filextype *.jpg.gpg gpg -qd %f | imv -
+
 " Pdf
 filextype *.pdf qpdfview %f &> /dev/null &, zathura %c %i &, apvlv %c, xpdf %c
 fileviewer *.pdf pdftotext -nopgbrk %c -
diff --git a/.muttrc b/.muttrc
index 2bc3e14..0b7157a 100644
--- a/.muttrc
+++ b/.muttrc
@@ -91,3 +91,5 @@ source ~/MAIL/muttrc.mailboxes
 source ~/MAIL/muttrc.aliases
 alias rianaroux \"Roux, Riana [rianaroux@sun.ac.za]\" <rianaroux@sun.ac.za>
 alias Dario Dario <20854714@sun.ac.za>
+alias rewitzky \"Rewitzky, IM, Prof [rewitzky@sun.ac.za]\" <rewitzky@sun.ac.za>
+alias ajcollett \"Collett, Andrew, Mnr [ajcollett@sun.ac.za]\" <ajcollett@sun.ac.za>
diff --git a/.scripts/mailnotify.sh b/.scripts/mailnotify.sh
deleted file mode 100755
index 8b001fc..0000000
--- a/.scripts/mailnotify.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-ml="$(find $HOME/MAIL/offlineIMAP/*/INBOX/new -type f | wc -l)"
-if (( ml > 0 )); then
-	echo $ml
-else
-	echo "0"
-fi
diff --git a/.vimrc b/.vimrc
index b1bbe8b..69558d0 100644
--- a/.vimrc
+++ b/.vimrc
@@ -303,3 +303,8 @@ autocmd FileType c set foldmethod=syntax
 autocmd FileType c set foldnestmax=2
 "autocmd FileType c set foldtext=DoxyFoldText()
 autocmd FileType c set syntax=c.doxygen
+
+autocmd FileType dart set shiftwidth=2
+autocmd FileType dart set tabstop=2
+autocmd FileType dart set softtabstop=2
+autocmd FileType dart set expandtab
diff --git a/.xinitrc b/.xinitrc
index c85589d..9e517d9 100755
--- a/.xinitrc
+++ b/.xinitrc
@@ -4,6 +4,6 @@
 
 killall -q pulseaudio
 /usr/bin/pulseaudio --start
-sudo /etc/init.d/bluetooth restart
+sudo /etc/init.d/bluetooth stop
 
 /usr/bin/ratpoison
diff --git a/.zlogin b/.zlogin
index a9afa47..34b578d 100644
--- a/.zlogin
+++ b/.zlogin
@@ -12,28 +12,19 @@ alias config='/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME'
 if [ -v SSH_AGENT_PID ]; then
 	#echo "ssh-agent up and running.";
 else
-	#Solve this bluetook issue
-	#killall -q pulseaudio
-	#/usr/bin/pulseaudio --start
-	#sudo /etc/init.d/bluetooth restart
 
 	eval `ssh-agent -s`
 	echo Have a lovely day!;
 fi
 
-##if pidof xinit > /dev/null; then
-	#echo Welcome to Z Shell.;
-	#alias vv="vi -S workingon.vim"
-	#alias vu="veracrypt -t -d"
-	#alias st="/scripts/settitle.sh"
-	#alias cm="tmux new-session -A -s cmus -c ~ cmus" 
+PATH="/home/x/.local/bin:/home/x/perl5/bin${PATH:+:${PATH}}"; export PATH;
+PERL5LIB="/home/x/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
+PERL_LOCAL_LIB_ROOT="/home/x/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
+PERL_MB_OPT="--install_base \"/home/x/perl5\""; export PERL_MB_OPT;
+PERL_MM_OPT="INSTALL_BASE=/home/x/perl5"; export PERL_MM_OPT;
 
-##else
-  #killall -q autoshut.sh
-  #/scripts/autoshut.sh &
-
-
-
-	#vlock
-  ##;
-##fi
+export VISUAL=vim
+export EDITOR=vim
+export SCIPY_PIL_IMAGE_VIEWER=imv
+export CHKTEXRC=~
+export SAGE_BROWSER=/usr/bin/firefox
diff --git a/.zshrc b/.zshrc
index 5f2c499..5282900 100644
--- a/.zshrc
+++ b/.zshrc
@@ -19,23 +19,23 @@ bindkey -v '^H' backward-delete-char
 #bindkey -v '^G' '\e'
 # End of lines configured by zsh-newuser-install
 
-PATH="/home/x/.local/bin:/home/x/perl5/bin${PATH:+:${PATH}}"; export PATH;
-PERL5LIB="/home/x/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
-PERL_LOCAL_LIB_ROOT="/home/x/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
-PERL_MB_OPT="--install_base \"/home/x/perl5\""; export PERL_MB_OPT;
-PERL_MM_OPT="INSTALL_BASE=/home/x/perl5"; export PERL_MM_OPT;
-
-export VISUAL=vim
-export EDITOR=vim
-export SCIPY_PIL_IMAGE_VIEWER=imv
-export CHKTEXRC=~
-export SAGE_BROWSER=/usr/bin/firefox
+#PATH="/home/x/.local/bin:/home/x/perl5/bin${PATH:+:${PATH}}"; export PATH;
+#PERL5LIB="/home/x/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
+#PERL_LOCAL_LIB_ROOT="/home/x/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
+#PERL_MB_OPT="--install_base \"/home/x/perl5\""; export PERL_MB_OPT;
+#PERL_MM_OPT="INSTALL_BASE=/home/x/perl5"; export PERL_MM_OPT;
+#
+#export VISUAL=vim
+#export EDITOR=vim
+#export SCIPY_PIL_IMAGE_VIEWER=imv
+#export CHKTEXRC=~
+#export SAGE_BROWSER=/usr/bin/firefox
 
 autoload -z edit-command-line
 zle -N edit-command-line
 bindkey -M vicmd ' ' edit-command-line
 
-echo -ne "\033]0;$(basename `dirname $PWD`)/$(basename ${PWD})\007"
-chpwd() {
-  echo -ne "\033]0;$(basename `dirname $PWD`)/$(basename ${PWD})\007"
-}
+#echo -ne "\033]0;$(basename `dirname $PWD`)/$(basename ${PWD})\007"
+#chpwd() {
+#  echo -ne "\033]0;$(basename `dirname $PWD`)/$(basename ${PWD})\007"
+#}
diff --git a/userChrome2.css b/userChrome2.css
index a087489..ae60a93 100644
--- a/userChrome2.css
+++ b/userChrome2.css
@@ -1,3 +1,16 @@
+:root:not([customizing]) #navigator-toolbox:not(:hover):not(:focus-within) #TabsToolbar {
+  visibility: collapse;
+}
+
+:root:not([customizing]) #navigator-toolbox:not(:hover):not(:focus-within) {
+  max-height: 1px;
+  min-height: calc(0px);
+  overflow: hidden;
+}
+
+tabbrowser tabpanels { background-color: rgb(19,19,20) !important; }
+browser { background-color: #131314 !important; }
+
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /*
@@ -45,12 +58,200 @@
  * Based on firefox own behavior while in fullscreen
  */
 
-#navigator-toolbox {
-	margin-top: -60px; /* has to be adjusted depending on density */
+/*#navigator-toolbox {
+	margin-top: -60px; /* has to be adjusted depending on density /
 	transition: margin-top 0.1s;
 }
 
 #navigator-toolbox:hover, #navigator-toolbox:focus-within {
 	margin-top: 0px;
 	transition: margin-top 0.1s;
+}*/
+
+/*
+ * From:
+ * https://www.reddit.com/r/firefox/comments/75y9ii/menus_are_blindingly_white_in_the_dark_theme/
+ */
+
+menupopup, popup,
+popup > menu > menupopup,
+menupopup > menu > menupopup {
+    -moz-appearance: none !important;
+    background: #262A33 !important;
+    border: 1px solid #525A6D !important;
+    padding: 2px 0px 2px 0px  !important;}
+
+menupopup menuseparator {
+    -moz-appearance: none !important;
+    background: #525A6D !important;
+    margin: 2px 0px 2px 0px !important;
+    padding: 0 !important;
+    border-top: none !important;
+    border-color: transparent !important;
 }
+
+menupopup menu, menuitem{
+	-moz-appearance: none !important;
+	color: #C4C4C4!important;}
+
+menupopup menu:hover, menuitem:hover {
+	-moz-appearance: none !important;
+    color:#C4C4C4 !important;
+    background-color:#165184 !important;} 
+
+/*Invert submenu arrow > color*/
+.menu-right{
+	filter: invert(95%)!important;
+}
+
+/*
+ * From: https://gist.github.com/sagars007/9e43d7275e5c55bd99158f229a0cd21f
+ */
+#app-picker{
+		color: white !important;
+		background-color: #2b2a33 !important;
+}
+	
+button {
+
+-moz-appearance: none !important;
+
+background-color: #42414D !important;
+
+color: white !important;
+
+border: 1px solid #52525E !important;
+border-radius: 4px !important;
+
+}
+
+button:hover {
+
+background-color: #5f5e6e !important;
+border: 1px solid dodgerblue !important;	
+}
+
+#app-picker-listbox{
+	-moz-appearance: none !important;
+	background-color: #2b2a33 !important;
+	color: white !important;
+	border: 1px solid #52525E !important;
+}
+
+#unknownContentType { 
+color: white !important;
+background-color: #2b2a33 !important; 
+}
+
+#openHandler {
+	-moz-appearance: none !important;
+	background: #5f5e6e !important;
+	color: white !important;
+	border: 1px solid #77758a !important;
+	border-radius: 4px !important;
+	
+}
+
+#openHandler:hover {
+	border: 1px solid dodgerblue !important;
+	background: #77758a !important;	
+}
+
+/*
+ * From: https://old.reddit.com/r/FirefoxCSS/comments/ml31wy/is_it_possible_to_grey_or_darken_the_exit_and/
+ */
+/*.dialogBox,
+.dialogFrame {
+	-moz-appearance: none !important;
+	padding: 5px 1px 5px 1px !important;
+	background-color: black !important;
+	color: white !important;
+	border: none !important;
+	border-radius: 0 !important;
+	box-shadow: none !important;
+}*/
+/*#commonDialogWindow:root[chromehidden] {
+	background-color: black !important;
+	background: black !important;
+	color: white !important;
+    appearance: none !important;
+}*/
+
+.dialogBox {
+    background-color: darkgray !important;
+    appearance: none !important;
+}
+.dialog-button-box > button {
+    background-color: darkgray !important;
+    appearance: none !important;
+}
+
+/*
+ * From: https://www.reddit.com/r/firefox/comments/8yd5c2/custom_minimalistinc_slim_scrollbar_for_dark/
+ */
+
+scrollbar, scrollbar *, scrollcorner {
+	-moz-appearance: none !important;
+	--scrollbar-width: 10px;
+    --scrollbar-height: var(--scrollbar-width);
+}
+
+scrollbar, scrollcorner  {
+    background: transparent !important;
+}
+scrollbar[orient="vertical"] {
+    width: var(--scrollbar-width) !important;
+    min-width: var(--scrollbar-width) !important;
+}
+scrollbar[orient="horizontal"] {
+    height: var(--scrollbar-height) !important;
+    min-height: var(--scrollbar-height) !important;
+}
+
+scrollbar thumb {
+	background: #3a3a3a !important;
+}
+scrollbar thumb:hover,
+scrollbar thumb:active {
+	background: #545454 !important;
+}
+
+scrollbar:inactive scrollbarbutton {
+    background-color: #444444 !important;
+}
+scrollbar scrollbarbutton:inactive {
+    background: #3a3a3a !important;
+}
+scrollbar scrollbarbutton:inactive {
+    background: #545454 !important;
+}
+scrollbar scrollbarbutton {
+    display: none !important;
+}
+
+/*
+ * From: https://support.mozilla.org/en-US/questions/1196927
+ */
+
+/*statuspanel[type="status"] .statuspanel-label {
+	display:none!important;
+}*/
+
+/*
+ * From: https://support.mozilla.org/en-US/questions/942499
+ */
+/*#statusbar-display[label^="Looking"] {display:none !important;}
+#statusbar-display[label^="Connect"] {display:none !important;}
+#statusbar-display[label^="Waiting"] {display:none !important;}
+#statusbar-display[label^="Transfer"] {display:none !important;}*/
+
+/*
+ * From: https://support.mozilla.org/en-US/questions/1289382
+ */
+#statuspanel #statuspanel-label {
+ /*display:none!important;*/
+	background-color: black!important;
+    border: 1px solid black!important;
+	color: white!important;
+}
+
diff --git a/userContent.css b/userContent.css
new file mode 100644
index 0000000..14b5e37
--- /dev/null
+++ b/userContent.css
@@ -0,0 +1,10 @@
+@-moz-document url-prefix(about:blank) {
+    html > body:empty {
+        background-color: rgb(19,19,20) !important;
+    }
+}
+@-moz-document url(about:blank) {
+    html > body:empty {
+        background-color: rgb(19,19,20) !important;
+    }
+}