diff --git a/templates/account-channels.jade b/templates/account-channels.jade
index 4291e0e8..5604b0f1 100644
--- a/templates/account-channels.jade
+++ b/templates/account-channels.jade
@@ -2,16 +2,16 @@ doctype html
 html(lang="en")
   head
     include head
-    +head()
+    mixin head()
   body
     #wrap
       nav.navbar.navbar-inverse.navbar-fixed-top(role="navigation")
         include nav
-        +navheader()
+        mixin navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/account/channels")
-          +navloginlogout("/account/channels")
+            mixin navdefaultlinks("/account/channels")
+          mixin navloginlogout("/account/channels")
       section#mainpage
         .container
           if !loggedIn
@@ -57,4 +57,4 @@ html(lang="en")
                 button.btn.btn-primary.btn-block(type="submit") Register
 
     include footer
-    +footer()
+    mixin footer()
diff --git a/templates/account-edit.jade b/templates/account-edit.jade
index 18badbe3..549d17d1 100644
--- a/templates/account-edit.jade
+++ b/templates/account-edit.jade
@@ -2,16 +2,16 @@ doctype html
 html(lang="en")
   head
     include head
-    +head()
+    mixin head()
   body
     #wrap
       nav.navbar.navbar-inverse.navbar-fixed-top(role="navigation")
         include nav
-        +navheader()
+        mixin navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/account/edit")
-          +navloginlogout("/account/edit")
+            mixin navdefaultlinks("/account/edit")
+          mixin navloginlogout("/account/edit")
       section#mainpage
         .container
           if !loggedIn
@@ -58,7 +58,7 @@ html(lang="en")
                   input#email.form-control(type="email", name="email")
                 button#changeemailbtn.btn.btn-danger.btn-block(type="submit") Change Email
     include footer
