diff --git a/src/beamerouterthememoloch.dtx b/src/beamerouterthememoloch.dtx
index c817f487..e64d8325 100644
--- a/src/beamerouterthememoloch.dtx
+++ b/src/beamerouterthememoloch.dtx
@@ -111,6 +111,14 @@
 %    \end{macrocode}
 % \end{macro}
 %
+% \subsubsection{Slide Numbering}
+%
+% Moloch defaults to numbering frames. To modify this, simply copy this line to your
+% preamble and replace |framenumber|.
+%
+%    \begin{macrocode}
+\setbeamertemplate{page number in head/foot}[framenumber]
+%    \end{macrocode}
 %
 % \subsubsection{Head and footline}
 %
diff --git a/testfiles/test.tlg b/testfiles/test.tlg
index e4cdee0c..76dede2e 100644
--- a/testfiles/test.tlg
+++ b/testfiles/test.tlg
@@ -56,31 +56,31 @@ Completed box being shipped out [1]
 .......\glue(\baselineskip) 0.0
 .......\hbox(0.0+0.0)x-56.90549
 ........\hbox(0.0+0.0)x0.0
-.........\hbox(269.14662+0.0)x-28.45274, shifted 269.14662
-..........\hbox(269.14662+0.0)x-28.45274
+.........\hbox(265.20912+0.0)x-28.45274, shifted 265.20912
+..........\hbox(265.20912+0.0)x-28.45274
 ...........\glue -28.45274
 ...........\hbox(0.0+0.0)x0.0
-............\vbox(269.14662+0.0)x0.0, glue set 269.14662fil
+............\vbox(265.20912+0.0)x0.0, glue set 265.20912fil
 .............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 .............\glue 0.0 plus 1.0fil minus 1.0fil
 ............\pdfcolorstack 0 pop
-...........\vbox(269.14662+0.0)x0.0, glue set 269.14662fil
+...........\vbox(265.20912+0.0)x0.0, glue set 265.20912fil
 ............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ............\pdfcolorstack 0 pop
 ............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fil
 ........\hbox(0.0+0.0)x0.0
-.........\hbox(269.14662+0.0)x335.74261, shifted 269.14662
-..........\hbox(269.14662+0.0)x335.74261
+.........\hbox(265.20912+0.0)x335.74261, shifted 265.20912
+..........\hbox(265.20912+0.0)x335.74261
 ...........\glue 307.28987
 ...........\glue 28.45274
 ...........\hbox(0.0+0.0)x0.0
-............\vbox(269.14662+0.0)x0.0, glue set 269.14662fil
+............\vbox(265.20912+0.0)x0.0, glue set 265.20912fil
 .............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 .............\glue 0.0 plus 1.0fil minus 1.0fil
 ............\pdfcolorstack 0 pop
-...........\vbox(269.14662+0.0)x0.0, glue set 259.39665fill
+...........\vbox(265.20912+0.0)x0.0, glue set 255.45915fill
 ............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ............\glue 0.0 plus 1.0fill
@@ -123,7 +123,7 @@ Completed box being shipped out [1]
 .....\pdfcolorstack 0 pop
 ...\glue 0.0
 ...\glue(\lineskip) 0.0
-...\vbox(265.14662+0.0)x307.28987
+...\vbox(261.20912+0.0)x307.28987
 ....\pdfcolorstack 0 push {0 g 0 G}
 ....\write-{}
 ....\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
@@ -131,7 +131,7 @@ Completed box being shipped out [1]
 ....\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ....\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ....\glue(\topskip) 0.0
-....\vbox(265.14662+0.0)x307.28987, glue set 81.75977fill
+....\vbox(261.20912+0.0)x307.28987, glue set 80.44727fill
 .....\penalty 10000
 .....\vbox(0.0+0.0)x0.0
 .....\penalty 10000
@@ -234,21 +234,21 @@ Completed box being shipped out [1]
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ...\glue(\baselineskip) 4.0
-...\hbox(4.0+0.0)x307.28987
+...\hbox(7.9375+0.0)x307.28987
 ....\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
