diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 7ef6ee6..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "dircolors-solarized"]
-	path = dircolors-solarized
-	url = https://github.com/seebi/dircolors-solarized
diff --git a/00-thinkpad-p53-keyboard.conf b/00-thinkpad-p53-keyboard.conf
new file mode 100644
index 0000000..7d5c1bc
--- /dev/null
+++ b/00-thinkpad-p53-keyboard.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+        Identifier "system-keyboard"
+	MatchIsKeyboard "on"
+        Option "XkbLayout" "us"
+        Option "XkbOptions" "ctrl:nocaps"
+EndSection
diff --git a/Makefile b/Makefile
index 774ad1b..4fe4277 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,20 @@
 LN_FLAGS = -sfnv
 MKDIR_FLAGS = -pv
 
-home_symlinks = Xresources xbindkeysrc xinitrc vimrc vim Xmodmap tmux.conf gitconfig bashrc
+home_symlinks = Xresources xbindkeysrc xinitrc vimrc vim tmux.conf gitconfig bashrc
 
 config_copy = 
 
-config_symlinks = termite dircolors-solarized i3
+config_symlinks = i3 alacritty
 
 gnupg_symlinks = gpg-agent.conf
 
 
-local_install: Xresources xbindkeysrc xinitrc vimrc vim termite dircolors-solarized i3 gitconfig gpg-agent.conf bashrc
+local_install: Xresources xbindkeysrc xinitrc vimrc vim i3 gitconfig gpg-agent.conf bashrc alacritty
 
-mac_local_install: vimrc vim dircolors-solarized gpg-agent.conf tmux.conf bashrc
+mac_local_install: vimrc vim gpg-agent.conf tmux.conf bashrc
 
-remote_install: vim vimrc dircolors-solarized tmux.conf
-
-ctrl_install: Xmodmap
+remote_install: vim vimrc tmux.conf
 
 .PHONY: $(home_symlinks)
 $(home_symlinks):
diff --git a/README.md b/README.md
index 6b7d1f2..c1f1606 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,4 @@
-My dotfiles
+# My dotfiles
+
+Key bindkngs / XKB: https://wiki.archlinux.org/index.php/Xorg/Keyboard_configuration#Using_X_configuration_files
+- do not include XkbModel or XkbVariant options
diff --git a/Xmodmap b/Xmodmap
deleted file mode 100644
index 1fc59f2..0000000
--- a/Xmodmap
+++ /dev/null
@@ -1,15 +0,0 @@
-clear      lock 
-clear   control
-clear      mod1
-clear      mod2
-clear      mod3
-clear      mod4
-clear      mod5
-keycode      37 = Hyper_L
-keycode      66 = Control_L
-add     control = Control_L Control_R
-add        mod1 = Alt_L Alt_R Meta_L
-add        mod2 = Num_Lock
-add        mod3 = Hyper_L
-add        mod4 = Super_L Super_R
-add        mod5 = Mode_switch ISO_Level3_Shift
diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml
new file mode 100644
index 0000000..1889814
--- /dev/null
+++ b/alacritty/alacritty.yml
@@ -0,0 +1,2 @@
+font:
+  size: 10
diff --git a/bashrc b/bashrc
index 2c8bb0c..a2f35f0 100644
--- a/bashrc
+++ b/bashrc
@@ -11,14 +11,11 @@ PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[0
 # Generic exports
 export EDITOR=vim
 export GOPATH=$HOME/go
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completionexport PATH=$GOPATH/bin:$PATH
 export PATH=$HOME/go/bin:$PATH
 export PATH=$HOME/.local/bin:$PATH
 export PATH=$HOME/.local/share/google-cloud-sdk/bin:$PATH
+export PATH=$HOME/.local/share/alacritty/target/release:$PATH
 export PATH=/usr/NX/bin:$PATH
-export PATH=/opt/waterfox:$PATH
 if [[ -z $TMUX ]]; then
   export TERM='xterm-256color'
 else
@@ -69,7 +66,6 @@ if [[ "$OSTYPE" == 'darwin'* ]]; then
   fi
 elif [[ "$OSTYPE" == 'linux-gnu' ]]; then
   alias ls="ls --color=auto"
-  eval `dircolors ~/.config/dircolors-solarized/dircolors.256dark`
 fi
 
 # VIM
diff --git a/dircolors-solarized b/dircolors-solarized
deleted file mode 160000
index 2720cb1..0000000
--- a/dircolors-solarized
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2720cb1ff508bc358f9414f63370f0c6cd767b98
diff --git a/i3/config b/i3/config
index 5057a6e..ac9a4ae 100644
--- a/i3/config
+++ b/i3/config
@@ -30,7 +30,7 @@ font pango:monospace 8
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec termite
+bindsym $mod+Return exec alacritty
 
 # kill focused window
 bindsym $mod+Shift+q kill
diff --git a/termite/config b/termite/config
deleted file mode 100644
index b44b12e..0000000
--- a/termite/config
+++ /dev/null
@@ -1,8 +0,0 @@
-# My dark theme
-
-[colors]
-foreground = orange
-background = black
-
-[options]
-font = Monospace 12
diff --git a/xinitrc b/xinitrc
index 4c9e327..e6d5e76 100644
--- a/xinitrc
+++ b/xinitrc
@@ -17,8 +17,9 @@ if [ "$HOSTNAME" = cabinet ]; then
     exec $STARTUP i3
     fi
 else
-    xbindkeys
-    xmodmap ~/.Xmodmap
+#    xbindkeys
+#    xmodmap ~/.Xmodmap
+    /usr/lib/policykit-1-gnome/polkit-gnome-authentication-agent-1 &
     nm-applet &
     exec i3
 fi