diff --git a/.bash_profile b/.bash_profile
index bf3f11a4..493371eb 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -10,3 +10,12 @@
#[ -z "$DISPLAY" -a "$(fgconsole)" -eq 1 ] && exec startx
+if [[ -f /usr/bin/waterfox ]]; then
+ export BROWSER="waterfox"
+elif [[ -f /usr/bin/palemoon ]]; then
+ export BROWSER="palemoon"
+elif [[ -f /usr/bin/iceweasel ]]; then
+ export BROWSER="iceweasel"
+else
+ export BROWSER="firefox"
+fi
diff --git a/.config/Scripts/vimrc b/.config/Scripts/vimrc
deleted file mode 100644
index aa013aa8..00000000
--- a/.config/Scripts/vimrc
+++ /dev/null
@@ -1,206 +0,0 @@
-execute pathogen#infect()
-set number
-set relativenumber
-set so=10
-
-vnoremap "*y
-nnoremap :tabnew
-
-"""BASIC TOOLS
-"Navigating with guides
-inoremap /<++>"_c4l
-vnoremap /<++>"_c4l
-map /<++>"_c4l
-inoremap ;gui <++>
-"For normal mode when in terminals (in X I have caps mapped to esc, this replaces it when I don't have X)
-inoremap jw
-inoremap wj
-inoremap
-"For split navigation
-map h
-map j
-map k
-map l
-
-set nocompatible
-filetype plugin on
-
-nnoremap S :%s//g
-
-"""LATEX
-autocmd FileType tex inoremap ;fr \begin{frame}\frametitle{}<++>\end{frame}<++>6kf}i
-autocmd FileType tex inoremap ;fi \begin{fitch}\end{fitch}<++>3kA
-autocmd FileType tex inoremap ;exe \begin{exe}\ex\end{exe}<++>3kA
-autocmd FileType tex inoremap ;em \emph{}<++>T{i
-autocmd FileType tex inoremap ;bf \textbf{}<++>T{i
-autocmd FileType tex inoremap ;it \textit{}<++>T{i
-autocmd FileType tex inoremap ;ct \textcite{}<++>T{i
-autocmd FileType tex inoremap ;cp \parencite{}<++>T{i
-"autocmd FileType tex inoremap ;em \emph{}<++>T{i
-"autocmd FileType tex inoremap ;bf \textbf{}<++>T{i
-"autocmd FileType tex inoremap ;it \textit{}<++>T{i
-"autocmd FileType tex inoremap ;ct \textcite{}<++>T{i
-"autocmd FileType tex inoremap ;cp \parencite{}<++>T{i
-autocmd FileType tex inoremap ;glos {\gll<++>\\<++>\\\trans{``<++>''}}2k2bcw
-autocmd FileType tex inoremap ;x \begin{xlist}\ex\end{xlist}kA
-autocmd FileType tex inoremap ;ol \begin{enumerate}\end{enumerate}<++>3kA\item
-autocmd FileType tex inoremap ;ul \begin{itemize}\end{itemize}<++>3kA\item
-autocmd FileType tex inoremap ;li \item
-autocmd FileType tex inoremap ;ref \ref{}<++>T{i
-autocmd FileType tex inoremap ;tab \begin{tabular}<++>\end{tabular}<++>4kA{}i
-autocmd FileType tex inoremap ;ot \begin{tableau}\inp{<++>}\const{<++>}<++><++>\end{tableau}<++>5kA{}i
-autocmd FileType tex inoremap ;can \cand{}<++>T{i
-autocmd FileType tex inoremap ;con \const{}<++>T{i
-autocmd FileType tex inoremap ;v \vio{}<++>T{i
-autocmd FileType tex inoremap ;a \href{}{<++>}<++>2T{i
-autocmd FileType tex inoremap ;sc \textsc{}<++>T{i
-autocmd FileType tex inoremap ;chap \chapter{}<++>2kf}i
-autocmd FileType tex inoremap ;sec \section{}<++>2kf}i
-autocmd FileType tex inoremap ;ssec \subsection{}<++>2kf}i
-autocmd FileType tex inoremap ;sssec \subsubsection{}<++>2kf}i
-autocmd FileType tex inoremap ;st F{i*f}i
-autocmd FileType tex inoremap ;beg \begin{%DELRN%}<++>\end{%DELRN%}<++>4kfR:MultipleCursorsFind%DELRN%c
-"autocmd FileType tex inoremap ;up \usepackage{}i
-autocmd FileType tex inoremap ;up /usepackageo\usepackage{}i
-autocmd FileType tex nnoremap ;up /usepackageo\usepackage{}i
-autocmd FileType tex inoremap ;tt \texttt{}<++>T{i
-autocmd FileType tex inoremap ;bt {\blindtext}
-autocmd FileType tex inoremap ;nu $\varnothing$
-autocmd FileType tex inoremap ;col \begin{columns}[T]\begin{column}{.5\textwidth}\end{column}\begin{column}{.5\textwidth}<++>\end{column}\end{columns}5kA
-autocmd FileType tex inoremap ;rn (\ref{})<++>F}i
-"""END
-
-autocmd FileType tex inoremap ;ent \gloss{}{<++>}{<++>}<++>k0f}i
-
-"""Logical Symbols
-autocmd FileType tex inoremap ;m $$<++>2T$i
-autocmd FileType tex inoremap ;M $$$$<++>2k$hi
-autocmd FileType tex inoremap ;neg {\neg}
-autocmd FileType tex inoremap ;V {\vee}
-autocmd FileType tex inoremap ;or {\vee}
-autocmd FileType tex inoremap ;L {\wedge}
-autocmd FileType tex inoremap ;and {\wedge}
-autocmd FileType tex inoremap ;ra {\rightarrow}
-autocmd FileType tex inoremap ;la {\leftarrow}
-autocmd FileType tex inoremap ;lra {\leftrightarrow}
-autocmd FileType tex inoremap ;fa {\forall}
-autocmd FileType tex inoremap ;ex {\exists}
-autocmd FileType tex inoremap ;dia {\Diamond}
-autocmd FileType tex inoremap ;box {\Box}
-autocmd FileType tex inoremap ;gt {\textgreater}
-autocmd FileType tex inoremap ;lt {\textless}
-"""END
-
-autocmd Filetype tex inoremap ;nom {\textsc{nom}}
-autocmd FileType tex inoremap ;acc {\textsc{acc}}
-autocmd FileType tex inoremap ;dat {\textsc{dat}}
-autocmd FileType tex inoremap ;gen {\textsc{gen}}
-autocmd FileType tex inoremap ;abl {\textsc{abl}}
-autocmd FileType tex inoremap ;voc {\textsc{voc}}
-autocmd FileType tex inoremap ;loc {\textsc{loc}}
-autocmd Filetype tex inoremap ;inst {\textsc{inst}}
-"autocmd FileType tex inoremap ;
-
-"""IPA
-autocmd FileType tex inoremap ;tipa \textipa{}<++>T{i
-autocmd FileType tex inoremap ;ae {\ae}
-autocmd FileType tex inoremap ;A {\textscripta}
-autocmd FileType tex inoremap ;dh {\dh}
-autocmd FileType tex inoremap ;yogh {\textyogh}
-autocmd FileType tex inoremap ;j {\textdyoghlig}
-autocmd FileType tex inoremap ;uh {\textschwa}
-autocmd FileType tex inoremap ;eps {\textepsilon}
-autocmd FileType tex inoremap ;gam {\textgamma}
-autocmd FileType tex inoremap ;I {\textsci}
-autocmd FileType tex inoremap ;sh {\textesh}
-autocmd FileType tex inoremap ;th {\texttheta}
-autocmd FileType tex inoremap ;Th {\textthorn}
-autocmd FileType tex inoremap ;TH {\textthorn}
-autocmd FileType tex inoremap ;ups {\textupsilon}
-autocmd FileType tex inoremap ;ph {\textphi}
-autocmd FileType tex inoremap ;om {\textomega}
-autocmd FileType tex inoremap ;sig {\textsigma}
-autocmd FileType tex inoremap ;oe {\oe}
-autocmd FileType tex inoremap ;ng {\ng}
-autocmd FileType tex inoremap ;au {\textopeno}
-autocmd FileType tex inoremap ;O {\textopeno}
-autocmd FileType tex inoremap ;glot {\textglotstop}
-autocmd FileType tex inoremap ;ch {\textteshlig}
-
-"For Indo-European
-autocmd FileType tex inoremap ;dh d\textsuperscript{h}
-autocmd FileType tex inoremap ;bh b\textsuperscript{h}
-autocmd FileType tex inoremap ;gh g\textsuperscript{h}
-autocmd FileType tex inoremap ;gwh g\textsuperscript{hw}
-autocmd FileType tex inoremap ;kw k\textsuperscript{w}
-autocmd FileType tex inoremap ;gw g\textsuperscript{w}
-autocmd FileType tex inoremap ;h1 {h\textsubscript{1}}
-autocmd FileType tex inoremap ;h2 {h\textsubscript{2}}
-autocmd FileType tex inoremap ;h3 {h\textsubscript{3}}
-autocmd FileType tex inoremap ;h4 {h\textsubscript{4}}
-"""END
-
-"""HTML
-autocmd FileType html inoremap ;b <++>FbT>i
-autocmd FileType html inoremap ;i <++>FeT>i
-autocmd FileType html inoremap ;1 <++>2kf<++>2kf<++>2kf
<++>02kf>a
-autocmd FileType html inoremap ;a href=""><++><++>F"i
-autocmd FileType html inoremap ;ul <++>03kfoF>a
-autocmd FileType html inoremap ;ol
<++>03kfauthor="<++>",year="<++>",title="<++>",journal="<++>",volume="<++>",pages="<++>",}<++>8kA,i
-autocmd FileType bib inoremap ;b @book{author="<++>",year="<++>",title="<++>",publisher="<++>",}<++>6kA,i
-autocmd FileType bib inoremap ;c @incollection{author="<++>",title="<++>",booktitle="<++>",editor="<++>",year="<++>",publisher="<++>",}<++>8kA,i
-"""END
-
-let g:instant_markdown_autostart = 0
-
-autocmd Filetype markdown inoremap ;n ---
-autocmd Filetype markdown inoremap ;b ****<++>F*hi
-autocmd Filetype markdown inoremap ;s ~~~~<++>F~hi
-autocmd Filetype markdown inoremap ;e **<++>F*i
-autocmd Filetype markdown inoremap ;h ====<++>F=hi
-autocmd Filetype markdown inoremap ;i <++>F[a
-autocmd Filetype markdown inoremap ;a [](<++>)<++>F[a
-autocmd Filetype markdown inoremap ;1 #<++>kA
-autocmd Filetype markdown inoremap ;2 ##<++>kA
-autocmd Filetype markdown inoremap ;3 ###<++>kA
-autocmd Filetype markdown inoremap ;l --------
-autocmd Filetype markdown map :!pandoc%-o%.pdf
-
-
-syntax on
-
-au BufWinLeave * mkview
-au BufWinEnter * silent loadview
-
-colorscheme slate
-
-let g:vimwiki_ext2syntax = {'.md': 'markdown', '.markdown': 'markdown', '.mdown': 'markdown'}
-map :!w:!pdflatex %
-"Spell-check set to F6
-map :setlocal spell! spelllang=en_us
-map :Goyo
-inoremap :Goyoa
-
-set wildmode=longest,list,full
-set wildmenu
-
-vmap ++ VMATH_YankAndAnalyse()
-nmap ++ vip++
-
-vnoremap K xkP`[V`]
-vnoremap J xp`[V`]
-vnoremap L >gv
-vnoremap H % -o &pdf && evince %pdf
diff --git a/.vimrc b/.vimrc
index 44e2d12e..73048840 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1 +1,246 @@
-so ~/.config/Scripts/vimrc
+execute pathogen#infect()
+execute pathogen#helptags()
+set number
+set relativenumber
+"set so=10
+"set hlsearch
+"let didit = 0
+"autocmd! InsertEnter * if ! didit | call feedkeys("\\:nohlsearch|let didit = 1\", 'n') | endif
+"autocmd! InsertLeave * let didit = 0
+
+vnoremap "*y
+nnoremap :tabnew
+
+"""BASIC TOOLS
+"Navigating with guides
+inoremap /<++>"_c4l
+vnoremap /<++>"_c4l
+map /<++>"_c4l
+inoremap ;gui <++>
+"For normal mode when in terminals (in X I have caps mapped to esc, this replaces it when I don't have X)
+inoremap jw
+inoremap wj
+inoremap
+"For split navigation
+map h
+let g:Ctrl_j = 'off'
+map j
+map k
+map l
+
+set nocompatible
+filetype plugin on
+
+nnoremap S :%s//g
+vnoremap S noop
+vnoremap S :s//g
+
+"Make calcurse notes markdown compatible:
+autocmd BufRead,BufNewFile /tmp/calcurse* set filetype=markdown
+autocmd BufRead,BufNewFile ~/.calcurse/notes/* set filetype=markdown
+
+"""LATEX
+autocmd FileType tex inoremap :!xelatex%i
+autocmd FileType tex nnoremap :!xelatex%
+autocmd FileType tex inoremap ;fr \begin{frame}\frametitle{}<++>\end{frame}<++>6kf}i
+autocmd FileType tex inoremap ;fi \begin{fitch}\end{fitch}<++>3kA
+autocmd FileType tex inoremap ;exe \begin{exe}\ex\end{exe}<++>3kA
+autocmd FileType tex inoremap ;em \emph{}<++>T{i
+autocmd FileType tex inoremap ;bf \textbf{}<++>T{i
+autocmd FileType tex vnoremap ; ``>2la}?\\{a
+autocmd FileType tex vnoremap : ``>2la}?{\\la
+autocmd FileType tex inoremap {{ F{i
+autocmd FileType tex inoremap }} f}a
+autocmd FileType tex inoremap ;it \textit{}<++>T{i
+autocmd FileType tex inoremap ;ct \textcite{}<++>T{i
+autocmd FileType tex inoremap ;cp \parencite{}<++>T{i
+autocmd FileType tex inoremap ;glos {\gll<++>\\<++>\\\trans{``<++>''}}2k2bcw
+autocmd FileType tex inoremap ;x \begin{xlist}\ex\end{xlist}kA
+autocmd FileType tex inoremap ;ol \begin{enumerate}\end{enumerate}<++>3kA\item
+autocmd FileType tex inoremap ;ul \begin{itemize}\end{itemize}<++>3kA\item
+autocmd FileType tex inoremap ;li \item
+autocmd FileType tex inoremap ;ref \ref{}<++>T{i
+autocmd FileType tex inoremap ;tab \begin{tabular}<++>\end{tabular}<++>4kA{}