-....\hbox(4.0+0.0)x307.28987
-.....\vbox(4.0+0.0)x307.28987
-......\hbox(4.0+0.0)x307.28987
-.......\hbox(4.0+0.0)x307.28987
+....\hbox(7.9375+0.0)x307.28987
+.....\vbox(7.9375+0.0)x307.28987
+......\hbox(7.9375+0.0)x307.28987
+.......\hbox(7.9375+0.0)x307.28987
 ........\glue -28.45274
-........\hbox(4.0+0.0)x364.19536
-.........\vbox(4.0+0.0)x364.19536
+........\hbox(7.9375+0.0)x364.19536
+.........\vbox(7.9375+0.0)x364.19536
 ..........\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ..........\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
-..........\hbox(4.0+0.0)x364.19536
+..........\hbox(7.9375+0.0)x364.19536
 ...........\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
-...........\vbox(4.0+0.0)x364.19536
-............\hbox(0.0+0.0)x364.19536, glue set 355.19536fill
+...........\vbox(7.9375+0.0)x364.19536
+............\hbox(3.9375+0.0)x364.19536, glue set 345.63286fill
 .............\glue(\leftskip) 4.0
 .............\hbox(0.0+0.0)x0.0
 .............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
@@ -256,6 +256,9 @@ Completed box being shipped out [1]
 .............\pdfcolorstack 0 pop
 .............\glue 0.0 plus 1.0fill
 .............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
+.............\hbox(3.9375+0.0)x9.5625, glue set 6.375fil
+..............\glue 0.0 plus 1.0fil minus 1.0fil
+..............\OT1/lmss/m/n/6 1
 .............\pdfcolorstack 0 pop
 .............\penalty 10000
 .............\glue(\parfillskip) 0.0 plus 1.0fil
@@ -353,14 +356,14 @@ Completed box being shipped out [2]
 .....\pdfcolorstack 0 pop
 ...\glue 0.0
 ...\glue(\lineskip) 0.0
-...\vbox(265.14662+0.0)x307.28987
+...\vbox(261.20912+0.0)x307.28987
 ....\write-{}
 ....\write1{\@writefile{toc}{\protect \beamer@sectionintoc {1}{Results}{2}{0}{1}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@sectionpages {1}{1}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionpages {1}{1}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \sectionentry {1}{Results}{2}{Results}{0}}}}
 ....\glue(\topskip) 0.0
-....\vbox(265.14662+0.0)x307.28987, glue set 106.35342fill
+....\vbox(261.20912+0.0)x307.28987, glue set 106.35342fill
 .....\penalty 10000
 .....\vbox(0.0+0.0)x0.0
 .....\penalty 10000
@@ -467,13 +470,13 @@ Completed box being shipped out [2]
 .....\glue 0.0 plus 1.0fill
 .....\rule(0.0+0.0)x*
 .....\penalty 10000
-.....\glue -8.0
+.....\glue -11.9375
 .....\glue 0.0
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \slideentry {1}{0}{1}{2/2}{}{0}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@framepages {2}{2}}}}
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
-...\glue(\baselineskip) 8.0
+...\glue(\baselineskip) 11.9375
 ...\hbox(0.0+0.0)x307.28987
 ....\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ....\hbox(0.0+0.0)x307.28987, glue set 333.74261fil
@@ -545,31 +548,31 @@ Completed box being shipped out [3]
 .......\glue(\baselineskip) 0.0
 .......\hbox(0.0+0.0)x-56.90549
 ........\hbox(0.0+0.0)x0.0
-.........\hbox(269.14662+0.0)x-28.45274, shifted 269.14662
-..........\hbox(269.14662+0.0)x-28.45274
+.........\hbox(265.20912+0.0)x-28.45274, shifted 265.20912
+..........\hbox(265.20912+0.0)x-28.45274
 ...........\glue -28.45274
 ...........\hbox(0.0+0.0)x0.0
-............\vbox(269.14662+0.0)x0.0, glue set 269.14662fil
+............\vbox(265.20912+0.0)x0.0, glue set 265.20912fil
 .............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 .............\glue 0.0 plus 1.0fil minus 1.0fil
 ............\pdfcolorstack 0 pop
-...........\vbox(269.14662+0.0)x0.0, glue set 269.14662fil
+...........\vbox(265.20912+0.0)x0.0, glue set 265.20912fil
 ............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ............\pdfcolorstack 0 pop
 ............\pdfcolorstack 0 pop
 ............\glue 0.0 plus 1.0fil
 ........\hbox(0.0+0.0)x0.0
