diff --git a/src/components/subtitleeditor/subtitleeditor.template.html b/src/components/subtitleeditor/subtitleeditor.template.html
index 1b7027dbd1..84ae6da0e5 100644
--- a/src/components/subtitleeditor/subtitleeditor.template.html
+++ b/src/components/subtitleeditor/subtitleeditor.template.html
@@ -2,7 +2,7 @@
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
     <h3 class="formDialogHeaderTitle">${Subtitles}</h3>
 
-    <a is="emby-linkbutton" data-autohide="true" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216115510/https://github.com/MediaBrowser/Wiki/wiki/Subtitles" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${Help}"><i class="md-icon">&#xE88E;</i><span style="margin-left:.25em;">${Help}</span></a>
+    <a is="emby-linkbutton" data-autohide="true" class="button-link btnHelp flex align-items-center" href="https://jellyfin.readthedocs.io/en/latest/media/subtitles/" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${Help}"><i class="md-icon">&#xE88E;</i><span style="margin-left:.25em;">${Help}</span></a>
 
 </div>
 <div class="formDialogContent smoothScrollY">
diff --git a/src/components/tvproviders/schedulesdirect.template.html b/src/components/tvproviders/schedulesdirect.template.html
index db215328e5..49d8c37f87 100644
--- a/src/components/tvproviders/schedulesdirect.template.html
+++ b/src/components/tvproviders/schedulesdirect.template.html
@@ -1,7 +1,7 @@
 <div class="verticalSection">
     <div class="sectionTitleContainer flex align-items-center">
         <h1 class="sectionTitle">Schedules Direct</h1>
-        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Live-TV">${Help}</a>
+        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/live-tv/">${Help}</a>
     </div>
     <p class="createAccountHelp"></p>
 </div>
diff --git a/src/components/tvproviders/xmltv.template.html b/src/components/tvproviders/xmltv.template.html
index 89ca753a76..45172019c6 100644
--- a/src/components/tvproviders/xmltv.template.html
+++ b/src/components/tvproviders/xmltv.template.html
@@ -1,7 +1,7 @@
 <div class="verticalSection">
     <div class="sectionTitleContainer flex align-items-center">
         <h1 class="sectionTitle">Xml TV</h1>
-        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Live-TV">${Help}</a>
+        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/live-tv/">${Help}</a>
     </div>
 </div>
 
