diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index 7a6c9bba80..2286bb9718 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -19,60 +19,55 @@
                 <form class="cinemaModeConfigurationForm">
 
                     <p>${CinemaModeConfigurationHelp}</p>
-                    <div style="margin-top:2em;">
-                        <fieldset data-role="controlgroup">
-                            <legend>${LabelEnableCinemaModeFor}</legend>
-                            <label for="chkMovies">${OptionMovies}</label>
-                            <input type="checkbox" id="chkMovies" />
-                            <label for="chkEpisodes">${OptionEpisodes}</label>
-                            <input type="checkbox" id="chkEpisodes" />
-                        </fieldset>
+                    <div style="margin-top: 2em;">
+                        <h3 style="margin-bottom:.5em;">${LabelEnableCinemaModeFor}</h3>
+                        <div class="paperCheckboxList">
+                            <paper-checkbox class="chkMovies">${OptionMovies}</paper-checkbox>
+                            <paper-checkbox class="chkEpisodes">${OptionEpisodes}</paper-checkbox>
+                        </div>
+                    </div>
+                    <br />
+                    <div>
+                        <h3 style="margin-bottom:.5em;">${LabelSelectInternetTrailersForCinemaMode}</h3>
+                        <div class="paperCheckboxList">
+                            <paper-checkbox class="chkUpcomingTheaterTrailers">${OptionUpcomingMoviesInTheaters}</paper-checkbox>
+                            <paper-checkbox class="chkUpcomingDvdTrailers">${OptionUpcomingDvdMovies}</paper-checkbox>
+                            <paper-checkbox class="chkUpcomingStreamingTrailers">${OptionUpcomingStreamingMovies}</paper-checkbox>
+                            <paper-checkbox class="chkOtherTrailers">${OptionOtherTrailers}</paper-checkbox>
+                        </div>
+                        <div class="fieldDescription paperCheckboxFieldDescription">${LabelTheseFeaturesRequireSubscriptionHelpAndTrailers}</div>
+                        <div class="fieldDescription paperCheckboxFieldDescription"><a class="lnkSupporterLearnMore" href="http://emby.media/premiere" target="_blank" style="display:none;">${ButtonLearnMore}</a></div>
+                    </div>
+                    <br />
+                    <div>
+                        <paper-checkbox class="chkMyMovieTrailers">${OptionTrailersFromMyMovies}</paper-checkbox>
+                        <div class="fieldDescription paperCheckboxFieldDescription">${OptionTrailersFromMyMoviesHelp}</div>
+                        <div class="fieldDescription paperCheckboxFieldDescription">
+                            <a href="http://emby.media/community/index.php?/topic/674-media-files-folders-structure/" target="_blank">${ButtonLearnMore}</a>
+                        </div>
+                    </div>
+                    <br />
+                    <div>
+                        <paper-input type="number" id="txtNumTrailers" min="1" max="10" step="1" label="${LabelNumberTrailerToPlay}"></paper-input>
+                    </div>
+                    <br />
+                    <div>
+                        <paper-checkbox class="chkEnableParentalControl">${LabelEnableIntroParentalControl}</paper-checkbox>
+                        <div class="fieldDescription paperCheckboxFieldDescription">${LabelEnableIntroParentalControlHelp}</div>
+                    </div>
+                    <br />
+                    <div>
+                        <paper-checkbox class="chkUnwatchedOnly">${LabelLimitIntrosToUnwatchedContent}</paper-checkbox>
+                    </div>
+                    <br />
+                    <div>
+                        <div>
+                            <paper-input type="text" label="${LabelCustomIntrosPath}" id="txtCustomIntrosPath" style="display: inline-block; width: 85%;"></paper-input>
+                            <paper-icon-button id="btnSelectCustomIntrosPath" icon="search"></paper-icon-button>
+                        </div>
+                        <div class="fieldDescription">${LabelCustomIntrosPathHelp}</div>
                     </div>
                     <br />
