diff --git a/.Xresources b/.Xresources
index 43fe92a..3c04718 100755
--- a/.Xresources
+++ b/.Xresources
@@ -104,7 +104,8 @@ urxvt.keysym.C-S-F10: command:\033]11;#00000f\007\
 \033]4;14;#93e0e3\007\
 \033]4;15;#ffffff\007
 
-urxvt.keysym.C-S-F11: command:\033]11;rgba:0000/0000/0000/5555\007\
+!urxvt.keysym.C-S-F11: command:\033]11;rgba:0000/0000/0000/5555\007\
+urxvt.keysym.C-S-F11: command:\033]11;#00000f\007\
 \033]10;#ffffff\007\
 \033]12;#ffffff\007\
 \033]4;0;#111111\007\
diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index e2c8f75..a9460a5 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -64,6 +64,7 @@ awful.layout.layouts = {
     awful.layout.suit.tile.top,
     awful.layout.suit.tile.right,
     awful.layout.suit.max,
+    awful.layout.suit.floating,
     -- awful.layout.suit.magnifier,
     -- awful.layout.suit.fair,
     -- awful.layout.suit.fair.horizontal,
@@ -320,6 +321,15 @@ globalkeys = gears.table.join(
     awful.key({ modkey, "Shift"   }, "o",
 				function () awful.spawn({"/home/x/.config/i3/scripts/screenshot.sh"})       end,
 				{description = "lock screen", group = "user"}),
+    awful.key({ modkey, "Shift"   }, "g",
+				function () awful.spawn({"/home/x/.config/i3/scripts/grabscreen.sh"})       end,
+				{description = "lock screen", group = "user"}),
+    awful.key({ modkey, "Shift"   }, "r",
+				function () awful.spawn({"/home/x/.config/i3/scripts/screenrec.sh"})       end,
+				{description = "lock screen", group = "user"}),
+    awful.key({ modkey, "Shift"   }, "w",
+				function () awful.spawn({"/usr/bin/killall", "ffmpeg"})       end,
+				{description = "lock screen", group = "user"}),
     awful.key({ modkey, "Shift"   }, "b",
 				function () awful.spawn({"/home/x/.config/i3/scripts/screencut.sh"})             end,
 				{description = "lock screen", group = "user"}),
@@ -597,3 +607,48 @@ end)
 client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end)
 client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end)
 -- }}}
+
+-- Autorun programs
+autorun = true
+autorunApps =
+{
+   "/home/x/.config/i3/scripts/startup.sh",
+}
+if autorun then
+   for app = 1, #autorunApps do
+       awful.util.spawn(autorunApps[app])
+   end
+end
+
+-- https://bpdp.blogspot.com/2013/06/battery-warning-notification-for.html
+-- battery warning
+-- created by bpdp
+
+local function trim(s)
+  return s:find'^%s*$' and '' or s:match'^%s*(.*%S)'
+end
+
+local function bat_notification()
+  
+  local f_capacity = assert(io.open("/sys/class/power_supply/BAT0/capacity", "r"))
+  local f_status = assert(io.open("/sys/class/power_supply/BAT0/status", "r"))
+
+  local bat_capacity = tonumber(f_capacity:read("*all"))
+  local bat_status = trim(f_status:read("*all"))
+
+  if (bat_capacity <= 30 and bat_status == "Discharging") then
+    naughty.notify({ title      = "Battery Warning"
+      , text       = "Battery low! " .. bat_capacity .."%" .. " left!"
+      , bg="#ff0000"
+      , fg="#000000"
+      , timeout    = 15
+      , position   = "top_right"
+    })
+  end
+end
+
+battimer = timer({timeout = 120})
+battimer:connect_signal("timeout", bat_notification)
+battimer:start()
+
+-- end here for battery warning
diff --git a/.config/i3/scripts/startup.sh b/.config/i3/scripts/startup.sh
index a6fd449..187826d 100755
--- a/.config/i3/scripts/startup.sh
+++ b/.config/i3/scripts/startup.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
-killall compton
+#killall compton
 killall pasystray
-killall xbattbar
+#killall xbattbar
 
-compton &
+#compton &
 pasystray &
