diff --git a/app.config b/app.config
index d3f05a1cf1..8d7ee4f172 100644
--- a/app.config
+++ b/app.config
@@ -8,6 +8,7 @@
   
   
   
+  
 <webMarkupMin xmlns="http://tempuri.org/WebMarkupMin.Configuration.xsd">
 		<core>
 			<css>
diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index bcdb7f59a2..ace11163f3 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -44,7 +44,7 @@
                                 <input type="checkbox" id="chkUpcomingDvdTrailers" data-mini="true" />
                                 <label for="chkUpcomingStreamingTrailers">${OptionUpcomingStreamingMovies}</label>
                                 <input type="checkbox" id="chkUpcomingStreamingTrailers" data-mini="true" />
-                          </fieldset>
+                            </fieldset>
                             <div class="fieldDescription">${LabelTheseFeaturesRequireSupporterHelpAndTrailers}</div>
                             <div class="fieldDescription"><a href="supporter.html">${ButtonLearnMore}</a></div>
                         </li>
@@ -66,7 +66,7 @@
                             <div class="fieldDescription">${LabelCustomIntrosPathHelp}</div>
                         </li>
                     </ul>
-                    <br />
+                    <p>${CinemaModeConfigurationHelp2}</p>
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <button type="submit" data-theme="b" data-icon="check">
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 3be58fb6ba..6bfc835d2b 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -266,7 +266,7 @@
     background-image: url(images/items/folders/report.png);
 }
 
-.homevideosViewMenu, .adultvideosViewMenu {
+.homevideosViewMenu {
     background-image: url(images/items/folders/homevideos.png);
 }
 
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 3b83fb9712..538beac4f0 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -797,7 +797,6 @@ progress {
 }
 
 .dashboardContent {
-    max-width: 1550px;
     margin-top: -10px;
 }
 
@@ -844,12 +843,21 @@ progress {
         }
 }
 
+@media all and (min-width: 1680px) {
+
+    .dashboardHomeRightColumn {
+        width: 350px;
+        min-width: 350px;
+    }
+}
+
+
 @media all and (min-width: 1880px) {
 
     .dashboardHomeRightColumn {
         max-width: 440px;
         margin-left: 2em;
-        min-width: 400px;
+        min-width: 440px;
     }
 }
 
diff --git a/dashboard-ui/css/tileitem.css b/dashboard-ui/css/tileitem.css
index 2d8fe4809e..d4893892d3 100644
--- a/dashboard-ui/css/tileitem.css
+++ b/dashboard-ui/css/tileitem.css
@@ -493,10 +493,6 @@
     background-color: rgba(110, 52, 32, 0.7);
 }
 
-.adultvideosPosterItem .posterItemImage {
-    background-color: rgba(184, 83, 116, 0.7);
-}
-
 .photosPosterItem .posterItemImage {
     background-color: rgba(127, 0, 0, 0.7);
 }
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index 8bc8ac2db9..53aaa669fc 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -14,50 +14,60 @@
 
         <br />
         <form style="margin: 0 auto;" class="languagePreferencesForm">
-            <div class="detailSectionHeader" style="margin: 0 .5em;">
+            <div class="detailSectionHeader">
                 ${HeaderLanguagePreferences}
             </div>
 
             <br />
