diff --git a/rtv/page.py b/rtv/page.py
index 55f3891..d798590 100644
--- a/rtv/page.py
+++ b/rtv/page.py
@@ -51,7 +51,9 @@ class Page(object):
         self.nav = None
         self.controller = None
         self.copy_to_clipboard = copy
-        self.theme_list = ThemeList()
+
+        # TODO: does this need to be a global?
+        self.theme_list = ThemeList(term.theme)
 
         self.active = True
         self._row = 0
diff --git a/rtv/theme.py b/rtv/theme.py
index 513a193..214163a 100644
--- a/rtv/theme.py
+++ b/rtv/theme.py
@@ -361,11 +361,11 @@ class Theme(object):
 
         filename = os.path.join(path, '{0}.cfg'.format(name))
         if os.path.isfile(filename):
-            return cls.from_file(name, 'installed')
+            return cls.from_file(filename, 'installed')
 
         filename = os.path.join(DEFAULT_THEMES, '{0}.cfg'.format(name))
         if os.path.isfile(filename):
-            return cls.from_file(name, 'preset')
+            return cls.from_file(filename, 'preset')
 
         raise ConfigError('Could not find theme named "{0}"'.format(name))
 
@@ -517,6 +517,10 @@ class ThemeList(object):
                 if (theme.source, theme.name) == key:
                     self.index = i
                     break
+            else:
+                # If the current_theme was set from a custom source it might
+                # not be a part of the list returned by list_themes().
+                self.themes.insert(0, self.current_theme)
 
         self.current_theme = self.themes[self.index]