-/usr/bin/xbattbar -a -c -t 2 -I "#333333" -O white -i white -o "#333333" &
+#/usr/bin/xbattbar -a -c -t 2 -I "#333333" -O white -i white -o "#333333" &
diff --git a/.config/qpdfview/qpdfview.conf b/.config/qpdfview/qpdfview.conf
index 8f418cd..8a6b315 100644
--- a/.config/qpdfview/qpdfview.conf
+++ b/.config/qpdfview/qpdfview.conf
@@ -19,7 +19,7 @@ prefetch=true
 prefetchDistance=10
 rotateModifiers=33554432
 rotation=0
-scaleFactor=2.541535355028591
+scaleFactor=7.345037176032628
 scaleMode=1
 scrollModifiers=134217728
 sourceEditor=
@@ -40,7 +40,7 @@ exitAfterLastTab=false
 extendedSearchDock=true
 fileToolBar=openInNewTab, refresh
 fontsDialogSize=@Size(278 244)
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\x1\xcb\0\0\x5\x9f\0\0\x3\x83\0\0\0\0\0\0\x1\xcb\0\0\x5\x9f\0\0\x3\x83\0\0\0\0\0\0\0\0\x5\xa0\0\0\0\0\0\0\x1\xcb\0\0\x5\x9f\0\0\x3\x83)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\x12\0\0\x5\x9f\0\0\x3\x83\0\0\0\x2\0\0\0\x14\0\0\x5\x9d\0\0\x3\x81\0\0\0\0\0\0\0\0\x5\xa0\0\0\0\x2\0\0\0\x14\0\0\x5\x9d\0\0\x3\x81)
 instanceNameInWindowTitle=false
 keepRecentlyClosed=false
 newTabNextToCurrentTab=true
@@ -57,7 +57,7 @@ scrollableMenus=false
 searchableMenus=false
 settingsDialogSize=@Size(430 663)
 spreadTabs=true