-            <ul data-role="listview" class="ulForm">
-                <li>
-                    <label for="selectAudioLanguage">${LabelAudioLanguagePreference}</label>
-                    <select id="selectAudioLanguage" data-mini="true"></select>
-                </li>
-                <li>
-                    <input type="checkbox" id="chkPlayDefaultAudioTrack" data-mini="true" />
-                    <label for="chkPlayDefaultAudioTrack">${LabelPlayDefaultAudioTrack}</label>
-                </li>
-                <li>
-                    <label for="selectSubtitleLanguage">${LabelSubtitleLanguagePreference}</label>
-                    <select id="selectSubtitleLanguage" data-mini="true"></select>
-                </li>
-                <li>
-                    <label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
-                    <select id="selectSubtitlePlaybackMode" data-mini="true">
-                        <option value="Default">${OptionDefaultSubtitles}</option>
-                        <option value="OnlyForced">${OptionOnlyForcedSubtitles}</option>
-                        <option value="Always">${OptionAlwaysPlaySubtitles}</option>
-                        <option value="None">${OptionNoSubtitles}</option>
-                    </select>
-                    <div class="fieldDescription subtitlesDefaultHelp subtitlesHelp" style="display: none;">${OptionDefaultSubtitlesHelp}</div>
-                    <div class="fieldDescription subtitlesAlwaysHelp subtitlesHelp" style="display: none;">${OptionAlwaysPlaySubtitlesHelp}</div>
-                    <div class="fieldDescription subtitlesOnlyForcedHelp subtitlesHelp" style="display: none;">${OptionOnlyForcedSubtitlesHelp}</div>
-                    <div class="fieldDescription subtitlesNoneHelp subtitlesHelp" style="display: none;">${OptionNoSubtitlesHelp}</div>
-                </li>
-            </ul>
+            <div>
+                <label for="selectAudioLanguage">${LabelAudioLanguagePreference}</label>
+                <select id="selectAudioLanguage" data-mini="true"></select>
+            </div><br />
+            <div>
+                <input type="checkbox" id="chkPlayDefaultAudioTrack" data-mini="true" />
+                <label for="chkPlayDefaultAudioTrack">${LabelPlayDefaultAudioTrack}</label>
+            </div><br />
+            <div>
+                <label for="selectSubtitleLanguage">${LabelSubtitleLanguagePreference}</label>
+                <select id="selectSubtitleLanguage" data-mini="true"></select>
+            </div><br />
+            <div>
+                <label for="selectSubtitlePlaybackMode">${LabelSubtitlePlaybackMode}</label>
+                <select id="selectSubtitlePlaybackMode" data-mini="true">
+                    <option value="Default">${OptionDefaultSubtitles}</option>
+                    <option value="OnlyForced">${OptionOnlyForcedSubtitles}</option>
+                    <option value="Always">${OptionAlwaysPlaySubtitles}</option>
+                    <option value="None">${OptionNoSubtitles}</option>
+                </select>
+                <div class="fieldDescription subtitlesDefaultHelp subtitlesHelp" style="display: none;">${OptionDefaultSubtitlesHelp}</div>
+                <div class="fieldDescription subtitlesAlwaysHelp subtitlesHelp" style="display: none;">${OptionAlwaysPlaySubtitlesHelp}</div>
+                <div class="fieldDescription subtitlesOnlyForcedHelp subtitlesHelp" style="display: none;">${OptionOnlyForcedSubtitlesHelp}</div>
+                <div class="fieldDescription subtitlesNoneHelp subtitlesHelp" style="display: none;">${OptionNoSubtitlesHelp}</div>
+            </div>
 
-            <br />
-            <ul data-role="listview" class="ulForm">
-                <li>
-                    <button type="submit" data-theme="a" data-icon="check" data-mini="true">
-                        ${ButtonOk}
-                    </button>
-                    <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
-                        ${ButtonCancel}
-                    </button>
-                </li>
-            </ul>
+            <br /><br />
+            <div class="cinemaModeOptions" style="display:none;">
+                <br />
+                <div class="detailSectionHeader">
+                    ${HeaderCinemaMode}
+                </div>
+                <br />
+                <div>
+                    <input type="checkbox" id="chkEnableCinemaMode" data-mini="true" />
+                    <label for="chkEnableCinemaMode">${LabelEnableCinemaMode}</label>
+
+                    <div class="fieldDescription">${CinemaModeConfigurationHelp}</div>
+                </div>
+                <br /><br />
+            </div>
+            <div>
+                <button type="submit" data-theme="a" data-icon="check" data-mini="true">
+                    ${ButtonOk}
+                </button>
+                <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
+                    ${ButtonCancel}
+                </button>
+            </div>
         </form>
         <script type="text/javascript">
             $('.languagePreferencesForm').off('submit', LanguagePreferencesPage.onSubmit).on('submit', LanguagePreferencesPage.onSubmit);
