diff --git a/.spacemacs b/.spacemacs
index 320791d..0160b24 100644
--- a/.spacemacs
+++ b/.spacemacs
@@ -26,9 +26,12 @@ values."
      auto-completion
      better-defaults
      emacs-lisp
+     (ruby :variables ruby-version-manager 'rbenv)
      git
+     github
      markdown
      org
+     spacemacs-ivy
      (shell :variables
             shell-default-height 30
             shell-default-position 'bottom)
@@ -106,7 +109,7 @@ values."
    dotspacemacs-colorize-cursor-according-to-state t
    ;; Default font. `powerline-scale' allows to quickly tweak the mode-line
    ;; size to make separators look not too crappy.
-   dotspacemacs-default-font '("Liberation Mono for Powerline"
+   dotspacemacs-default-font '("Droid Sans Mono Dotted for Powerline"
                                :size 26
                                ;;:size ,(if (eq window-system 'x)
                                ;;           26
@@ -254,10 +257,10 @@ in `dotspacemacs/user-config'."
   ;;                             :powerline-scale 1.4)
   ;; )
   ;; Set to the location of your Org files on your local system
-  ;;  (setq org-directory "~/org")
-  ;;  (setq org-mobile-inbox-for-pull "~/org/inbox.org")
-  ;;  (setq org-mobile-directory "~/Dropbox/Apps/MobileOrg")
-  ;;  (setq org-mobile-files '("~/org"))
+  (setq org-directory "~/Dropbox/org")
+  (setq org-mobile-inbox-for-pull "~/Dropbox/org/inbox.org")
+  (setq org-mobile-directory "~/Dropbox/Apps/MobileOrg")
+  (setq org-mobile-files '("~/Dropbox/org"))
 
   ;;  ;; Stuff for eshell
   ;;  (require 'em-smart)
@@ -268,9 +271,9 @@ in `dotspacemacs/user-config'."
   ;; Configure colors for the powerline
                                         ;(setq ns-use-srgb-colorspace t)
   ;; undo-tree history across restarts
-  ;; (setq undo-tree-history-directory-alist
-  ;;       `((".*" . ,(concat spacemacs-cache-directory "undo-tree-history"))))
-  ;; (setq undo-tree-auto-save-history t)
+  (setq undo-tree-history-directory-alist
+        `((".*" . ,(concat spacemacs-cache-directory "undo-tree-history"))))
+  (setq undo-tree-auto-save-history t)
 
   ;; Don't use the clipboard please
   ;; (setq select-enable-clipboard nil)
diff --git a/.zshenv b/.zshenv
index 0878af6..1367e9f 100644
--- a/.zshenv
+++ b/.zshenv
@@ -185,6 +185,7 @@ alias vir=vr
 alias vis=vs
 alias gvim="gvim -font 'APL385 Unicode 8' -c 'set keymap=uniapl385'"
 alias n=nvim
+export NVIM_TUI_ENABLE_TRUE_COLOR=1
 
 ## For forwarding ssh auth I think
 if [ ! -z "$SSH_AUTH_SOCK" -a "$SSH_AUTH_SOCK" != "$HOME/.ssh-agent" ] ; then
@@ -317,6 +318,33 @@ fi
 alias resize="printf '\33]50;%s%d\007' 'xft:DroidSansMonoDotted:pixelsize=' $1" # ':antialias=true'"
 #alias asdf="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY"
 alias asdf="setxkbmap us dvorak ctrl:nocaps"
+kinesis_activate() {
+  xmodmap -e "keycode 124 = NoSymbol Insert"
+  xmodmap -e "keycode 62 = Scroll_Lock Scroll_Lock"
+  xmodmap -e "keycode 37 = Control_R Control_R"
+  xset r rate 220 32
+}
+leopold_activate() {
+  kinesis_activate
+  ma
+  remote_ids=($(xinput list | sed -n 's/.*Cypress.*id=\([0-9]*\).*keyboard.*/\1/p'))
+  if [ "$remote_ids" ] ; then
+#    mkdir -p /tmp/xkb/symbols
+#    cat > /tmp/xkb/symbols/custom <<EOF
+#xkb_symbols "leopold" {
+#  key <LALT> { [ Super_L       ] };
+#  key <LWIN> { [ Alt_L, Meta_L ] };
+#  key <RALT> { [ Super_R       ] };
+#  key <RWIN> { [ Alt_R, Meta_R ] };
+#};
+#EOF
+    for remote_id in $remote_ids ; do
+      echo Setting $remote_id
+      setxkbmap -device $remote_id us dvorak ctrl:nocaps altwin:swap_lalt_lwin
+#      setxkbmap -device $remote_id -print | sed 's/\(xkb_symbols.*\)"/\1+custom(leopold)"/' | xkbcomp -I/tmp/xkb -i $remote_id -synch - $DISPLAY 2>/dev/null
+    done
+  fi
+}
 alias auie="xkbcomp -w0 ~/keymaps/xkb/hunner.xkb $DISPLAY"
 alias aoeu='setxkbmap us'
 alias bepo='setxkbmap fr bepo "ctrl:swapcaps"'
@@ -332,10 +360,13 @@ if [ -f $HOME/.termcap ] ; then
 fi
 make_termcap() {
     cat > $HOME/.termcap << EOF
-rxvt-256color|rxvt-256color terminal (X Window System):\
-    :Co#256:\
-    :tc=rxvt-unicode:\
+st+24bit|st+24bit terminal (X Window System):\
+    :Co#16777216:\
+    :tc=xterm-unicode:\
     :tc=rxvt:
+    :setrgbf=\E[38;2;#1%d;#2%d;#3%dm:\
+    :setrgbb=\E[48;2;#1%d;#2%d;#3%dm:\
+    :use=st+24bit:
 EOF
 }
 type7() {
diff --git a/local/bin/battery.sh b/local/bin/battery.sh
index abe1f06..a2950db 100755
--- a/local/bin/battery.sh
+++ b/local/bin/battery.sh
@@ -17,9 +17,8 @@ FN='"xft:Liberation Mono:size=7"' # font
 STATEFILE='/sys/class/power_supply/BAT0/status' # battery's state file
 CAPFILE='/sys/class/power_supply/BAT0/capacity'   # battery's capacity file
 
-MIDBAT=65        # percentage of battery life marked as low
-MIDCOL='#dddd47' # color when battery is low
-LOWBAT=30        # percentage of battery life marked as low
+CHRGCOL='#99ff00' # color when battery is charging
+LOWBAT=15        # percentage of battery life marked as low
 LOWCOL='#dd4747' # color when battery is low
 TIME_INT=15      # time interval in seconds
 
@@ -32,11 +31,12 @@ DATE_FORMAT="%H:%M"
 while true; do
     # find remaining power
     RPERC=`cat $CAPFILE`;
+    STATE=`cat $STATEFILE`;
 
     # draw the bar and pipe everything into dzen
-    if [ $RPERC -gt $MIDBAT ]; then GFGC=$GFG; fi
-    if [ $RPERC -le $MIDBAT ]; then GFGC=$MIDCOL; fi
+    if [ $RPERC -gt $LOWBAT ]; then GFGC=$GFG; fi
     if [ $RPERC -le $LOWBAT ]; then GFGC=$LOWCOL; fi
+    if [ $STATE = "Charging" ]; then GFGC=$CHRGCOL; fi
 
     case $RPERC in
         $LOWBAT)