-.........\hbox(269.14662+0.0)x335.74261, shifted 269.14662
-..........\hbox(269.14662+0.0)x335.74261
+.........\hbox(265.20912+0.0)x335.74261, shifted 265.20912
+..........\hbox(265.20912+0.0)x335.74261
 ...........\glue 307.28987
 ...........\glue 28.45274
 ...........\hbox(0.0+0.0)x0.0
-............\vbox(269.14662+0.0)x0.0, glue set 269.14662fil
+............\vbox(265.20912+0.0)x0.0, glue set 265.20912fil
 .............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 .............\glue 0.0 plus 1.0fil minus 1.0fil
 ............\pdfcolorstack 0 pop
-...........\vbox(269.14662+0.0)x0.0, glue set 259.39665fill
+...........\vbox(265.20912+0.0)x0.0, glue set 255.45915fill
 ............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ............\glue 0.0 plus 1.0fill
@@ -612,13 +615,13 @@ Completed box being shipped out [3]
 .....\pdfcolorstack 0 pop
 ...\glue 0.0
 ...\glue(\lineskip) 0.0
-...\vbox(265.14662+0.0)x307.28987
+...\vbox(261.20912+0.0)x307.28987
 ....\write-{}
 ....\write1{\@writefile{toc}{\protect \beamer@subsectionintoc {1}{1}{Proof of the Main Theorem}{3}{0}{1}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionpages {2}{2}}}}
 ....\write1{\@writefile{nav}{\protect \headcommand {\protect \beamer@subsectionentry {0}{1}{1}{3}{Proof of the Main Theorem}}}}
 ....\glue(\topskip) 0.0
-....\vbox(265.14662+0.0)x307.28987, glue set 42.13957fill
+....\vbox(261.20912+0.0)x307.28987, glue set 40.17082fill
 .....\penalty 10000
 .....\vbox(0.0+0.0)x0.0
 .....\penalty 10000
@@ -1249,21 +1252,21 @@ Completed box being shipped out [3]
 ....\glue 0.0 plus 1.0fil
 ....\glue 0.0
 ...\glue(\baselineskip) 4.0
-...\hbox(4.0+0.0)x307.28987
+...\hbox(7.9375+0.0)x307.28987
 ....\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
-....\hbox(4.0+0.0)x307.28987
-.....\vbox(4.0+0.0)x307.28987
-......\hbox(4.0+0.0)x307.28987
-.......\hbox(4.0+0.0)x307.28987
+....\hbox(7.9375+0.0)x307.28987
+.....\vbox(7.9375+0.0)x307.28987
+......\hbox(7.9375+0.0)x307.28987
+.......\hbox(7.9375+0.0)x307.28987
 ........\glue -28.45274
-........\hbox(4.0+0.0)x364.19536
-.........\vbox(4.0+0.0)x364.19536
+........\hbox(7.9375+0.0)x364.19536
+.........\vbox(7.9375+0.0)x364.19536
 ..........\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
 ..........\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
-..........\hbox(4.0+0.0)x364.19536
+..........\hbox(7.9375+0.0)x364.19536
 ...........\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
-...........\vbox(4.0+0.0)x364.19536
-............\hbox(0.0+0.0)x364.19536, glue set 355.19536fill
+...........\vbox(7.9375+0.0)x364.19536
+............\hbox(3.9375+0.0)x364.19536, glue set 345.63286fill
 .............\glue(\leftskip) 4.0
 .............\hbox(0.0+0.0)x0.0
 .............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
@@ -1271,6 +1274,9 @@ Completed box being shipped out [3]
 .............\pdfcolorstack 0 pop
 .............\glue 0.0 plus 1.0fill
 .............\pdfcolorstack 0 push {0.13725 0.2157 0.23137 rg 0.13725 0.2157 0.23137 RG}
+.............\hbox(3.9375+0.0)x9.5625, glue set 6.375fil
+..............\glue 0.0 plus 1.0fil minus 1.0fil
+..............\OT1/lmss/m/n/6 2
 .............\pdfcolorstack 0 pop
 .............\penalty 10000
 .............\glue(\parfillskip) 0.0 plus 1.0fil