diff --git a/templates/tex/latex_sphinx_base.tplx b/templates/tex/latex_sphinx_base.tplx
index 83d6330..26d120c 100644
--- a/templates/tex/latex_sphinx_base.tplx
+++ b/templates/tex/latex_sphinx_base.tplx
@@ -53,7 +53,7 @@
         \maketitle
         \tableofcontents 
 
-((* endblock bodyBegin *))((* block bodyEnd *))
+        ((* endblock bodyBegin *))((* block bodyEnd *))
 
         \renewcommand{\indexname}{Index}
         \printindex
@@ -67,45 +67,38 @@
 ((* endblock footer *))
 
 ((* block headingcell -*))
-    
+    \
     ((*- if cell.level == 1 -*))
-        \part
+        ((* block h1 -*))part((* endblock h1 -*))
     ((*- elif cell.level == 2 -*))
-        \chapter
+        ((* block h2 -*))chapter((* endblock h2 -*))
     ((*- elif cell.level == 3 -*))
-        \section
+        ((* block h3 -*))section((* endblock h3 -*))
     ((*- elif cell.level == 4 -*))
-        \subsection
+        ((* block h4 -*))subsection((* endblock h4 -*))
     ((*- elif cell.level == 5 -*))
-        \subsubsection
+        ((* block h5 -*))subsubsection((* endblock h5 -*))
     ((*- elif cell.level == 6 -*))
-        \paragraph
+        ((* block h6 -*))paragraph((* endblock h6 -*))
     ((*- endif -*)){((( cell.source | markdown2latex )))}
 ((*- endblock headingcell *))
 
-((*- block rawcell -*))
-    ((("\n")))
-
-    \setbox0\vbox{
-    \begin{minipage}{0.95\linewidth}
-        ((( filterOutLatex(cell.source) )))
-    \end{minipage}}
-    \begin{center}\setlength{\fboxsep}{5pt}
-    \shadowbox{\box0}\end{center}
-
-((*- endblock rawcell -*))
-
-((*- block unknowncell scoped-*))
-    ((("\n")))
+((* block unknowncell scoped*))
     
     % Unsupported cell type, no formatting
     ((( filterOutLatex(cell.source) )))
-((*- endblock unknowncell -*))
+((* endblock unknowncell *))
 
 ((*- block markdowncell scoped-*))
     ((( super() )))
 ((*- endblock markdowncell -*))
 
+((= Raw text cells allow the user to manually inject document code that will
+not get touched by the templating system. =))
+((*- block rawcell *))
+    ((( cell.source )))
+((* endblock rawcell -*))
+
 ((* macro filterOutLatex(text) -*))
     ((*- set text = text|replace("\\","\\backslash") -*))
     ((*- set text = text|replace("{","\\{") -*))
@@ -114,6 +107,16 @@
     ((( text )))
 ((*- endmacro *))
 
+% Useful to block TODO: Remove/move this block below
+
+    \setbox0\vbox{
+    \begin{minipage}{0.95\linewidth}
+
+    \end{minipage}}
+    \begin{center}\setlength{\fboxsep}{5pt}
+    \shadowbox{\box0}\end{center}
+
+
 ((========================================================================
     EVERYTHING BELOW HERE STILL NEEDS TO BE FILLED IN!
   ========================================================================))
diff --git a/templates/tex/latex_sphinx_howto.tplx b/templates/tex/latex_sphinx_howto.tplx
index 174cd71..d6e17f3 100644
--- a/templates/tex/latex_sphinx_howto.tplx
+++ b/templates/tex/latex_sphinx_howto.tplx
@@ -13,4 +13,9 @@
 ((* set parentdocumentclass = 'article' *))
 ((* set documentclass = 'howto' *))
 
-
+((* block h1 -*))part((* endblock h1 -*))
+((* block h2 -*))section((* endblock h2 -*))
+((* block h3 -*))subsection((* endblock h3 -*))
+((* block h4 -*))subsubsection((* endblock h4 -*))
+((* block h5 -*))paragraph((* endblock h5 -*))
+((* block h6 -*))subparagraph((* endblock h6 -*))
diff --git a/templates/tex/latex_sphinx_manual.tplx b/templates/tex/latex_sphinx_manual.tplx
index d9e0c5e..bbdda55 100644
--- a/templates/tex/latex_sphinx_manual.tplx
+++ b/templates/tex/latex_sphinx_manual.tplx
@@ -12,3 +12,10 @@
 
 ((* set parentdocumentclass = 'report' *))
 ((* set documentclass = 'manual' *))
+
+((* block h1 -*))part((* endblock h1 -*))
+((* block h2 -*))chapter((* endblock h2 -*))
+((* block h3 -*))section((* endblock h3 -*))
+((* block h4 -*))subsection((* endblock h4 -*))
+((* block h5 -*))subsubsection((* endblock h5 -*))
+((* block h6 -*))paragraph((* endblock h6 -*))