-                    <ul data-role="listview" class="ulForm">
-                        <li>
-                            <fieldset data-role="controlgroup">
-                                <legend>${LabelSelectInternetTrailersForCinemaMode}</legend>
-                                <label for="chkUpcomingTheaterTrailers">${OptionUpcomingMoviesInTheaters}</label>
-                                <input type="checkbox" id="chkUpcomingTheaterTrailers" />
-                                <label for="chkUpcomingDvdTrailers">${OptionUpcomingDvdMovies}</label>
-                                <input type="checkbox" id="chkUpcomingDvdTrailers" />
-                                <label for="chkUpcomingStreamingTrailers">${OptionUpcomingStreamingMovies}</label>
-                                <input type="checkbox" id="chkUpcomingStreamingTrailers" />
-                                <label for="chkOtherTrailers">${OptionOtherTrailers}</label>
-                                <input type="checkbox" id="chkOtherTrailers" />
-                            </fieldset>
-                            <div class="fieldDescription">${LabelTheseFeaturesRequireSubscriptionHelpAndTrailers}</div>
-                            <div class="fieldDescription"><a class="lnkSupporterLearnMore" href="http://emby.media/premiere" target="_blank" style="display:none;">${ButtonLearnMore}</a></div>
-                        </li>
-                        <li>
-                            <label for="chkMyMovieTrailers">${OptionTrailersFromMyMovies}</label>
-                            <input type="checkbox" id="chkMyMovieTrailers" data-mini="true" />
-                            <div class="fieldDescription">${OptionTrailersFromMyMoviesHelp}</div>
-                            <div class="fieldDescription"><a href="http://emby.media/community/index.php?/topic/674-media-files-folders-structure/" target="_blank">${ButtonLearnMore}</a></div>
-                        </li>
-                        <li>
-                            <label for="txtCustomIntrosPath">${LabelCustomIntrosPath}</label>
-                            <div>
-                                <input type="text" id="txtCustomIntrosPath" style="display: inline-block; width: 85%;" />
-                                <paper-icon-button id="btnSelectCustomIntrosPath" icon="search"></paper-icon-button>
-                            </div>
-                            <div class="fieldDescription">${LabelCustomIntrosPathHelp}</div>
-                        </li>
-                        <li>
-                            <label for="txtNumTrailers">${LabelNumberTrailerToPlay}</label>
-                            <input type="number" id="txtNumTrailers" min="1" max="10" step="1" />
-                        </li>
-                        <li>
-                            <label for="chkEnableParentalControl">${LabelEnableIntroParentalControl}</label>
-                            <input type="checkbox" id="chkEnableParentalControl" data-mini="true" />
-                            <div class="fieldDescription">${LabelEnableIntroParentalControlHelp}</div>
-                        </li>
-                        <li>
-                            <label for="chkUnwatchedOnly">${LabelLimitIntrosToUnwatchedContent}</label>
-                            <input type="checkbox" id="chkUnwatchedOnly" data-mini="true" />
-                        </li>
-                    </ul>
                     <p>${CinemaModeConfigurationHelp2}</p>
                     <ul data-role="listview" class="ulForm">
                         <li>
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 123686ff57..e0de443044 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -844,7 +844,7 @@ h1 .imageLink {
 }
 
 .paperCheckboxFieldDescription {
-    padding-left: 34px;
+    padding-left: 31px;
     padding-top: 5px;
 }
 