diff --git a/dashboard-ui/mypreferenceswebclient.html b/dashboard-ui/mypreferenceswebclient.html
index fe76bb23c6..6d7a642343 100644
--- a/dashboard-ui/mypreferenceswebclient.html
+++ b/dashboard-ui/mypreferenceswebclient.html
@@ -15,123 +15,119 @@
         <br />
         <form class="webClientPreferencesForm" style="margin: 0 auto;">
 
-            <div class="detailSectionHeader" style="margin: 0 .5em;">
+            <div class="detailSectionHeader">
                 ${HeaderHomePage}
             </div>
 
             <br />
-            <ul data-role="listview" class="ulForm">
-                <li>
-                    <label for="selectHomeSection1">${LabelHomePageSection1}</label>
-                    <select id="selectHomeSection1" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
-                        <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyViews}</option>
-                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
-                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
-                        <option value="folders">${OptionLibraryFolders}</option>
-                        <option value="resume">${OptionResumablemedia}</option>
-                    </select>
-                </li>
-                <li>
-                    <label for="selectHomeSection2">${LabelHomePageSection2}</label>
-                    <select id="selectHomeSection2" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
-                        <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyViews}</option>
-                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
-                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
-                        <option value="folders">${OptionLibraryFolders}</option>
-                        <option value="resume">${OptionResumablemedia}</option>
-                        <option value="none">${OptionNone}</option>
-                    </select>
-                </li>
-                <li>
-                    <label for="selectHomeSection3">${LabelHomePageSection3}</label>
-                    <select id="selectHomeSection3" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
-                        <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyViews}</option>
-                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
-                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
-                        <option value="folders">${OptionLibraryFolders}</option>
-                        <option value="resume">${OptionResumablemedia}</option>
-                        <option value="none">${OptionNone}</option>
-                    </select>
-                </li>
-                <li>
-                    <label for="selectHomeSection4">${LabelHomePageSection4}</label>
-                    <select id="selectHomeSection4" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="latestmedia">${OptionLatestMedia}</option>
-                        <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
-                        <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
-                        <option value="librarytiles">${OptionMyViews}</option>
-                        <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
-                        <option value="librarybuttons">${OptionMyViewsButtons}</option>
-                        <option value="folders">${OptionLibraryFolders}</option>
-                        <option value="resume">${OptionResumablemedia}</option>
-                        <option value="none">${OptionNone}</option>
-                    </select>
-                </li>
-            </ul>
+            <div>
+                <label for="selectHomeSection1">${LabelHomePageSection1}</label>
+                <select id="selectHomeSection1" data-mini="true">
+                    <option value="">${OptionAuto}</option>
+                    <option value="latestmedia">${OptionLatestMedia}</option>
+                    <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
+                    <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
+                    <option value="librarytiles">${OptionMyViews}</option>
+                    <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                    <option value="librarybuttons">${OptionMyViewsButtons}</option>
+                    <option value="folders">${OptionLibraryFolders}</option>
+                    <option value="resume">${OptionResumablemedia}</option>
+                </select>
+            </div><br />
+            <div>
+                <label for="selectHomeSection2">${LabelHomePageSection2}</label>
+                <select id="selectHomeSection2" data-mini="true">
+                    <option value="">${OptionAuto}</option>
+                    <option value="latestmedia">${OptionLatestMedia}</option>
+                    <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
+                    <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
+                    <option value="librarytiles">${OptionMyViews}</option>
+                    <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                    <option value="librarybuttons">${OptionMyViewsButtons}</option>
+                    <option value="folders">${OptionLibraryFolders}</option>
+                    <option value="resume">${OptionResumablemedia}</option>
+                    <option value="none">${OptionNone}</option>
+                </select>
 
