diff --git a/files/bash/.bashrc b/files/bash/.bashrc
index 297afeb..3c65cb1 100644
--- a/files/bash/.bashrc
+++ b/files/bash/.bashrc
@@ -131,7 +131,7 @@ export HOSTFILE=$HOME/.hosts
 # export INPUTRC=$HOME/.inputrc			# type in ‘whatever’ and press ‘Page Up’ key and bash automatically fetches last command that starts with whatever and completes the command for you (requires '$HOME/.inputrc' with these lines: #Page up/page down && "\e[5~": history-search-backward && "\e[6~": history-search-forward)
 # export LC_COLLATE="en_CA.utf8"		# change sorting methods [a-Z] instead of [A-Z]
 export LESSCHARSET='latin1'
-export LESS='-i -N -w  -z-4 -g -e -M -X -F -R -P%t?f%f \'
+export LESS='-i -n -w  -z-4 -g -e -M -X -F -R -P%t?f%f \'
 # export LESSOPEN="|lesspipe.sh %s"; export LESSOPEN
 export LESSOPEN='|/usr/bin/lesspipe.sh %s 2>&-'	# use this if lesspipe.sh exists
 # export LESS="-QR"				# tell less not to beep and also display colours
@@ -414,10 +414,10 @@ function display() {
         if [[ -e "~/Pictures/$layout.jpg" ]]; then
             (cd ~/Pictures && cp "$layout.jpg" "./xin_1.jpg")
         fi
-        nitrogen --restore >/dev/null 2>&1
+        nitrogen --restore
         i3-msg reload
         # dunst doesn't like screensize changes
-        killall dunst;notify-send foo
+        killall dunst;notify-send "Display Switched"
     fi
 }
 
diff --git a/files/bash/.profile b/files/bash/.profile
index 68697bd..554c9a6 100644
--- a/files/bash/.profile
+++ b/files/bash/.profile
@@ -9,4 +9,5 @@
 #umask 022
 
 export PATH="/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:$HOME/bin:/sbin:$HOME/projects/scripts/:$HOME/.node_modules/bin:$HOME/.gem/ruby/2.5.0/bin"
-export npm_config_prefix=~/.node_modules
\ No newline at end of file
+export npm_config_prefix=~/.node_modules
+export GOPATH="/home/nemo/projects/go"
\ No newline at end of file
diff --git a/files/display/.config/nitrogen/bg-saved.cfg b/files/display/.config/nitrogen/bg-saved.cfg
index 91d682f..4940eac 100644
--- a/files/display/.config/nitrogen/bg-saved.cfg
+++ b/files/display/.config/nitrogen/bg-saved.cfg
@@ -5,7 +5,7 @@ bgcolor=#000000
 
 [xin_1]
 file=/home/nemo/Pictures/Wallpapers/wallhaven-599189.png
-mode=0
+mode=5
 bgcolor=#000000
 
 [xin_2]
diff --git a/files/display/.config/nitrogen/nitrogen.cfg b/files/display/.config/nitrogen/nitrogen.cfg
index bf28d59..c987322 100644
--- a/files/display/.config/nitrogen/nitrogen.cfg
+++ b/files/display/.config/nitrogen/nitrogen.cfg
@@ -1,8 +1,8 @@
 [geometry]
-posx=34
-posy=1377
-sizex=1852
-sizey=488
+posx=1920
+posy=300
+sizex=1440
+sizey=879
 
 [nitrogen]
 view=icon
diff --git a/files/display/.screenlayout/mac_office.sh b/files/display/.screenlayout/mac_office.sh
index 43652d5..0131c71 100755
--- a/files/display/.screenlayout/mac_office.sh
+++ b/files/display/.screenlayout/mac_office.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-xrandr --output VIRTUAL1 --off --output eDP1 --primary --mode 1440x900 --pos 1920x0 --rotate normal --output DP1 --off --output HDMI2 --off --output HDMI1 --off --output DP1-2 --off --output DP1-1 --mode 1920x1080 --pos 0x0 --rotate normal --output DP2 --off
+xrandr --output VIRTUAL1 --off --output eDP1 --primary --mode 1440x900 --pos 1920x0 --rotate normal --output DP1 --off --output HDMI2 --off --output HDMI1 --off --output DP1 --mode 1920x1080 --pos 0x0
diff --git a/files/themes/.config/Trolltech.conf b/files/themes/.config/Trolltech.conf
index 11b04e0..e3b3d34 100644
--- a/files/themes/.config/Trolltech.conf
+++ b/files/themes/.config/Trolltech.conf
@@ -1,38 +1,38 @@
 [Qt%20Plugin%20Cache%204.8.false]
