--- a/Allura/allura/lib/plugin.py
+++ b/Allura/allura/lib/plugin.py
@@ -288,8 +288,7 @@
 
 class ThemeProvider(object):
     master_template = 'jinja_master/master.html'
-    footer = 'jinja_master/footer.html'
-    main_menu = 'jinja_master/main_menu.html'
+    jinja_macros = 'jinja_master/theme_macros.html'
     nav_menu = 'jinja_master/nav_menu.html'
     top_nav = 'jinja_master/top_nav.html'
     sidebar_menu = 'jinja_master/sidebar_menu.html'
@@ -304,8 +303,7 @@
 
     def set_theme(self, globs):
         globs.theme = dict(master = self.master_template,
-                           footer = self.footer,
-                           main_menu = self.main_menu,
+                           jinja_macros = self.jinja_macros,
                            nav_menu = self.nav_menu,
                            top_nav = self.top_nav,
                            sidebar_menu = self.sidebar_menu,