-            <div class="detailSectionHeader" style="margin: 0 .5em;">
+            </div><br />
+            <div>
+                <label for="selectHomeSection3">${LabelHomePageSection3}</label>
+                <select id="selectHomeSection3" data-mini="true">
+                    <option value="">${OptionAuto}</option>
+                    <option value="latestmedia">${OptionLatestMedia}</option>
+                    <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
+                    <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
+                    <option value="librarytiles">${OptionMyViews}</option>
+                    <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                    <option value="librarybuttons">${OptionMyViewsButtons}</option>
+                    <option value="folders">${OptionLibraryFolders}</option>
+                    <option value="resume">${OptionResumablemedia}</option>
+                    <option value="none">${OptionNone}</option>
+                </select>
+            </div><br />
+            <div>
+                <label for="selectHomeSection4">${LabelHomePageSection4}</label>
+                <select id="selectHomeSection4" data-mini="true">
+                    <option value="">${OptionAuto}</option>
+                    <option value="latestmedia">${OptionLatestMedia}</option>
+                    <option value="latestchannelmedia">${OptionLatestChannelMedia}</option>
+                    <option value="latesttvrecordings">${OptionLatestTvRecordings}</option>
+                    <option value="librarytiles">${OptionMyViews}</option>
+                    <option value="smalllibrarytiles">${OptionMyViewsSmall}</option>
+                    <option value="librarybuttons">${OptionMyViewsButtons}</option>
+                    <option value="folders">${OptionLibraryFolders}</option>
+                    <option value="resume">${OptionResumablemedia}</option>
+                    <option value="none">${OptionNone}</option>
+                </select>
+            </div><br />
+
+            <div class="detailSectionHeader">
                 ${HeaderSettingsForThisDevice}
             </div>
             <br />
-            <ul data-role="listview" class="ulForm">
-                <li>
-                    <label for="selectMaxBitrate">${LabelMaxStreamingBitrate}</label>
-                    <select id="selectMaxBitrate" data-mini="true">
-                        <option value="30000000">30Mbps</option>
-                        <option value="25000000">25Mbps</option>
-                        <option value="20000000">20Mbps</option>
-                        <option value="15000000">15Mbps</option>
-                        <option value="10000000">10Mbps</option>
-                        <option value="8000000">8Mbps</option>
-                        <option value="6000000">6Mbps</option>
-                        <option value="5000000">5Mbps</option>
-                        <option value="4000000">4Mbps</option>
-                        <option value="3500000">3.5Mbps</option>
-                        <option value="3000000">3Mbps</option>
-                        <option value="2500000">2.5Mbps</option>
-                        <option value="2000000">2Mbps</option>
-                        <option value="1500000">1.5Mbps</option>
-                        <option value="1000000">1Mbps</option>
-                        <option value="720000">720kbps</option>
-                        <option value="420000">420kbps</option>
-                        <option value="400000">400kbps</option>
-                        <option value="320000">320kbps</option>
-                    </select>
-                </li>
-                <li>
-                    <label for="selectThemeSong">${LabelEnableThemeSongs}</label>
-                    <select id="selectThemeSong" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="1">${OptionYes}</option>
-                        <option value="0">${OptionNo}</option>
-                    </select>
-                    <div class="fieldDescription">${LabelEnableThemeSongsHelp}</div>
-                </li>
-                <li class="fldEnableBackdrops" style="display:none;">
-                    <label for="selectBackdrop">${LabelEnableBackdrops}</label>
-                    <select id="selectBackdrop" data-mini="true">
-                        <option value="">${OptionAuto}</option>
-                        <option value="1">${OptionYes}</option>
-                        <option value="0">${OptionNo}</option>
-                    </select>
-                    <div class="fieldDescription">${LabelEnableBackdropsHelp}</div>
-                </li>
-            </ul>
+            <div>
+                <label for="selectMaxBitrate">${LabelMaxStreamingBitrate}</label>
+                <select id="selectMaxBitrate" data-mini="true">
+                    <option value="30000000">30Mbps</option>
+                    <option value="25000000">25Mbps</option>
+                    <option value="20000000">20Mbps</option>
+                    <option value="15000000">15Mbps</option>
+                    <option value="10000000">10Mbps</option>
+                    <option value="8000000">8Mbps</option>
+                    <option value="6000000">6Mbps</option>
+                    <option value="5000000">5Mbps</option>
+                    <option value="4000000">4Mbps</option>
+                    <option value="3000000">3Mbps</option>
+                    <option value="2500000">2.5Mbps</option>
+                    <option value="2000000">2Mbps</option>
+                    <option value="1500000">1.5Mbps</option>
+                    <option value="1000000">1Mbps</option>
+                    <option value="720000">720kbps</option>
+                    <option value="420000">420kbps</option>
+                    <option value="400000">400kbps</option>
+                    <option value="320000">320kbps</option>
+                </select>
+            </div><br />
+            <div>
+                <label for="selectThemeSong">${LabelEnableThemeSongs}</label>
+                <select id="selectThemeSong" data-mini="true">
+                    <option value="">${OptionAuto}</option>
+                    <option value="1">${OptionYes}</option>
+                    <option value="0">${OptionNo}</option>
+                </select>
+                <div class="fieldDescription">${LabelEnableThemeSongsHelp}</div>
+            </div><br />
+            <div class="fldEnableBackdrops" style="display:none;">
+                <label for="selectBackdrop">${LabelEnableBackdrops}</label>
+                <select id="selectBackdrop" data-mini="true">
+                    <option value="">${OptionAuto}</option>
+                    <option value="1">${OptionYes}</option>
+                    <option value="0">${OptionNo}</option>
+                </select>
+                <div class="fieldDescription">${LabelEnableBackdropsHelp}</div>
+            </div><br />
 