diff --git a/dashboard-ui/scripts/cinemamodeconfiguration.js b/dashboard-ui/scripts/cinemamodeconfiguration.js
index 95a2f318af..efe971ddc1 100644
--- a/dashboard-ui/scripts/cinemamodeconfiguration.js
+++ b/dashboard-ui/scripts/cinemamodeconfiguration.js
@@ -2,18 +2,18 @@
 
     function loadPage(page, config) {
 
-        $('#chkMovies', page).checked(config.EnableIntrosForMovies).checkboxradio('refresh');
-        $('#chkEpisodes', page).checked(config.EnableIntrosForEpisodes).checkboxradio('refresh');
+        $('.chkMovies', page).checked(config.EnableIntrosForMovies);
+        $('.chkEpisodes', page).checked(config.EnableIntrosForEpisodes);
 
-        $('#chkMyMovieTrailers', page).checked(config.EnableIntrosFromMoviesInLibrary).checkboxradio('refresh');
+        $('.chkMyMovieTrailers', page).checked(config.EnableIntrosFromMoviesInLibrary);
 
-        $('#chkUpcomingTheaterTrailers', page).checked(config.EnableIntrosFromUpcomingTrailers).checkboxradio('refresh');
-        $('#chkUpcomingDvdTrailers', page).checked(config.EnableIntrosFromUpcomingDvdMovies).checkboxradio('refresh');
-        $('#chkUpcomingStreamingTrailers', page).checked(config.EnableIntrosFromUpcomingStreamingMovies).checkboxradio('refresh');
-        $('#chkOtherTrailers', page).checked(config.EnableIntrosFromSimilarMovies).checkboxradio('refresh');
+        $('.chkUpcomingTheaterTrailers', page).checked(config.EnableIntrosFromUpcomingTrailers);
+        $('.chkUpcomingDvdTrailers', page).checked(config.EnableIntrosFromUpcomingDvdMovies);
+        $('.chkUpcomingStreamingTrailers', page).checked(config.EnableIntrosFromUpcomingStreamingMovies);
+        $('.chkOtherTrailers', page).checked(config.EnableIntrosFromSimilarMovies);
 
-        $('#chkUnwatchedOnly', page).checked(!config.EnableIntrosForWatchedContent).checkboxradio('refresh');
-        $('#chkEnableParentalControl', page).checked(config.EnableIntrosParentalControl).checkboxradio('refresh');
+        $('.chkUnwatchedOnly', page).checked(!config.EnableIntrosForWatchedContent);
+        $('.chkEnableParentalControl', page).checked(config.EnableIntrosParentalControl);
 
         $('#txtCustomIntrosPath', page).val(config.CustomIntroPath || '');
         $('#txtNumTrailers', page).val(config.TrailerLimit);
@@ -33,16 +33,16 @@
             config.CustomIntroPath = $('#txtCustomIntrosPath', page).val();
             config.TrailerLimit = $('#txtNumTrailers', page).val();
 
-            config.EnableIntrosForMovies = $('#chkMovies', page).checked();
-            config.EnableIntrosForEpisodes = $('#chkEpisodes', page).checked();
-            config.EnableIntrosFromMoviesInLibrary = $('#chkMyMovieTrailers', page).checked();
-            config.EnableIntrosForWatchedContent = !$('#chkUnwatchedOnly', page).checked();
-            config.EnableIntrosParentalControl = $('#chkEnableParentalControl', page).checked();
+            config.EnableIntrosForMovies = $('.chkMovies', page).checked();
+            config.EnableIntrosForEpisodes = $('.chkEpisodes', page).checked();
+            config.EnableIntrosFromMoviesInLibrary = $('.chkMyMovieTrailers', page).checked();
+            config.EnableIntrosForWatchedContent = !$('.chkUnwatchedOnly', page).checked();
+            config.EnableIntrosParentalControl = $('.chkEnableParentalControl', page).checked();
 
-            config.EnableIntrosFromUpcomingTrailers = $('#chkUpcomingTheaterTrailers', page).checked();
-            config.EnableIntrosFromUpcomingDvdMovies = $('#chkUpcomingDvdTrailers', page).checked();
-            config.EnableIntrosFromUpcomingStreamingMovies = $('#chkUpcomingStreamingTrailers', page).checked();
-            config.EnableIntrosFromSimilarMovies = $('#chkOtherTrailers', page).checked();
+            config.EnableIntrosFromUpcomingTrailers = $('.chkUpcomingTheaterTrailers', page).checked();
+            config.EnableIntrosFromUpcomingDvdMovies = $('.chkUpcomingDvdTrailers', page).checked();
+            config.EnableIntrosFromUpcomingStreamingMovies = $('.chkUpcomingStreamingTrailers', page).checked();
+            config.EnableIntrosFromSimilarMovies = $('.chkOtherTrailers', page).checked();
 
             ApiClient.updateNamedConfiguration("cinemamode", config).done(Dashboard.processServerConfigurationUpdateResult);
         });
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 4ac3c32956..35b8446efc 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -670,10 +670,6 @@
 
             return "<img src='css/images/clients/roku.jpg' />";
         }
-        if (clientLowered == "windows rt") {
-
-            return "<img src='css/images/clients/windowsrt.png' />";
-        }
         if (clientLowered == "windows phone") {
 
             return "<img src='css/images/clients/windowsphone.png' />";