diff --git a/src/controllers/notificationsettings.js b/src/controllers/notificationsettings.js
index 092d92e24b..ebb8788412 100644
--- a/src/controllers/notificationsettings.js
+++ b/src/controllers/notificationsettings.js
@@ -22,7 +22,7 @@ define(["loading", "libraryMenu", "globalize", "listViewStyle", "emby-button"],
                     itemHtml += "</h2>";
                     if (showHelp) {
                         showHelp = false;
-                        itemHtml += '<a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Notifications">';
+                        itemHtml += '<a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/notifications/">';
                         itemHtml += globalize.translate("Help");
                         itemHtml += "</a>";
                     }
diff --git a/src/dashboardgeneral.html b/src/dashboardgeneral.html
index f41fc80d46..a285b0e55f 100644
--- a/src/dashboardgeneral.html
+++ b/src/dashboardgeneral.html
@@ -8,7 +8,7 @@
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="sectionTitle">${TabSettings}</h2>
-                        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Server-Settings">${Help}</a>
+                        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/settings/">${Help}</a>
                     </div>
                 </div>
 
diff --git a/src/device.html b/src/device.html
index da9610979d..b7a696fd7a 100644
--- a/src/device.html
+++ b/src/device.html
@@ -9,7 +9,7 @@
                 <div class="verticalSection verticalSection-extrabottompadding">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="sectionTitle reportedName"></h2>
-                        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Devices">${Help}</a>
+                        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/devices/">${Help}</a>
                     </div>
 
                     <div class="inputContainer">
diff --git a/src/devices.html b/src/devices.html
index 6997f42eda..3d8f4008d8 100644
--- a/src/devices.html
+++ b/src/devices.html
@@ -4,7 +4,7 @@
             <div class="verticalSection verticalSection">
                 <div class="sectionTitleContainer sectionTitleContainer-cards flex align-items-center">
                     <h2 class="sectionTitle sectionTitle-cards">${TabDevices}</h2>
-                    <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Devices">${Help}</a>
+                    <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/devices/">${Help}</a>
                 </div>
             </div>
 
diff --git a/src/encodingsettings.html b/src/encodingsettings.html
index 625088f569..6afde425a7 100644
--- a/src/encodingsettings.html
+++ b/src/encodingsettings.html
@@ -8,7 +8,7 @@
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="sectionTitle">${TabTranscoding}</h2>
-                        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Transcoding">${Help}</a>
+                        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/transcoding/">${Help}</a>
                     </div>
                 </div>
 
diff --git a/src/library.html b/src/library.html
index 0182fe5f15..23d83044da 100644
--- a/src/library.html
+++ b/src/library.html
@@ -9,7 +9,7 @@
                 </button>
                 <progress max="100" min="0" style="display: inline-block; vertical-align: middle;" class="refreshProgress"></progress>
 
-                <a is="emby-linkbutton" class="raised button-alt" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Library-setup">${Help}</a>
+                <a is="emby-linkbutton" class="raised button-alt" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/libraries/">${Help}</a>
             </div>
             <div id="divVirtualFolders"></div>
         </div>
diff --git a/src/livetvsettings.html b/src/livetvsettings.html
index ff8db2dd3c..6e91d1ce5b 100644
--- a/src/livetvsettings.html
+++ b/src/livetvsettings.html
@@ -4,7 +4,7 @@
             <div class="verticalSection">
                 <div class="sectionTitleContainer flex align-items-center">
                     <h2 class="sectionTitle">DVR</h2>
-                    <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki//Live-TV">${Help}</a>
+                    <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/live-tv/">${Help}</a>
                 </div>
             </div>
 
diff --git a/src/livetvstatus.html b/src/livetvstatus.html
index f6a0c8aeb2..f2e2b4c4bd 100644
--- a/src/livetvstatus.html
+++ b/src/livetvstatus.html
@@ -10,7 +10,7 @@
                         <button is="emby-button" type="button" class="fab btnAddDevice submit sectionTitleButton" style="margin-left:1em;" title="${ButtonAdd}">
                             <i class="md-icon">&#xE145;</i>
                         </button>
-                        <a style="margin-left:2em!important;" is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Live-TV">${Help}</a>
+                        <a style="margin-left:2em!important;" is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/live-tv/">${Help}</a>
                     </div>
                     <div class="devicesList itemsContainer vertical-wrap" data-hovermenu="false" data-multiselect="false" style="margin-top: .5em;"></div>
                 </div>
diff --git a/src/livetvtuner.html b/src/livetvtuner.html
index 71ddde77d7..8528bfd557 100644
--- a/src/livetvtuner.html
+++ b/src/livetvtuner.html
@@ -5,7 +5,7 @@
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h1 class="sectionTitle">${HeaderLiveTvTunerSetup}</h1>
-                        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Live-TV">${Help}</a>
+                        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/live-tv/">${Help}</a>
                     </div>
                 </div>
 
diff --git a/src/notificationsetting.html b/src/notificationsetting.html
index 74fc3b19ff..ffce9edbe6 100644
--- a/src/notificationsetting.html
+++ b/src/notificationsetting.html
@@ -8,7 +8,7 @@
                 <div class="verticalSection">
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="notificationType sectionTitle"></h2>
-                        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Notifications">${Help}</a>
+                        <a is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://jellyfin.readthedocs.io/en/latest/server/notifications/">${Help}</a>
                     </div>
                 </div>
 
diff --git a/src/scripts/medialibrarypage.js b/src/scripts/medialibrarypage.js
index 91123ec1e8..0240d565bc 100644
--- a/src/scripts/medialibrarypage.js
+++ b/src/scripts/medialibrarypage.js
@@ -190,14 +190,15 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
         }, {
             name: globalize.translate("FolderTypeMovies"),
             value: "movies",
-            message: getLink("MovieLibraryHelp", "https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Movie-naming")
+            message: getLink("MovieLibraryHelp", "https://jellyfin.readthedocs.io/en/latest/media/movies/")
         }, {
             name: globalize.translate("FolderTypeMusic"),
-            value: "music"
+            value: "music",
+            message: getLink("MovieLibraryHelp", "https://jellyfin.readthedocs.io/en/latest/media/music/")
         }, {
             name: globalize.translate("FolderTypeTvShows"),
             value: "tvshows",
-            message: getLink("TvLibraryHelp", "https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/TV-naming")
+            message: getLink("TvLibraryHelp", "https://jellyfin.readthedocs.io/en/latest/media/shows/")
         }, {
             name: globalize.translate("FolderTypeBooks"),
             value: "books",
diff --git a/src/wizardlibrary.html b/src/wizardlibrary.html
index cb7420c630..16dd9488a6 100644
--- a/src/wizardlibrary.html
+++ b/src/wizardlibrary.html
@@ -8,7 +8,7 @@
                 <h1 style="display:inline-block;">
                     ${HeaderSetupLibrary}
                 </h1>
-                <a href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Library-setup" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><button is="emby-button" type="button" class="raised"><i class="md-icon">info</i><span>${ButtonHelp}</span></button></a>
+                <a href="https://jellyfin.readthedocs.io/en/latest/server/libraries/" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><button is="emby-button" type="button" class="raised"><i class="md-icon">info</i><span>${ButtonHelp}</span></button></a>
             </div>
 
             <br />