diff --git a/.config/ranger/rc.conf b/.config/ranger/rc.conf
index f625bbe0..ada3bb59 100644
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -42,36 +42,28 @@ map <F10> exit
 ## Move to trash (with Trash-CLI)
 map DD shell trash-put -- %s
 
-## Extraction. Ranger uses '1l', but does not work when extension is not right.
+## Extraction. Ranger uses '1l', but does not work when extension is not
+## right. Using atools instead.
 map ex shell aunpack -e %s
 
-## SVN add.
-map esa shell -w svn add %s
+## Git
+map ega shell -w git add %s
+map egr shell -w git checkout %s
+map egs shell -w git status -uno
 
-## SVN revert.
-map esr shell -w svn revert %s
-
-## SVN stats.
-map ess shell -w svn status
-
-## MPlayer
+## Video
 ## Note that latin1 for MPlayer is cp1252 in reality.
 map ev console shell mplayer "%f" -sub "%s"
 map eV console shell mplayer "%f" -sub "%s" -subcp latin1
 
-## Cmus
+## Submarine
+map es shell -w submarine %f
+
+## Audio
 map ea shell cmus-remote -P %s
 
 # Quick moves
 map K       move up=5
 map J       move down=5
-
-
-
-## Browse
-#map <C-j> move down=5
-#map <C-k> move up=5
-
-## Tabs
 #map <C-h> tab_move 1
 #map <C-l> tab_move -1
diff --git a/.emacs.d/snippets/latex-mode/letter.yasnippet b/.emacs.d/snippets/latex-mode/letter.yasnippet
index 9c6f6758..d82ee0fa 100644
--- a/.emacs.d/snippets/latex-mode/letter.yasnippet
+++ b/.emacs.d/snippets/latex-mode/letter.yasnippet
@@ -10,7 +10,7 @@
 \usepackage[utf8]{inputenc}
 \usepackage[T1]{fontenc}
 \usepackage{amsmath,amssymb,amsfonts}
-\usepackage{geometry}
+\usepackage[scale=0.8]{geometry}
 \usepackage{lmodern}
 \usepackage{marvosym}
 \usepackage{textcomp}
@@ -25,9 +25,22 @@
 %%==============================================================================
 %% Localization
 %%==============================================================================
-%% Supported locales: en, fr.
 \def\locale{en}
 
+%% Language macros.
+\usepackage{ifthen}
+\def\localedef#1#2{
+\ifthenelse{\equal{\locale}{#1}}{
+  \usepackage[#2]{babel}
+  \expandafter\def\csname#1\endcsname ##1{##1}
+}{
+  \expandafter\def\csname#1\endcsname ##1{}}
+}
+
+%% Supported locales: en, fr.
+\localedef{en}{english}
+\localedef{fr}{frenchb}
+
 %%==============================================================================
 %% Personal Information
 %%==============================================================================
@@ -74,33 +87,32 @@
 % \def\FileKeyWords{\firstname{} \familyname, letter}
 
 %%==============================================================================
-%% General options
+%% Packages
 %%==============================================================================
 
 % \usepackage{lipsum}
 \usepackage[svgname]{xcolor}
 \usepackage{eukdate}
-\usepackage{graphicx}
-\usepackage{ifthen}
 \usepackage{needspace}
 \usepackage{xspace}
 
+%% Compilation options
+\usepackage{ifpdf}
+\ifpdf
+\usepackage[pdftex]{graphicx}
+\else
+\usepackage[dvips]{graphicx}
+\fi
+
+%%==============================================================================
+%% General options
+%%==============================================================================
+
 %% print if not empty
 \def\pine#1{\def\test{#1}\ifx\test\empty\relax\else #1\fi}
 %% print #2 if not empty.
 \def\pinex#1#2{\ifx#1\empty\relax\else #2\fi}
 
-%% Language
-\def\localedef#1{
-\ifthenelse{\equal{\locale}{#1}}{
-  \expandafter\def\csname#1\endcsname ##1{##1}
-}{
-  \expandafter\def\csname#1\endcsname ##1{}}
-}
-
-\localedef{en}
-\localedef{fr}
-
 %% Gender commands.
 \def\genderdef#1{
 \ifthenelse{\equal{\gender}{#1}}{
@@ -124,19 +136,6 @@
   \equal{\gender}{org}
 }{}{\def\greetings #1{#1}}
 
-
-%% Compilation options
-\usepackage{ifpdf}
-\ifpdf
-\usepackage[pdftex]{graphicx}
-\else
-\usepackage[dvips]{graphicx}
-\fi
-
-%% Babel
-\fr{\usepackage[frenchb]{babel}}
-
-
 %% Day-of-week translation
 \makeatletter
 \fr{