-    +footer()
+    mixin footer()
     script(type="text/javascript").
       function validatePasswordChange() {
         var pw = $("#newpassword").val();
diff --git a/templates/channel-hd.jade b/templates/channel-hd.jade
index 98d7788d..83c0c745 100644
--- a/templates/channel-hd.jade
+++ b/templates/channel-hd.jade
@@ -2,18 +2,18 @@ doctype html
 html(lang="en")
   head
     include head
-    +head()
+    mixin head()
   body
     #wrap
       nav.navbar.navbar-inverse.navbar-fixed-top(role="navigation")
         include nav
-        +navheader()
+        mixin navheader()
         #nav-collapsible.collapse.navbar-collapse
           - var cname = "/r/" + channelName
           ul.nav.navbar-nav
-            +navdefaultlinks(cname)
+            mixin navdefaultlinks(cname)
             li: a(href="javascript:showUserOptions()") Options
-          +navloginlogout(cname)
+          mixin navloginlogout(cname)
       section#mainpage
         .container
           #motdwrap.col-lg-12.col-md-12
@@ -100,7 +100,7 @@ html(lang="en")
               gfsnjgfjsnjkg
             input#chatline.form-control.input-block-level(type="text")
     include footer
-    +footer()
+    mixin footer()
     script(src="#{ioUrl}/socket.io/socket.io.js")
     script(type="text/javascript").
       var IOSERVER = "#{ioUrl}";
diff --git a/templates/channel.jade b/templates/channel.jade
index 3a3509f8..db421c11 100644
--- a/templates/channel.jade
+++ b/templates/channel.jade
@@ -2,20 +2,20 @@ doctype html
 html(lang="en")
   head
     include head
-    +head()
+    mixin head()
     link(href="//code.jquery.com/ui/1.10.3/themes/smoothness/jquery-ui.css", rel="stylesheet")
   body
     #wrap
       nav.navbar.navbar-inverse.navbar-fixed-top(role="navigation")
         include nav
-        +navheader()
+        mixin navheader()
         #nav-collapsible.collapse.navbar-collapse
           - var cname = "/r/" + channelName
           ul.nav.navbar-nav
-            +navdefaultlinks(cname)
+            mixin navdefaultlinks(cname)
             li: a(href="#", onclick="javascript:showUserOptions()") Options
             li: a(href="#", onclick="javascript:$('#channeloptions').modal()") Channel Settings
-          +navloginlogout(cname)
+          mixin navloginlogout(cname)
       section#mainpage
         .container
           #motdrow.row
@@ -56,12 +56,12 @@ html(lang="en")
                   li(role="presentation")
                     a(id="#{id}", role="menuitem", href="javascript:void(0)") #{text}
                 ul.dropdown-menu(role="menu", aria-labelledby="qdrop")
-                  +quality_item("quality_auto", "Quality: Auto")
-                  +quality_item("quality_240p", "240p")
-                  +quality_item("quality_360p", "360p")
-                  +quality_item("quality_480p", "480p")
-                  +quality_item("quality_720p", "720p")
-                  +quality_item("quality_1080p", "1080p")
+                  mixin quality_item("quality_auto", "Quality: Auto")
+                  mixin quality_item("quality_240p", "240p")
+                  mixin quality_item("quality_360p", "360p")
+                  mixin quality_item("quality_480p", "480p")
+                  mixin quality_item("quality_720p", "720p")
+                  mixin quality_item("quality_1080p", "1080p")
               button#mediarefresh.btn.btn-sm.btn-default Refresh Media
               
           #playlistrow.row
@@ -144,10 +144,10 @@ html(lang="en")
           .modal-body
             .tab-content
               include useroptions
-              +us-general()
-              +us-playback()
-              +us-chat()
-              +us-mod()
+              mixin us-general()
+              mixin us-playback()
+              mixin us-chat()
+              mixin us-mod()
           .modal-footer
             button.btn.btn-primary(type="button", data-dismiss="modal", onclick="javascript:saveUserOptions()") Save
             button.btn.btn-default(type="button", data-dismiss="modal") Close
@@ -172,18 +172,18 @@ html(lang="en")
           .modal-body
             .tab-content
               include channeloptions
-              +miscoptions()
-              +adminoptions()
-              +motdeditor()
-              +csseditor()
-              +jseditor()
-              +banlist()
-              +recentjoins()
-              +chanranks()
+              mixin miscoptions()
+              mixin adminoptions()
+              mixin motdeditor()
+              mixin csseditor()
+              mixin jseditor()
+              mixin banlist()
+              mixin recentjoins()
+              mixin chanranks()
           .modal-footer
             button.btn.btn-default(type="button", data-dismiss="modal") Close
     include footer
-    +footer()
+    mixin footer()
     script(src="//code.jquery.com/ui/1.10.3/jquery-ui.js")
     script(src="/assets/js/iourl.js")
     //script(src="#{ioUrl}/socket.io/socket.io.js")
diff --git a/templates/channeloptions.jade b/templates/channeloptions.jade
index 6424c254..9d204655 100644
--- a/templates/channeloptions.jade
+++ b/templates/channeloptions.jade
@@ -25,11 +25,11 @@ mixin miscoptions
   #cs-miscoptions.tab-pane
     h4 General Settings
     form.form-horizontal(action="javascript:void(0)")
-      +rcheckbox("opt_enable_link_regex", "Convert URLs in chat to links")
-      +rcheckbox("opt_allow_voteskip", "Allow voteskip")
-      +textbox("opt_voteskip_ratio", "Voteskip ratio", "0.5")
-      +textbox("opt_maxlength", "Max video length", "HH:MM:SS")
-      +textbox("opt_afktimeout", "Auto-AFK Delay", "0 (disabled)")
+      mixin rcheckbox("opt_enable_link_regex", "Convert URLs in chat to links")
+      mixin rcheckbox("opt_allow_voteskip", "Allow voteskip")
+      mixin textbox("opt_voteskip_ratio", "Voteskip ratio", "0.5")
+      mixin textbox("opt_maxlength", "Max video length", "HH:MM:SS")
+      mixin textbox("opt_afktimeout", "Auto-AFK Delay", "0 (disabled)")
       .form-group
         .col-sm-8.col-sm-offset-4
           button.btn.btn-default#cs-miscoptionssubmit Save
@@ -39,11 +39,11 @@ mixin adminoptions
     h4 Admin-Only Settings
     form.form-horizontal(action="javascript:void(0)")
       - var defname = "CyTube - /r/" + channelName
-      +textbox("opt_pagetitle", "Page title", defname)
-      +textbox("opt_password", "Password", "leave blank to disable")
-      +textbox("opt_externalcss", "External CSS", "Stylesheet URL")
-      +textbox("opt_externaljs", "External Javascript", "Script URL")
-      +rcheckbox("opt_show_public", "List channel publicly")
+      mixin textbox("opt_pagetitle", "Page title", defname)
+      mixin textbox("opt_password", "Password", "leave blank to disable")
+      mixin textbox("opt_externalcss", "External CSS", "Stylesheet URL")
+      mixin textbox("opt_externaljs", "External Javascript", "Script URL")
+      mixin rcheckbox("opt_show_public", "List channel publicly")
       .form-group
         .col-sm-8.col-sm-offset-4
           button.btn.btn-default#cs-adminoptionssubmit Save
diff --git a/templates/index.jade b/templates/index.jade
index 2a152088..09822ef9 100644
--- a/templates/index.jade
+++ b/templates/index.jade
@@ -2,15 +2,15 @@ doctype html
 html(lang="en")
   head
     include head
-    +head()
+    mixin head()
   body
     #wrap
       nav.navbar.navbar-inverse.navbar-fixed-top(role="navigation")
         include nav
-        +navheader()
+        mixin navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/")
-          +navloginlogout("/")
+            mixin navdefaultlinks("/")
+          mixin navloginlogout("/")
     include footer
-    +footer()
+    mixin footer()
diff --git a/templates/login.jade b/templates/login.jade
index 479c0d04..cfc1c672 100644
--- a/templates/login.jade
+++ b/templates/login.jade
@@ -2,17 +2,17 @@ doctype html
 html(lang="en")
   head
     include head
-    +head()
+    mixin head()
   body
     #wrap
       nav.navbar.navbar-inverse.navbar-fixed-top(role="navigation")
         include nav
-        +navheader()
+        mixin navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/login")
+            mixin navdefaultlinks("/login")
           if loggedIn
-            +navlogoutform("/login")
+            mixin navlogoutform("/login")
       section#mainpage.container
         if wasAlreadyLoggedIn
           .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3
@@ -43,4 +43,4 @@ html(lang="en")
                   br
                   a(href=redirect) Return to previous page
     include footer
-    +footer() 
+    mixin footer() 
diff --git a/templates/logout.jade b/templates/logout.jade
index 00bf781b..919b3cc6 100644
--- a/templates/logout.jade
+++ b/templates/logout.jade
@@ -2,16 +2,16 @@ doctype html
 html(lang="en")
   head
     include head
-    +head()
+    mixin head()
   body
     #wrap
       nav.navbar.navbar-inverse.navbar-fixed-top(role="navigation")
         include nav
-        +navheader()
+        mixin navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/logout")
-          +navloginform()
+            mixin navdefaultlinks("/logout")
+          mixin navloginform()
       section#mainpage.container
         .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3
           .alert.alert-info.center.messagebox
@@ -20,4 +20,4 @@ html(lang="en")
               if redirect
                 a(href=redirect) Return to previous page
     include footer
-    +footer()
+    mixin footer()
diff --git a/templates/nav.jade b/templates/nav.jade
index 7710591b..7c85f05a 100644
--- a/templates/nav.jade
+++ b/templates/nav.jade
@@ -19,9 +19,9 @@ mixin navheader()
 mixin navdefaultlinks(page)
   each t, p in links
     if p == page
-      +navlink(p, t, true)
+      mixin navlink(p, t, true)
     else
-      +navlink(p, t, false)
+      mixin navlink(p, t, false)
   li.dropdown
     a.dropdown-toggle(href="#", data-toggle="dropdown") Account
       b.caret
@@ -39,9 +39,9 @@ mixin navdefaultlinks(page)
 
 mixin navloginlogout(redirect)
   if loggedIn
-    +navlogoutform(redirect)
+    mixin navlogoutform(redirect)
   else
-    +navloginform(redirect)
+    mixin navloginform(redirect)
 
 mixin navloginform(redirect)
   .visible-md.visible-lg
diff --git a/templates/register.jade b/templates/register.jade
index 8e0508f3..cf947920 100644
--- a/templates/register.jade
+++ b/templates/register.jade
@@ -2,17 +2,17 @@ doctype html
 html(lang="en")
   head
     include head
-    +head()
+    mixin head()
   body
     #wrap
       nav.navbar.navbar-inverse.navbar-fixed-top(role="navigation")
         include nav
-        +navheader()
+        mixin navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/register")
+            mixin navdefaultlinks("/register")
           if loggedIn
-            +navlogoutform("/register")
+            mixin navlogoutform("/register")
       section#mainpage.container
         if loggedIn
           .col-lg-6.col-lg-offset-3.col-md-6.col-md-offset-3
@@ -49,7 +49,7 @@ html(lang="en")
               strong Registration Successful
               p Thanks for registering, #{registerName}!  Now you can <a href="/login">Login</a> to use your account.
     include footer
-    +footer() 
+    mixin footer() 
     script(src="/js/jquery.js")
     script(type="text/javascript").
       function verify() {
diff --git a/templates/test.jade b/templates/test.jade
index bc2b3185..6f7b39de 100644
--- a/templates/test.jade
+++ b/templates/test.jade
@@ -2,16 +2,16 @@ doctype html
 html(lang="en")
   head
     include head
-    +head()
+    mixin head()
   body
     #wrap
       nav.navbar.navbar-inverse.navbar-fixed-top(role="navigation")
         include nav
-        +navheader()
+        mixin navheader()
         #nav-collapsible.collapse.navbar-collapse
           ul.nav.navbar-nav
-            +navdefaultlinks("/test")
-          +navloginform("/test")
+            mixin navdefaultlinks("/test")
+          mixin navloginform("/test")
 
     include footer
-    +footer()
+    mixin footer()
diff --git a/templates/useroptions.jade b/templates/useroptions.jade
index 6d5c8e58..edca1f5f 100644
--- a/templates/useroptions.jade
+++ b/templates/useroptions.jade
@@ -42,41 +42,41 @@ mixin us-general
       .col-sm-4
       .col-sm-8
         p.text-danger Changing layouts may require refreshing to take effect.
-      +rcheckbox("us-no-channelcss", "Ignore Channel CSS")
-      +rcheckbox("us-no-channeljs", "Ignore Channel Javascript")
-      +rcheckbox("us-ssl", "Encrypt connection with SSL")
+      mixin rcheckbox("us-no-channelcss", "Ignore Channel CSS")
+      mixin rcheckbox("us-no-channeljs", "Ignore Channel Javascript")
+      mixin rcheckbox("us-ssl", "Encrypt connection with SSL")
 
 mixin us-playback
   #us-playback.tab-pane
     h4 Playback Preferences
     form.form-horizontal(action="javascript:void(0)")
-      +rcheckbox("us-synch", "Synchronize video playback")
-      +textbox("us-synch-accuracy", "Synch threshold (seconds)", "2")
-      +rcheckbox("us-wmode-transparent", "Set wmode=transparent")
+      mixin rcheckbox("us-synch", "Synchronize video playback")
+      mixin textbox("us-synch-accuracy", "Synch threshold (seconds)", "2")
+      mixin rcheckbox("us-wmode-transparent", "Set wmode=transparent")
       .col-sm-4
       .col-sm-8
         p.text-info Setting <code>wmode=transparent</code> allows objects to be displayed above the video player, but may cause performance issues on some systems.
-      +rcheckbox("us-hidevideo", "Remove the video player")
-      +rcheckbox("us-playlistbuttons", "Hide playlist buttons by default")
-      +rcheckbox("us-oldbtns", "Old style playlist buttons")
+      mixin rcheckbox("us-hidevideo", "Remove the video player")
+      mixin rcheckbox("us-playlistbuttons", "Hide playlist buttons by default")
+      mixin rcheckbox("us-oldbtns", "Old style playlist buttons")
 
 mixin us-chat
   #us-chat.tab-pane
     h4 Chat Preferences
     form.form-horizontal(action="javascript:void(0)")
-      +rcheckbox("us-chat-timestamp", "Show timestamps in chat")
-      +rcheckbox("us-sort-rank", "Sort userlist by rank")
-      +rcheckbox("us-sort-afk", "Sort AFKers to bottom")
-      +rcheckbox("us-chat-notice", "Ping on all new messages")
+      mixin rcheckbox("us-chat-timestamp", "Show timestamps in chat")
+      mixin rcheckbox("us-sort-rank", "Sort userlist by rank")
+      mixin rcheckbox("us-sort-afk", "Sort AFKers to bottom")
+      mixin rcheckbox("us-chat-notice", "Ping on all new messages")
       .col-sm-4
       .col-sm-8
         p.text-info When unchecked, you will only be pinged if your name is mentioned
-      +rcheckbox("us-boop", "Play a sound when pinged")
-      +rcheckbox("us-sendbtn", "Add a send button to chat")
+      mixin rcheckbox("us-boop", "Play a sound when pinged")
+      mixin rcheckbox("us-sendbtn", "Add a send button to chat")
 
 mixin us-mod
   #us-mod.tab-pane
     h4 Moderator Preferences
     form.form-horizontal(action="javascript:void(0)")
-      +rcheckbox("us-modflair", "Show name color")
-      +rcheckbox("us-joinmessage", "Show join messages")
+      mixin rcheckbox("us-modflair", "Show name color")
+      mixin rcheckbox("us-joinmessage", "Show join messages")