diff --git a/pandora/0xdb.jsonc b/pandora/0xdb.jsonc
index 1c706181a..75ff697a5 100644
--- a/pandora/0xdb.jsonc
+++ b/pandora/0xdb.jsonc
@@ -586,6 +586,7 @@
     },
     "user": {
         "level": "guest",
+        "newsletter": true,
         "ui": {
             "annotationsSize": 256,
             "clipsColumns": 2,
@@ -648,6 +649,7 @@
             "videoScale": "fit",
             "videoMuted": false,
             "videoSize": "small",
+            "videoSubtitles": true,
             "videoView": "video",
             "videoVolume": 1
         },
diff --git a/static/js/pandora/account.js b/static/js/pandora/account.js
index b4453149c..c3e1ce1fc 100644
--- a/static/js/pandora/account.js
+++ b/static/js/pandora/account.js
@@ -73,7 +73,7 @@ pandora.ui.accountDialogOptions = function(action, value) {
                 id: type,
                 title: buttonTitle[type] + '...'
             }).bindEvent('click', function() {
-                if (['signin', 'signup'].indexOf(type) > -1) {
+                if (['signin', 'signup'].indexOf(type) > -1 && type != pandora.user.ui.page) {
                     pandora.UI.set({page: type});
                 } else {
                     pandora.$ui.accountDialog.options(pandora.ui.accountDialogOptions(type));
diff --git a/static/js/pandora/appPanel.js b/static/js/pandora/appPanel.js
index e31bf2a69..43f8437ef 100644
--- a/static/js/pandora/appPanel.js
+++ b/static/js/pandora/appPanel.js
@@ -1,5 +1,7 @@
 // vim: et:ts=4:sw=4:sts=4:ft=javascript
+
 'use strict';
+
 pandora.ui.appPanel = function() {
     var that = Ox.SplitPanel({
             elements: [
diff --git a/static/js/pandora/folderBrowserBar.js b/static/js/pandora/folderBrowserBar.js
index d53029333..74053c9d8 100644
--- a/static/js/pandora/folderBrowserBar.js
+++ b/static/js/pandora/folderBrowserBar.js
@@ -8,15 +8,15 @@ pandora.ui.folderBrowserBar = function(id) {
             elements: [
                 pandora.$ui.findListSelect[id] = Ox.Select({
                         items: [
-                            {id: 'user', title: 'Find: User', checked: true},
-                            {id: 'list', title: 'Find: List'}
+                            {id: 'user', title: 'Find: User'},
+                            {id: 'name', title: 'Find: List'}
                         ],
                         overlap: 'right',
                         type: 'image'
                     })
                     .bindEvent({
                         change: function(data) {
-                            var key = data.value == 'user' ? 'user' : 'name',
+                            var key = data.value,
                                 value = pandora.$ui.findListInput[id].value();
                             value && updateList(key, value);
                             pandora.$ui.findListInput[id].options({
@@ -32,7 +32,7 @@ pandora.ui.folderBrowserBar = function(id) {
                     })
                     .bindEvent({
                         change: function(data) {
-                            var key = pandora.$ui.findListSelect[id].value() == 'user' ? 'user' : 'name',
+                            var key = pandora.$ui.findListSelect[id].value(),
                                 value = data.value;
                             updateList(key, value);
                         }
diff --git a/static/js/pandora/item.js b/static/js/pandora/item.js
index 6f793477c..3a014e620 100644
--- a/static/js/pandora/item.js
+++ b/static/js/pandora/item.js
@@ -123,6 +123,7 @@ pandora.ui.item = function() {
                 censored: videoOptions.censored,
                 cuts: result.data.cuts || [],
                 duration: result.data.duration,
+                enableSubtitles: pandora.user.ui.videoSubtitles,
                 find: pandora.user.ui.itemFind.conditions[0]
                     ? pandora.user.ui.itemFind.conditions[0].value : '',
                 getTimelineImageURL: function(i) {
@@ -168,6 +169,9 @@ pandora.ui.item = function() {
                 scale: function(data) {
                     pandora.UI.set('videoScale', data.scale);
                 },
+                subtitles: function(data) {
+                    pandora.UI.set('videoSubtitles', data.subtitles);
+                },
                 toggleannotations: function(data) {
                     pandora.UI.set('showAnnotations', data.showAnnotations);
                 },
@@ -192,6 +196,7 @@ pandora.ui.item = function() {
                     censored: videoOptions.censored,
                     cuts: result.data.cuts || [],
                     duration: result.data.duration,
+                    enableSubtitles: pandora.user.ui.videoSubtitles,
                     find: pandora.user.ui.itemFind.conditions[0]
                         ? pandora.user.ui.itemFind.conditions[0].value : '',
                     getFrameURL: function(position) {
@@ -255,6 +260,9 @@ pandora.ui.item = function() {
                     resolution: function(data) {
                         pandora.UI.set('videoResolution', data.resolution);
                     },
+                    subtitles: function(data) {
+                        pandora.UI.set('videoSubtitles', data.subtitles);
+                    },
                     togglesize: function(data) {
                         pandora.UI.set({videoSize: data.size});
                     },
diff --git a/static/js/pandora/menu.js b/static/js/pandora/menu.js
index f7506dfa0..af3b00bb0 100644
--- a/static/js/pandora/menu.js
+++ b/static/js/pandora/menu.js
@@ -228,7 +228,7 @@ pandora.ui.mainMenu = function() {
             click: function(data) {
                 if ([
                     'home', 'about', 'news', 'tour', 'faq', 'terms', 'rights', 'contact', 'software',
-                    'signup', 'signin', 'signout', 'preferences', 'help'
+                    'signup', 'signin', 'signout', 'preferences', 'tv', 'help'
                 ].indexOf(data.id) > -1) {
                     pandora.UI.set({page: data.id});
                 } else if ([
@@ -332,6 +332,11 @@ pandora.ui.mainMenu = function() {
                     pandora.UI.set({page: 'help'});
                 }
             },
+            key_control_space: function() {
+                if (!pandora.hasDialogOrScreen()) {
+                    pandora.UI.set({page: 'tv'});
+                }
+            },
             key_control_w: function() {
                 if (!pandora.hasDialogOrScreen()) {
                     if (ui.item) {
@@ -461,6 +466,8 @@ pandora.ui.mainMenu = function() {
                 { id: 'duplicatelist', title: 'Duplicate Selected List', disabled: isGuest || !pandora.user.ui._list, keyboard: 'control d' },
                 { id: 'editlist', title: 'Edit Selected List...', disabled: isGuest || !pandora.user.ui._list, keyboard: 'control e' },
                 { id: 'deletelist', title: 'Delete Selected List...', disabled: isGuest || !pandora.user.ui._list, keyboard: 'delete' },
+                {},
+                { id: 'tv', title: 'TV', keyboard: 'control space' }
             ]
         )};
     };
diff --git a/static/js/pandora/preferencesDialog.js b/static/js/pandora/preferencesDialog.js
index 2f8a037e8..4d542a595 100644
--- a/static/js/pandora/preferencesDialog.js
+++ b/static/js/pandora/preferencesDialog.js
@@ -4,7 +4,7 @@ pandora.ui.preferencesDialog = function() {
 
     var tabs = [
         {id: 'account', title: 'Account', selected: true},
-        {id: 'settings', title: 'Settings'}
+        {id: 'advanced', title: 'Advanced'}
     ];
     var $tabPanel = Ox.TabPanel({
             content: function(id) {
@@ -65,50 +65,36 @@ pandora.ui.preferencesDialog = function() {
                                     labelWidth: 120,
                                     value: Ox.toTitleCase(pandora.user.level),
                                     width: 320
-                                })
+                                }),
+                                Ox.Checkbox({
+                                        id: 'newsletter',
+                                        label: 'Newsletter',
+                                        labelWidth: 120,
+                                        title: pandora.user.newsletter ? 'Subscribed' : 'Unsubscribed',
+                                        value: pandora.user.newsletter,
+                                        width: 320
+                                    })
+                                    .bindEvent({
+                                        change: function(data) {
+                                            pandora.user.newsletter = data.value;
+                                            this.options({
+                                                title: pandora.user.newsletter ? 'Subscribed' : 'Unsubscribed'
+                                            });
+                                            pandora.api.editPreferences({
+                                                newsletter: pandora.user.newsletter 
+                                            });
+                                        }
+                                    })
+                                
                             ]
                         })
                         .css({position: 'absolute', left: '96px', top: '16px'})
-                        .bindEvent({
-                            change: function(data) {
-                                return;
-                                var preferences = {};
-                                preferences[data.id] = data.data.value;
-                                pandora.api.editPreferences(preferences, function(result) {
-                                    if (data.id == 'email') {
-                                        pandora.user.email = data.data.value;
-                                    }
-                                });
-                            }
-                        })
                     );
                 } else {
-                    $content.append(
-                        Ox.Checkbox({
-                                checked: pandora.user.newsletter,
-                                id: 'newsletter',
-                                label: 'Newsletter',
-                                labelWidth: 80,
-                                title: pandora.user.newsletter ? 'Subscribed' : 'Unsubscribed',
-                                width: 240
-                            })
-                            .bindEvent({
-                                change: function(data) {
-                                    this.options({
-                                        title: this.options('title') == 'Subscribed' ? 'Unsubscribed' : 'Subscribed'
-                                    });
-                                    pandora.user.newsletter = data.value;
-                                    pandora.api.editPreferences({
-                                        newsletter: pandora.user.newsletter 
-                                    });
-                                }
-                            })
-                            .css({position: 'absolute', left: '96px', top: '16px'})
-                    );
                     $content.append(
                         Ox.Button({
                             title: 'Reset UI Settings',
-                            width: 150
+                            width: 120
                         })
                         .bindEvent({
                             click: function() {
@@ -116,7 +102,7 @@ pandora.ui.preferencesDialog = function() {
                                 pandora.$ui.appPanel.reload();
                             }
                         })
-                        .css({position: 'absolute', left: '96px', top: '46px'})
+                        .css({position: 'absolute', left: '96px', top: '16px'})
                     );
                 }
                 return $content;
diff --git a/static/js/pandora/tv.js b/static/js/pandora/tv.js
index 52a240092..a882dc470 100644
--- a/static/js/pandora/tv.js
+++ b/static/js/pandora/tv.js
@@ -23,9 +23,10 @@ pandora.ui.tv = function() {
             $player && $player.remove();
             $player = Ox.VideoPlayer({
                     censored: videoOptions.censored,
-                    controlsBottom: ['volume', 'scale', 'timeline', 'position', 'resolution'],
+                    controlsBottom: ['volume', 'scale', 'timeline', 'position', 'settings'],
                     controlsTop: ['close', 'title'],
                     duration: result.data.duration,
+                    enableSubtitles: pandora.user.ui.videoSubtitles,
                     fullscreen: true,
                     logo: pandora.site.tv.showLogo ? '/static/png/logo256.png' : '',
                     position: result.data.position,
@@ -48,9 +49,23 @@ pandora.ui.tv = function() {
                 .bindEvent({
                     close: that.fadeOutScreen,
                     ended: play,
+                    muted: function(data) {
+                        pandora.UI.set('videoMuted', data.muted);
+                    },
                     resolution: function(data) {
                         pandora.UI.set('videoResolution', data.resolution);
-                    }
+                    },
+                    scale: function(data) {
+                        pandora.UI.set('videoScale', data.scale);
+                    },
+                    subtitles: function(data) {
+                        pandora.UI.set('videoSubtitles', data.subtitles);
+                    },
+                    volume: function(data) {
+                        pandora.UI.set('videoVolume', data.volume);
+                    },
+                    // FIXME: does not work
+                    key_escape: that.fadeOutScreen
                 })
                 .appendTo(that);
         });
diff --git a/static/js/pandora/usersDialog.js b/static/js/pandora/usersDialog.js
index 97126543b..c6528fc9d 100644
--- a/static/js/pandora/usersDialog.js
+++ b/static/js/pandora/usersDialog.js
@@ -10,8 +10,8 @@ pandora.ui.usersDialog = function() {
         numberOfUsers = 0,
 
         $guestsCheckbox = Ox.Checkbox({
-                checked: true,
-                title: 'Show Guests'
+                title: 'Show Guests',
+                value: true
             })
             .css({float: 'left', margin: '4px'})
             .bindEvent({
@@ -20,7 +20,7 @@ pandora.ui.usersDialog = function() {
 
         $findSelect = Ox.Select({
                 items: [
-                    {id: 'all', title: 'Find: All', checked: true},
+                    {id: 'all', title: 'Find: All'},
                     {id: 'username', title: 'Find: Username'},
                     {id: 'email', title: 'Find: E-Mail-Address'}
                 ],
@@ -453,11 +453,11 @@ pandora.ui.usersDialog = function() {
         return Ox.Form({
             items: [
                 Ox.Checkbox({
-                        checked: !user.disabled,
                         id: 'status',
                         label: 'Status',
                         labelWidth: 80,
                         title: !user.disabled ? 'Enabled' : 'Disabled',
+                        value: !user.disabled,
                         width: formWidth - 16
                     })
                     .bindEvent({
@@ -496,21 +496,21 @@ pandora.ui.usersDialog = function() {
                     id: 'level',
                     items: Ox.map(pandora.site.userLevels, function(level, i) {
                         return i ? {
-                            checked: level == user.level,
                             id: level,
                             title: Ox.toTitleCase(level)
                         } : null;
                     }),
                     label: 'Level',
                     labelWidth: 80,
+                    value: user.level,
                     width: formWidth - 16
                 }),
                 Ox.Checkbox({
-                        checked: user.newsletter,
                         id: 'newsletter',
                         label: 'Newsletter',
                         labelWidth: 80,
                         title: user.newsletter ? 'Subscribed' : 'Unsubscribed',
+                        value: user.newsletter,
                         width: formWidth - 16
                     })
                     .bindEvent({
@@ -632,9 +632,9 @@ pandora.ui.usersDialog = function() {
                         }
                     }),
                 Ox.Checkbox({
-                    checked: false,
                     id: 'receipt',
                     title: 'Send a receipt to ' + pandora.user.email,
+                    value: false,
                     width: formWidth - 16
                 }),
                 Ox.Button({