export VISUAL=vim;
 export PAGER=less
 #export MYVIMRC="$HOME/.config/vim/vimrc"
+export TMPDIR=~/.cache/tmp
 
 # Larger bash history (allow 32³ entries; default is 500)
 export HISTSIZE=32768;
 export HISTCONTROL=ignoreboth;
 # Make some commands not show up in history
 export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help";
-export HISTFILE="$HOME/.cache/bash/history";
+export HISTFILE="$HOME/.local/share/bash/history";
 
 # Whenever displaying the prompt, write the previous line to disk
 export PROMPT_COMMAND="history -a";
 # See http://www.gnu.org/software/src-highlite/source-highlight.html
 # export LESSOPEN="| /usr/bin/src-hilite-lesspipe.sh %s"
 export LESS=-eFRX
-
-# Tell lynx where the color settings are that were adjusted for the
-# Solarized color scheme
-export LYNX_LSS=$HOME/.config/lynx.lss
-
 
 " ---------------------
 
 set nocompatible
-set runtimepath+=~/.config/vim
-set directory=~/.cache/vim/swap
-set backupdir=~/.cache/vim/backup
-set undodir=~/.cache/vim/undo
+set runtimepath+=~/.cache/vim
+set directory=~/.local/share/vim/swap
+set backupdir=~/.local/share/vim/backup
+set undodir=~/.local/share/vim/undo
 set viminfo+=n~/.local/share/vim/viminfo
 
-if empty(glob('~/.config/vim/autoload/plug.vim'))
+if empty(glob('~/.cache/vim/autoload/plug.vim'))
   cd ~
-  silent !mkdir -p .cache/vim/swap > /dev/null 2>&1
-  silent !mkdir -p .cache/vim/backup > /dev/null 2>&1
-  silent !mkdir -p .cache/vim/undo > /dev/null 2>&1
-  silent !curl -fLo .config/vim/autoload/plug.vim --create-dirs
+  silent !mkdir -p .local/share/vim/{swap,backup,undo} > /dev/null 2>&1
+  silent !curl -fLo .cache/vim/autoload/plug.vim --create-dirs
     \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
   autocmd VimEnter * PlugInstall | source $MYVIMRC
   cd -
 " section: plugins {{{1
 " ---------------------
 
-call plug#begin('~/.config/vim/plugged')
+call plug#begin('~/.cache/vim/plugged')
 
 "Plug 'tpope/vim-sensible'
 "Plug 'tpope/vim-ragtag'