-usr\lib\qt4\plugins\inputmethods\libqimsw-multi.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:06
-usr\lib\qt4\plugins\sqldrivers\libqsqlibase.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:07
-usr\lib\qt4\plugins\sqldrivers\libqsqlite.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:07
-usr\lib\qt4\plugins\sqldrivers\libqsqlmysql.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:07
-usr\lib\qt4\plugins\sqldrivers\libqsqlodbc.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:07
-usr\lib\qt4\plugins\sqldrivers\libqsqlpsql.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:07
-usr\lib\qt4\plugins\imageformats\libqgif.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:06
-usr\lib\qt4\plugins\imageformats\libqico.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:06
-usr\lib\qt4\plugins\imageformats\libqjpeg.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:07
-usr\lib\qt4\plugins\imageformats\libqmng.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:06
-usr\lib\qt4\plugins\imageformats\libqsvg.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:06
-usr\lib\qt4\plugins\imageformats\libqtiff.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:06
-usr\lib\qt4\plugins\iconengines\libqsvgicon.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:06
-usr\lib\qt4\plugins\bearer\libqconnmanbearer.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:06
-usr\lib\qt4\plugins\bearer\libqgenericbearer.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:06
-usr\lib\qt4\plugins\bearer\libqnmbearer.so=40807, 0, x86_64 linux g++-4 full-config, 2017-11-14T13:12:06
+usr\lib\qt4\plugins\inputmethods\libqimsw-multi.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\sqldrivers\libqsqlibase.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\sqldrivers\libqsqlite.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\sqldrivers\libqsqlmysql.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\sqldrivers\libqsqlodbc.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\sqldrivers\libqsqlpsql.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\imageformats\libqgif.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\imageformats\libqico.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\imageformats\libqjpeg.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\imageformats\libqmng.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\imageformats\libqsvg.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\imageformats\libqtiff.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\iconengines\libqsvgicon.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\bearer\libqconnmanbearer.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\bearer\libqgenericbearer.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
+usr\lib\qt4\plugins\bearer\libqnmbearer.so=40807, 0, x86_64 linux g++-4 full-config, 2018-03-28T04:12:04
 
 [Qt%20Factory%20Cache%204.8]
