diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html
index 06d3d5f919..4810f0187c 100644
--- a/dashboard-ui/autoorganizetv.html
+++ b/dashboard-ui/autoorganizetv.html
@@ -8,45 +8,51 @@
 
                 <p>${AutoOrganizeTvHelp}</p>
                 <div>
-                    <br />
-                    <paper-checkbox id="chkEnableTvSorting">${OptionEnableEpisodeOrganization}</paper-checkbox>
+                    <label class="checkboxContainer">
+                        <input type="checkbox" is="emby-checkbox" id="chkEnableTvSorting" />
+                        <span>${OptionEnableEpisodeOrganization}</span>
+                    </label>
                 </div>
-                <div>
-                    <paper-input id="txtWatchFolder" label="${LabelWatchFolder}" style="width:85%;display:inline-block;"></paper-input>
-                    <button type="button" is="paper-icon-button-light" id="btnSelectWatchFolder" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
-                    <div class="fieldDescription">
-                        <div>${LabelWatchFolderHelp}</div>
+                <div class="inputContainer">
+                    <div style="display:flex; align-items:center;">
+                        <div style="flex-grow:1;">
+                            <input is="emby-input" id="txtWatchFolder" type="text" label="${LabelWatchFolder}" />
+                            <div class="fieldDescription">${LabelWatchFolderHelp}</div>
+                        </div>
+                        <button type="button" is="emby-button" id="btnSelectWatchFolder" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                     </div>
                 </div>
-                <div>
-                    <paper-input type="number" id="txtMinFileSize" name="txtMinFileSize" label="${LabelMinFileSizeForOrganize}" pattern="[0-9]*" min="0" required></paper-input>
+                <div class="inputContainer">
+                    <input is="emby-input" id="txtMinFileSize" type="number" label="${LabelMinFileSizeForOrganize}" pattern="[0-9]*" min="0" required />
                     <div class="fieldDescription">${LabelMinFileSizeForOrganizeHelp}</div>
                 </div>
-                <div>
-                    <paper-input type="text" id="txtSeasonFolderPattern" name="txtSeasonFolderPattern" label="${LabelSeasonFolderPattern}" required></paper-input>
+                <div class="inputContainer">
+                    <input is="emby-input" id="txtSeasonFolderPattern" type="text" label="${LabelSeasonFolderPattern}" required />
                     <div class="fieldDescription seasonFolderFieldDescription"></div>
                 </div>
-                <div>
-                    <paper-input type="text" id="txtSeasonZeroName" name="txtSeasonZeroName" label="${LabelSeasonZeroFolderName}" required></paper-input>
-                </div><br />
+                <div class="inputContainer">
+                    <input is="emby-input" id="txtSeasonZeroName" type="text" label="${LabelSeasonZeroFolderName}" required />
+                    <div class="fieldDescription"></div>
+                </div>
+
+                <br />
 
                 <div is="emby-collapse" title="${HeaderEpisodeFilePattern}">
                     <div class="collapseContent">
                         <br />
-                        <div>
-                            <paper-input type="text" id="txtEpisodePattern" name="txtEpisodePattern" label="${LabelEpisodePattern}" required></paper-input>
+                        <div class="inputContainer">
+                            <input is="emby-input" id="txtEpisodePattern" type="text" label="${LabelEpisodePattern}" required />
                             <div class="fieldDescription episodePatternDescription"></div>
                         </div>
-                        <br />
-                        <div>
-                            <paper-input type="text" id="txtMultiEpisodePattern" name="txtMultiEpisodePattern" label="${LabelMultiEpisodePattern}" required></paper-input>
+                        <div class="inputContainer">
+                            <input is="emby-input" id="txtMultiEpisodePattern" type="text" label="${LabelMultiEpisodePattern}" required />
                             <div class="fieldDescription multiEpisodePatternDescription"></div>
                         </div>
 
                         <br />
                         <p>${HeaderSupportedPatterns}</p>
 
-                        <table data-role="table" id="movie-table" data-mode="reflow" class="ui-responsive">
+                        <table id="movie-table" class="ui-responsive">
                             <thead>
                                 <tr>
                                     <th>${HeaderTerm}</th>
@@ -126,28 +132,33 @@
                 </div>
 
                 <br /><br />
-                <div>
-                    <label for="copyOrMoveFile" class="selectLabel">${LabelTransferMethod}</label>
-                    <select id="copyOrMoveFile" data-mini="true">
+                <div class="selectContainer">
+                    <select is="emby-select" id="copyOrMoveFile" label="${LabelTransferMethod}">
                         <option value="true">${OptionCopy}</option>
                         <option value="false">${OptionMove}</option>
                     </select>