-state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\xb3\0\0\x3\t\xfc\x2\0\0\0\x3\xfb\0\0\0\x16\0o\0u\0t\0l\0i\0n\0\x65\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3\t\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x1c\0p\0r\0o\0p\0\x65\0r\0t\0i\0\x65\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3\t\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x1c\0t\0h\0u\0m\0\x62\0n\0\x61\0i\0l\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3\t\0\0\0\x91\0\xff\xff\xff\0\0\0\x3\0\0\x4\xf4\0\0\0~\xfc\x1\0\0\0\x2\xfb\0\0\0\x1a\0\x62\0o\0o\0k\0m\0\x61\0r\0k\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x4\xf4\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x14\0s\0\x65\0\x61\0r\0\x63\0h\0\x44\0o\0\x63\0k\x2\0\0\0p\0\0\0\xb5\0\0\x2q\0\0\0\xfc\0\0\x5\xa0\0\0\x1\xb9\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x16\0\x66\0i\0l\0\x65\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0\x65\0\x64\0i\0t\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0v\0i\0\x65\0w\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
+state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\xb3\0\0\x3\t\xfc\x2\0\0\0\x3\xfb\0\0\0\x16\0o\0u\0t\0l\0i\0n\0\x65\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3\t\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x1c\0p\0r\0o\0p\0\x65\0r\0t\0i\0\x65\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3\t\0\0\0\x91\0\xff\xff\xff\xfb\0\0\0\x1c\0t\0h\0u\0m\0\x62\0n\0\x61\0i\0l\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x3\t\0\0\0\x91\0\xff\xff\xff\0\0\0\x3\0\0\x5\x9c\0\0\0\xc5\xfc\x1\0\0\0\x2\xfb\0\0\0\x14\0s\0\x65\0\x61\0r\0\x63\0h\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x5\x9c\0\0\x1\x92\0\xff\xff\xff\xfb\0\0\0\x1a\0\x62\0o\0o\0k\0m\0\x61\0r\0k\0s\0\x44\0o\0\x63\0k\0\0\0\0\0\0\0\x4\xf4\0\0\0\x91\0\xff\xff\xff\0\0\x5\x9c\0\0\x2\xa3\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x16\0\x66\0i\0l\0\x65\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0\x65\0\x64\0i\0t\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0\0\0\0\x16\0v\0i\0\x65\0w\0T\0o\0o\0l\0\x42\0\x61\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\0\0\0\0\0)
 styleSheet="\n\n/*-----QWidget-----*/\nQWidget\n{\n\tbackground-color: #232430;\n\tcolor: #EEEEEE;\n\tborder-color: #000000;\n\n}\n\n\n/*-----QLabel-----*/\nQLabel\n{\n\tbackground-color: #232430;\n\tcolor: #c1c1c1;\n\tborder-color: #000000;\n\n}\n\n/*-----QLineEdit-----*/\nQLineEdit\n{\n\tbackground-color: #38394e;\n\tcolor: #c1c1c1;\n\tborder-style: solid;\n\tborder-width: 1px;\n\tborder-color: #4a4c68;\n\n}\n\n\n/*-----QTableView-----*/\nQTableView, \nQHeaderView, \nQTableView::item \n{\n\tbackground-color: #232430;\n\tcolor: #c1c1c1;\n\tborder: none;\n\n}\n\n\nQTableView::item:selected \n{ \n    background-color: #41424e;\n    color: #c1c1c1;\n\n}\n\n\nQHeaderView::section:horizontal \n{\n    background-color: #232430;\n\tborder: 1px solid #37384d;\n\tpadding: 5px;\n\n}\n\n\nQTableView::indicator{\n\tbackground-color: #1d1d28;\n\tborder: 1px solid #37384d;\n\n}\n\n\nQTableView::indicator:checked{\n\timage:url(./ressources/check.png); /*To replace*/\n\tbackground-color: #1d1d28;\n\n}\n\n/*-----QTabWidget-----*/\nQTabWidget::pane \n{ \n    border: none;\n\n}\n\n\nQTabWidget::tab-bar \n{\n    left: 5px; \n\n}\n\n\nQTabBar::tab \n{\n    color: #c1c1c1;\n    min-width: 1px;\n\tpadding-left: 25px;\n\tmargin-left:-22px;\n    height: 28px;\n\tborder: none;\n\n}\n\n\nQTabBar::tab:selected \n{\n    color: #c1c1c1;\n\tfont-weight: bold;\n    height: 28px;\n\n}\n\n\nQTabBar::tab:!first \n{\n    margin-left: -20px;\n\n}\n\n\nQTabBar::tab:hover \n{\n    color: #DDD;\n\n}\n\n/*-----QTableView & QTableWidget-----*/\nQTableView\n{\n    background-color: #202030;\n    border: 1px solid #32414B;\n    color: #f0f0f0;\n    gridline-color: #8faaff;\n    outline : 0;\n\n}\n\n\n/*-----QScrollBar-----*/\nQScrollBar:horizontal \n{\n    background-color: transparent;\n    height: 8px;\n    margin: 0px;\n    padding: 0px;\n\n}\n\n\nQScrollBar::handle:horizontal \n{\n    border: none;\n\tmin-width: 100px;\n    background-color: #56576c;\n\n}\n\n\nQScrollBar::add-line:horizontal, \nQScrollBar::sub-line:horizontal,\nQScrollBar::add-page:horizontal, \nQScrollBar::sub-page:horizontal \n{\n    width: 0px;\n    background-color: transparent;\n\n}\n\n\nQScrollBar:vertical \n{\n    background-color: transparent;\n    width: 8px;\n    margin: 0;\n\n}\n\n\nQScrollBar::handle:vertical \n{\n    border: none;\n\tmin-height: 100px;\n    background-color: #56576c;\n\n}\n\n\nQScrollBar::add-line:vertical, \nQScrollBar::sub-line:vertical,\nQScrollBar::add-page:vertical, \nQScrollBar::sub-page:vertical \n{\n    height: 0px;\n    background-color: transparent;\n\n}\n"
 synchronizeOutlineView=false
 synchronizeSplitViews=false
diff --git a/.muttrc b/.muttrc
index 11c002e..c42330d 100644
--- a/.muttrc
+++ b/.muttrc
@@ -87,10 +87,14 @@ set query_command="lbdbq %s"
 set tmpdir="~/MAIL/mutttmp/"
 set message_cachedir="~/MAIL/muttmcache/"
 set header_cache="~/MAIL/mutthcache/"
-source ~/test_muttrc.mailboxes
+
+#see example_muttrc.mailboxes to set up this file!
+source ~/local_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>
 alias bpackbus Backpacker Bus <bpackbus@mweb.co.za>