-com.trolltech.Qt.QInputContextFactoryInterface%3A\usr\lib\qt4\plugins\inputmethods\libqimsw-multi.so=2017-11-14T13:12:06, imsw-multi
-com.trolltech.Qt.QSqlDriverFactoryInterface%3A\usr\lib\qt4\plugins\sqldrivers\libqsqlite.so=2017-11-14T13:12:07, QSQLITE
-com.trolltech.Qt.QSqlDriverFactoryInterface%3A\usr\lib\qt4\plugins\sqldrivers\libqsqlmysql.so=2017-11-14T13:12:07, QMYSQL3, QMYSQL
-com.trolltech.Qt.QSqlDriverFactoryInterface%3A\usr\lib\qt4\plugins\sqldrivers\libqsqlodbc.so=2017-11-14T13:12:07, QODBC3, QODBC
-com.trolltech.Qt.QSqlDriverFactoryInterface%3A\usr\lib\qt4\plugins\sqldrivers\libqsqlpsql.so=2017-11-14T13:12:07, QPSQL7, QPSQL
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqgif.so=2017-11-14T13:12:06, gif
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqico.so=2017-11-14T13:12:06, ico
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqjpeg.so=2017-11-14T13:12:07, jpeg, jpg
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqmng.so=2017-11-14T13:12:06, mng
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqsvg.so=2017-11-14T13:12:06, svg, svgz
-com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqtiff.so=2017-11-14T13:12:06, tiff, tif
-com.trolltech.Qt.QIconEngineFactoryInterfaceV2%3A\usr\lib\qt4\plugins\iconengines\libqsvgicon.so=2017-11-14T13:12:06, svg, svgz, svg.gz
-com.trolltech.Qt.QIconEngineFactoryInterface%3A\usr\lib\qt4\plugins\iconengines\libqsvgicon.so=2017-11-14T13:12:06
-com.trolltech.Qt.QBearerEngineFactoryInterface%3A\usr\lib\qt4\plugins\bearer\libqconnmanbearer.so=2017-11-14T13:12:06, connman
-com.trolltech.Qt.QBearerEngineFactoryInterface%3A\usr\lib\qt4\plugins\bearer\libqgenericbearer.so=2017-11-14T13:12:06, generic
-com.trolltech.Qt.QBearerEngineFactoryInterface%3A\usr\lib\qt4\plugins\bearer\libqnmbearer.so=2017-11-14T13:12:06, networkmanager
+com.trolltech.Qt.QInputContextFactoryInterface%3A\usr\lib\qt4\plugins\inputmethods\libqimsw-multi.so=2018-03-28T04:12:04, imsw-multi
+com.trolltech.Qt.QSqlDriverFactoryInterface%3A\usr\lib\qt4\plugins\sqldrivers\libqsqlite.so=2018-03-28T04:12:04, QSQLITE
+com.trolltech.Qt.QSqlDriverFactoryInterface%3A\usr\lib\qt4\plugins\sqldrivers\libqsqlmysql.so=2018-03-28T04:12:04, QMYSQL3, QMYSQL
+com.trolltech.Qt.QSqlDriverFactoryInterface%3A\usr\lib\qt4\plugins\sqldrivers\libqsqlodbc.so=2018-03-28T04:12:04, QODBC3, QODBC
+com.trolltech.Qt.QSqlDriverFactoryInterface%3A\usr\lib\qt4\plugins\sqldrivers\libqsqlpsql.so=2018-03-28T04:12:04, QPSQL7, QPSQL
+com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqgif.so=2018-03-28T04:12:04, gif
+com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqico.so=2018-03-28T04:12:04, ico
+com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqjpeg.so=2018-03-28T04:12:04, jpeg, jpg
+com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqmng.so=2018-03-28T04:12:04, mng
+com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqsvg.so=2018-03-28T04:12:04, svg, svgz
+com.trolltech.Qt.QImageIOHandlerFactoryInterface%3A\usr\lib\qt4\plugins\imageformats\libqtiff.so=2018-03-28T04:12:04, tiff, tif
+com.trolltech.Qt.QIconEngineFactoryInterfaceV2%3A\usr\lib\qt4\plugins\iconengines\libqsvgicon.so=2018-03-28T04:12:04, svg, svgz, svg.gz
+com.trolltech.Qt.QIconEngineFactoryInterface%3A\usr\lib\qt4\plugins\iconengines\libqsvgicon.so=2018-03-28T04:12:04
+com.trolltech.Qt.QBearerEngineFactoryInterface%3A\usr\lib\qt4\plugins\bearer\libqconnmanbearer.so=2018-03-28T04:12:04, connman
+com.trolltech.Qt.QBearerEngineFactoryInterface%3A\usr\lib\qt4\plugins\bearer\libqgenericbearer.so=2018-03-28T04:12:04, generic
+com.trolltech.Qt.QBearerEngineFactoryInterface%3A\usr\lib\qt4\plugins\bearer\libqnmbearer.so=2018-03-28T04:12:04, networkmanager
 
 [Qt]
 filedialog=@ByteArray(\0\0\0\xbe\0\0\0\x3\0\0\0\x1e\0\0\0\xff\0\0\0\0\0\0\0\x2\0\0\0]\0\0\xe\0\x1\0\0\0\x4\x1\0\0\0\x1\0\0\0\x2\0\0\0\x5\x66ile:\0\0\0\x11\x66ile:///home/nemo\0\0\0\x1\0\0\0\x14\0/\0h\0o\0m\0\x65\0/\0n\0\x65\0m\0o\0\0\0\x14\0/\0h\0o\0m\0\x65\0/\0n\0\x65\0m\0o\0\0\0~\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x1\xec\0\0\0\x4\x1\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x4\0\0\0\xff\0\0\0\x1\0\0\0\0\0\0\0?\0\0\0\x1\0\0\0\0\0\0\0@\0\0\0\x1\0\0\0\0\0\0\0n\0\0\0\x1\0\0\0\0\0\0\0\x1)