-            <div style="margin: 0 1em;">
+            <div>
                 <fieldset data-role="controlgroup">
                     <legend>${LabelExternalPlayers}</legend>
                     <!--<input type="checkbox" id="chkGoodplayer" class="chkExternalPlayer" data-name="GoodPlayer" data-scheme="goodplayer://{0}" />
@@ -142,18 +138,16 @@
                 <div style="padding: 0 2px;">${LabelExternalPlayersHelp}</div>
             </div>
 
-            <br />
+            <br /><br />
 
-            <ul data-role="listview" class="ulForm">
-                <li>
-                    <button type="submit" data-theme="a" data-icon="check" data-mini="true">
-                        ${ButtonOk}
-                    </button>
-                    <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
-                        ${ButtonCancel}
-                    </button>
-                </li>
-            </ul>
+            <div>
+                <button type="submit" data-theme="a" data-icon="check" data-mini="true">
+                    ${ButtonOk}
+                </button>
+                <button type="button" onclick="history.back();" data-icon="delete" data-mini="true">
+                    ${ButtonCancel}
+                </button>
+            </div>
         </form>
         <script type="text/javascript">
             $('.webClientPreferencesForm').off('submit', WebClientPreferencesPage.onSubmit).on('submit', WebClientPreferencesPage.onSubmit);
diff --git a/dashboard-ui/reports.html b/dashboard-ui/reports.html
index 3e74c6d086..4c8f4220b0 100644
--- a/dashboard-ui/reports.html
+++ b/dashboard-ui/reports.html
@@ -11,7 +11,6 @@
                     <span style="margin-right: 10px; vertical-align: middle;">${LabelReport}</span>
                     <div style="display: inline-block;">
                         <select data-mini="true" data-inline="true" id="selectView" name="selectView">
-                            <option value="AdultVideo">${OptionReportAdultVideos}</option>
                             <option value="MusicAlbum">${OptionReportAlbums}</option>
                             <option value="MusicArtist">${OptionReportArtists}</option>
                             <option value="Book">${OptionReportBooks}</option>
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 5f72e4fc51..ea2262e512 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -1072,6 +1072,17 @@ $(document).on('pagebeforeshow', "#dashboardPage", DashboardPage.onPageShow)
         html += '<div style="margin: 0;color:' + color + ';">' + date.toLocaleDateString() + ' ' + date.toLocaleTimeString().toLowerCase() + '</div>';
 
         html += '<div class="notificationName" style="margin:.5em 0 0;white-space:nowrap;">';
+
+        if (entry.UserId && entry.UserPrimaryImageTag) {
+
+            var userImgUrl = ApiClient.getUserImageUrl(entry.UserId, {
+                type: 'Primary',
+                tag: entry.UserPrimaryImageTag,
+                height: 20
+            });
+            html += '<img src="' + userImgUrl + '" style="height:20px;vertical-align:middle;margin-right:5px;" />';
+        }
+
         html += entry.Name;
         html += '</div>';
 
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 787c367e2c..9fd2a5ff9b 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -294,7 +294,7 @@
             $('#fldCustomRating', page).show();
         }
 