+alias gboxall \"Boxall, GJ, Dr [gboxall@sun.ac.za]\" <gboxall@sun.ac.za>
diff --git a/.ratpoisonrc b/.ratpoisonrc
index 6079783..c0ce944 100644
--- a/.ratpoisonrc
+++ b/.ratpoisonrc
@@ -17,4 +17,5 @@ exec unclutter -idle 5 -jitter 20
 #exec /usr/bin/xinput set-button-map 11 1 2 3 5 4 7 6
 #exec /usr/bin/xinput set-prop 11 298 0
 
-tmpwm i3
+#tmpwm i3
+tmpwm awesome
diff --git a/.tmux.conf b/.tmux.conf
index d9c2c60..15f7545 100755
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -205,6 +205,7 @@ set -g default-terminal "tmux"
 bind % split-window -h -c "#{pane_current_path}"
 bind \" split-window -v -c "#{pane_current_path}"
 
+run-shell "powerline-daemon -q"
 # git clone https://github.com/erikw/tmux-powerline.git
 set-option -g status on
 set-option -g status-bg colour235
diff --git a/.uncrustify.cfg b/.uncrustify.cfg
index b4566f6..10be712 100755
--- a/.uncrustify.cfg
+++ b/.uncrustify.cfg
@@ -118,8 +118,8 @@ sp_after_tparen_close           = ignore
 sp_square_fparen                = ignore
 sp_fparen_brace                 = ignore
 sp_fparen_dbrace                = ignore
-sp_func_call_paren              = ignore
-sp_func_call_paren_empty        = ignore
+sp_func_call_paren              = false
+sp_func_call_paren_empty        = false
 sp_func_call_user_paren         = ignore
 sp_func_class_paren             = ignore
 sp_func_class_paren_empty       = ignore
diff --git a/.vimrc b/.vimrc
index 17ace38..47f03b4 100644
--- a/.vimrc
+++ b/.vimrc
@@ -290,7 +290,7 @@ nn <script>   <SID>ws+   <C-W>+<SID>ws
 nn <script>   <SID>ws-   <C-W>-<SID>ws
 nn <script>   <SID>ws>   <C-W>><SID>ws
 nn <script>   <SID>ws<   <C-W><<SID>ws
-nmap          <SID>ws    <Nop> 
+"nmap          <SID>ws    <Nop> 
 
 """""""""""""""""""""""""""""""" DOXYGEN TOOLKIT """""""""""""""""""""""""""""""
 "https://www.vim.org/scripts/script.php?script_id=987
diff --git a/.zlogin b/.zlogin
index 65d1da6..c445f0b 100644
--- a/.zlogin
+++ b/.zlogin
@@ -1,5 +1,3 @@
-#printf "`date +%s` - `date` \n`cat /sys/class/power_supply/BAT0/uevent`\n\n" >> ~/bat0_history
-
 alias vv="vi -S"
 alias tt="tmux attach"
 alias ll="ls -al"
@@ -13,15 +11,3 @@ else
 	eval `ssh-agent -s`
 	echo Have a lovely day!;
 fi
-
-#PATH="~/.local/bin:/home/x/perl5/bin${PATH:+:${PATH}}"; export PATH;
-#PERL5LIB="~/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
-#PERL_LOCAL_LIB_ROOT="~/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
-#PERL_MB_OPT="--install_base \"~/perl5\""; export PERL_MB_OPT;
-#PERL_MM_OPT="INSTALL_BASE=~/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
diff --git a/.zshrc b/.zshrc
index 5282900..ef05daf 100644
--- a/.zshrc
+++ b/.zshrc
@@ -8,10 +8,11 @@ zstyle :compinstall filename '/home/x/.zshrc'
 autoload -Uz compinit
 compinit
 # End of lines added by compinstall
+
 # Lines configured by zsh-newuser-install
 HISTFILE=~/.histfile
-HISTSIZE=30000
-SAVEHIST=30000
+HISTSIZE=300000
+SAVEHIST=300000
 setopt appendhistory notify
 bindkey -v
 bindkey -v '^?' backward-delete-char
@@ -19,22 +20,12 @@ 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
-
 autoload -z edit-command-line
 zle -N edit-command-line
 bindkey -M vicmd ' ' edit-command-line
 
+PROMPT="$ "
+
 #echo -ne "\033]0;$(basename `dirname $PWD`)/$(basename ${PWD})\007"
 #chpwd() {
 #  echo -ne "\033]0;$(basename `dirname $PWD`)/$(basename ${PWD})\007"