-                    <div class="fieldDescription">${LabelTransferMethodHelp}</div>
+                    <div class="fieldDescription editorfieldDescription">${LabelTransferMethodHelp}</div>
                 </div>
                 <div>
-                    <br />
-                    <paper-checkbox type="checkbox" id="chkOverwriteExistingEpisodes">${OptionOverwriteExistingEpisodes}</paper-checkbox>
+                    <label class="checkboxContainer">
+                        <input type="checkbox" is="emby-checkbox" id="chkOverwriteExistingEpisodes" />
+                        <span>${OptionOverwriteExistingEpisodes}</span>
+                    </label>
                 </div>
-                <div>
-                    <paper-input type="text" id="txtDeleteLeftOverFiles" name="txtDeleteLeftOverFiles" label="${LabelDeleteLeftOverFiles}"></paper-input>
+                <div class="inputContainer">
+                    <input is="emby-input" id="txtDeleteLeftOverFiles" type="text" label="${LabelDeleteLeftOverFiles}" />
                     <div class="fieldDescription">${LabelDeleteLeftOverFilesHelp}</div>
                 </div>
-                <div>
-                    <paper-checkbox id="chkDeleteEmptyFolders">${LabelDeleteEmptyFolders}</paper-checkbox>
-                    <div class="fieldDescription paperCheckboxFieldDescription">${LabelDeleteEmptyFoldersHelp}</div>
+                <div class="checkboxContainer checkboxContainer-withDescription">
+                    <label>
+                        <input type="checkbox" is="emby-checkbox" id="chkDeleteEmptyFolders" />
+                        <span>${LabelDeleteEmptyFolders}</span>
+                    </label>
+                    <div class="fieldDescription checkboxFieldDescription">${LabelDeleteEmptyFoldersHelp}</div>
+                </div>
+                <div>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
-
-                <div><button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button></div>
             </form>
 
         </div>
diff --git a/dashboard-ui/scripts/autoorganizesmart.js b/dashboard-ui/scripts/autoorganizesmart.js
index f1878dc3ca..5a411c2210 100644
--- a/dashboard-ui/scripts/autoorganizesmart.js
+++ b/dashboard-ui/scripts/autoorganizesmart.js
@@ -73,9 +73,13 @@
 
             html += '<div class="listItem">';
 
+            html += '<div class="listItemIconContainer">';
             html += '<i class="listItemIcon md-icon">folder</i>';
+            html += '</div>';
 
-            html += (info.DisplayName || info.ItemName);
+            html += '<div class="listItemBody">';
+            html += "<h2 class='listItemBodyText'>" + (info.DisplayName || info.ItemName) + "</h2>";
+            html += '</div>';
 
             html += '</div>';
 
@@ -84,15 +88,16 @@
             html += info.MatchStrings.map(function (m) {
 
                 var matchStringHtml = '';
+
                 matchStringHtml += '<div class="listItem">';
 
-                matchStringHtml += '<div class="listItemBody">';
+                matchStringHtml += '<div class="listItemBody" style="padding: .1em 1em .4em 5.5em; min-height: 1.5em;">';
 
                 matchStringHtml += "<div class='listItemBodyText secondary'>" + m + "</div>";
 
                 matchStringHtml += '</div>';
 
-                matchStringHtml += '<button type="button" is="paper-icon-button-light" class="btnDeleteMatchEntry" data-index="' + i + '" data-matchindex="' + matchStringIndex + '" title="' + Globalize.translate('ButtonDelete') + '"><i class="md-icon">delete</i></button>';
+                matchStringHtml += '<button type="button" is="emby-button" class="btnDeleteMatchEntry" style="padding: 0;" data-index="' + i + '" data-matchindex="' + matchStringIndex + '" title="' + Globalize.translate('ButtonDelete') + '"><i class="md-icon">delete</i></button>';
 
                 matchStringHtml += '</div>';
                 matchStringIndex++;
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 2226a98f6b..98f78b8830 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1913,7 +1913,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/autoorganizesmart.html',
-            dependencies: [],
+            dependencies: ['emby-button'],
             controller: 'scripts/autoorganizesmart',
             autoFocus: false,
             roles: 'admin'
@@ -1921,7 +1921,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/autoorganizetv.html',
-            dependencies: ['jqmtable', 'paper-input', 'paper-checkbox'],
+            dependencies: ['emby-checkbox', 'emby-input', 'emby-button', 'emby-select', 'emby-collapse'],
             controller: 'scripts/autoorganizetv',
             autoFocus: false,
             roles: 'admin'