-        if (item.Type == "Movie" || item.Type == "AdultVideo" || item.Type == "Trailer" || item.Type == "MusicArtist") {
+        if (item.Type == "Movie" || item.Type == "Trailer" || item.Type == "MusicArtist") {
             $('#countriesCollapsible', page).show();
         } else {
             $('#countriesCollapsible', page).hide();
@@ -318,7 +318,6 @@
 
         if (item.Type == "Movie" ||
             item.Type == "Trailer" ||
-            item.Type == "AdultVideo" ||
             item.Type == "Series" ||
             item.Type == "Game" ||
             item.Type == "BoxSet" ||
diff --git a/dashboard-ui/scripts/indexpage.js b/dashboard-ui/scripts/indexpage.js
index da9b61f320..149ee4aaee 100644
--- a/dashboard-ui/scripts/indexpage.js
+++ b/dashboard-ui/scripts/indexpage.js
@@ -47,7 +47,6 @@
                 case "trailers":
                     imgUrl = "css/images/items/folders/movies.png";
                     break;
-                case "adultvideos":
                 case "homevideos":
                     imgUrl = "css/images/items/folders/homevideos.png";
                     break;
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index 7d6ba2c0a1..0cc34a3987 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -227,7 +227,6 @@
             { name: Globalize.translate('FolderTypeHomeVideos'), value: "homevideos" },
             { name: Globalize.translate('FolderTypeMusicVideos'), value: "musicvideos" },
             { name: Globalize.translate('FolderTypePhotos'), value: "photos" },
-            { name: Globalize.translate('FolderTypeAdultVideos'), value: "adultvideos" },
             { name: Globalize.translate('FolderTypeMixed'), value: "mixed" }
         ];
 
diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js
index 6b9e624875..a5d254e138 100644
--- a/dashboard-ui/scripts/mediaplayer-video.js
+++ b/dashboard-ui/scripts/mediaplayer-video.js
@@ -880,7 +880,6 @@
             }
             else if (maxAllowedWidth >= 460) {
                 options.push({ name: '480p - 4Mbps', maxWidth: 720, bitrate: 4000000 });
-                options.push({ name: '480p - 3.5Mbps', maxWidth: 720, bitrate: 3500000 });
                 options.push({ name: '480p - 3Mbps', maxWidth: 720, bitrate: 3000000 });
                 options.push({ name: '480p - 2.5Mbps', maxWidth: 720, bitrate: 2500000 });
                 options.push({ name: '480p - 2Mbps', maxWidth: 720, bitrate: 2000000 });
diff --git a/dashboard-ui/scripts/metadataimagespage.js b/dashboard-ui/scripts/metadataimagespage.js
index bf1f144da3..b83e6172c3 100644
--- a/dashboard-ui/scripts/metadataimagespage.js
+++ b/dashboard-ui/scripts/metadataimagespage.js
@@ -414,7 +414,6 @@
             { name: 'OptionSongs', type: 'Audio' },
             { name: 'OptionHomeVideos', type: 'Video' },
             { name: 'OptionBooks', type: 'Book' },
-            { name: 'OptionAdultVideos', type: 'AdultVideo' },
             { name: 'OptionPeople', type: 'Person' }
             //{ name: 'Genres', type: 'Genre' },
             //{ name: 'Studios', type: 'Studio' }
diff --git a/dashboard-ui/scripts/mypreferenceslanguages.js b/dashboard-ui/scripts/mypreferenceslanguages.js
index e9688d2696..a3f2905fe9 100644
--- a/dashboard-ui/scripts/mypreferenceslanguages.js
+++ b/dashboard-ui/scripts/mypreferenceslanguages.js
@@ -29,10 +29,39 @@
 
         $('#selectSubtitlePlaybackMode', page).val(user.Configuration.SubtitleMode || "").selectmenu("refresh").trigger('change');
         $('#chkPlayDefaultAudioTrack', page).checked(user.Configuration.PlayDefaultAudioTrack || false).checkboxradio("refresh");
+        $('#chkEnableCinemaMode', page).checked(user.Configuration.EnableCinemaMode || false).checkboxradio("refresh");
 
         Dashboard.hideLoadingMsg();
     }
 
+    function loadPage(page) {
+
+        Dashboard.showLoadingMsg();
+
+        var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
+
+        var promise1 = ApiClient.getUser(userId);
+
+        var promise2 = Dashboard.getCurrentUser();
+
+        var allCulturesPromise = ApiClient.getCultures();
+
+        $.when(promise1, promise2).done(function (response1, response2) {
+
+            loadForm(page, response1[0] || response1, response2[0], allCulturesPromise);
+
+        });
+
+        ApiClient.getNamedConfiguration("cinemamode").done(function (cinemaConfig) {
+
+            if (cinemaConfig.EnableIntrosForMovies || cinemaConfig.EnableIntrosForEpisodes) {
+                $('.cinemaModeOptions', page).show();
+            } else {
+                $('.cinemaModeOptions', page).hide();
+            }
+        });
+    }
+
     function saveUser(page, user) {
 
         user.Configuration.AudioLanguagePreference = $('#selectAudioLanguage', page).val();
@@ -40,6 +69,7 @@
 
         user.Configuration.SubtitleMode = $('#selectSubtitlePlaybackMode', page).val();
         user.Configuration.PlayDefaultAudioTrack = $('#chkPlayDefaultAudioTrack', page).checked();
+        user.Configuration.EnableCinemaMode = $('#chkEnableCinemaMode', page).checked();
 
         ApiClient.updateUser(user).done(function () {
             Dashboard.alert(Globalize.translate('SettingsSaved'));
@@ -79,22 +109,7 @@
 
         var page = this;
 
-        Dashboard.showLoadingMsg();
-
-        var userId = getParameterByName('userId') || Dashboard.getCurrentUserId();
-
-        var promise1 = ApiClient.getUser(userId);
-
-        var promise2 = Dashboard.getCurrentUser();
-
-        var allCulturesPromise = ApiClient.getCultures();
-
-        $.when(promise1, promise2).done(function (response1, response2) {
-
-            loadForm(page, response1[0] || response1, response2[0], allCulturesPromise);
-
-        });
-
+        loadPage(page);
     });
 
     window.LanguagePreferencesPage = {
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index c1d2dbdd4b..52742e3343 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -513,7 +513,6 @@ var Dashboard = {
             html += '<form>';
 
             html += '<p><a data-mini="true" data-role="button" href="mypreferencesdisplay.html?userId=' + user.Id + '" data-icon="gear">' + Globalize.translate('ButtonMyPreferences') + '</button></a>';
-            html += '<p><a data-mini="true" data-role="button" href="useredit.html?userId=' + user.Id + '" data-icon="user">' + Globalize.translate('ButtonMyProfile') + '</button></a>';
             html += '<p><button data-mini="true" type="button" onclick="Dashboard.logout();" data-icon="lock">' + Globalize.translate('ButtonSignOut') + '</button></p>';
 
             html += '</form>';
diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js
index 5bbb7169ec..e376d12f74 100644
--- a/dashboard-ui/scripts/useredit.js
+++ b/dashboard-ui/scripts/useredit.js
@@ -21,7 +21,7 @@
         }
 
         if (user.Id && loggedInUser.Configuration.IsAdministrator) {
-            $('#fldConnectInfo', page).show();
+            $('#fldConnectInfo', page).hide();
         } else {
             $('#fldConnectInfo', page).hide();
         }
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index 4665526cf8..cf84523405 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -16,7 +16,7 @@
                 <div class="readOnlyContent">
                     <div>
                         <a data-role="button" data-icon="plus" href="useredit.html" data-inline="true">
-                            ${ButtonAddLocalUser}
+                            ${ButtonAddUser}
                         </a>
                         <!--<a data-role="button" data-icon="plus" href="useredit.html" data-inline="true">
                             ${ButtonInviteMediaBrowserUser}
diff --git a/packages.config b/packages.config
index d836251313..7a472fe0d0 100644
--- a/packages.config
+++ b/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MediaBrowser.ApiClient.Javascript" version="3.0.249" targetFramework="net45" />
-  <package id="WebMarkupMin.Core" version="0.9.3" targetFramework="net45" />
+  <package id="WebMarkupMin.Core" version="0.9.6" targetFramework="net45" />
 </packages>
\ No newline at end of file