v2.0.5-beta

Add sortcut to /status/sessions
Add total bandwidth to activity header
2017-12-31 17:52:53 -08:00 · 2017-12-31 17:37:07 -08:00 · 2017-12-31 17:13:38 -08:00 · 2017-12-31 17:12:49 -08:00 · 2017-12-31 14:41:32 -08:00 · 2017-12-31 14:33:21 -08:00
89 changed files with 2627 additions and 1641 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,68 @@
 # Changelog

+## v2.0.5-beta (2017-12-31)
+
+* Monitoring:
+  * Fix: IPv6 addresses overflowing on the activity cards.
+* Notifications:
+  * Fix: Error sending Join notifications.
+* UI:
+  * New: Added total required bandwidth in the activity header.
+  * Fix: Failing to retrieve releases from GitHub.
+* Other:
+  * Fix: CherryPy SSL connection warning. (Thanks @felixbuenemann)
+  * Fix: Sanitize script output in logs.
+  * Change: Login sessions persists across server restarts.
+
+
+## v2.0.4-beta (2017-12-29)
+
+* Monitoring:
+  * Fix: Current activity cards duplicating on the homepage.
+* Notifications:
+  * Fix: Concurrent stream notifications being sent when there is an incorrect number of streams.
+* UI:
+  * New: Info pages for collections.
+  * New: Button to test Plex Web URL override.
+  * Fix: Library and User pages return to the correct tab when pressing back.
+
+
+## v2.0.3-beta (2017-12-25)
+
+* Monitoring:
+  * Fix: Missing sync ID error causing logging to crash.
+  * Fix: Incorrect optimized version title column name causing logging to crash.
+* Notifications:
+  * Fix: Report correct beta version for Tautulli update notifications.
+* UI:
+  * Fix: Missing CSS for stream info modal.
+
+
+## v2.0.2-beta (2017-12-24)
+
+* Monitoring:
+  * Fix: Websocket connection fails to start with existing streams when upgrading to v2.
+  * Fix: Long request URI for refreshing current activity on the homepage.
+  * Fix: Missing subtitle database columns.
+  * Fix: Details for synced and optimized versions reporting incorrectly.
+* Notifications:
+  * Fix: Recently added notifications sending for previously added items. It is now limited to past 24 hours only.
+  * Fix: Source video/audio/subtitle parameters showing up as blank.
+  * Change: Validate condition logic when saving a notification agent.
+* API:
+  * Change: API is enabled by default on new installs.
+* UI:
+  * New: Add logo svg files. (Thanks @Fish2)
+  * New: Updated stream info modal.
+  * Change: Media info tables sort by sort title instead of title.
+* Other:
+  * Fix: Updating library IDs message on libraries page.
+  * Fix: Wtched percentage settings not saving after restart.
+  * Remove: Video Preview Thumbnails setting no longer used.
+  * Change: Add back HTTP Proxy setting under the Web Interface settings tab.
+  * Change: "Group Table and Watch Statistics History" and "Current Activity in History Tables" enabled by default on new installs.
+
+
 ## v2.0.1-beta (2017-12-19)

 * Monitoring:
--- a/data/interfaces/default/base.html
+++ b/data/interfaces/default/base.html
@@ -20,28 +20,21 @@
    ${next.headIncludes()}

    <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.0.0">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.0.0">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.0.0">
+    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.0.5">
+    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.0.5">
+    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.0.5">

    <!-- ICONS -->
-    <!-- Android >M39 icon -->
-    <link rel="icon" type="image/png" sizes="192x192" href="${http_root}images/favicon/android-chrome-192x192.png?v=2.0.0">
-    <link rel="manifest" href="${http_root}json/Android-manifest.json?v=2.0.0">
-    <meta name="theme-color" content="#1f1f1f">
+    <!-- Android -->
+    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.0.5">
+    <meta name="theme-color" content="#282a2d">
    <!-- Apple -->
-    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.0.0">
-    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.0.0" color="#1f1f1f">
+    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.0.5">
+    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.0.5" color="#282a2d">
    <meta name="apple-mobile-web-app-title" content="Tautulli">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="viewport" content="initial-scale=1">
-    <meta name="format-detection" content="telephone=no">
-    <!-- IE10 icon -->
+    <!-- Microsoft -->
    <meta name="application-name" content="Tautulli">
-    <meta name="msapplication-TileColor" content="#1f1f1f">
-    <meta name="msapplication-TileImage" content="${http_root}images/favicon/mstile-144x144.png?v=2.0.0">
-    <meta name="msapplication-config" content="${http_root}xml/IEconfig.xml?v=2.0.0" />
+    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.0.5">
 </head>

 <body class="content">
@@ -71,8 +64,8 @@
                    <span class="icon-bar"></span>
                    <span class="icon-bar"></span>
                </button>
-                <a class="navbar-brand" href="home">
-                    <img alt="Tautulli" src="${http_root}images/logo-tautulli-50.png" height="40">
+                <a class="navbar-brand svg" href="home">
+                    <object data="${http_root}images/logo-tautulli.svg" type="image/svg+xml" style="height: 45px;"></object>
                </a>
            </div>
            <div class="collapse navbar-collapse navbar-right" id="navbar-collapse-1">
--- a/data/interfaces/default/configuration_table.html
+++ b/data/interfaces/default/configuration_table.html
@@ -74,11 +74,11 @@ DOCUMENTATION :: END
        <tr>
            <td class="top-line">Resources:</td>
            <td class="top-line">
-                <a id="source-link" class="no-highlight" href="${anon_url('https://github.com/%s/plexpy' % plexpy.CONFIG.GIT_USER)}" target="_blank">GitHub Source</a> | 
+                <a class="no-highlight" href="${anon_url('http://tautulli.com')}" target="_blank">Tautulli Website</a> |
+                <a class="no-highlight" href="${anon_url('https://github.com/%s/plexpy' % plexpy.CONFIG.GIT_USER)}" target="_blank">GitHub Source</a> |
                <a class="no-highlight guidelines-modal-link" href="${anon_url('https://github.com/%s/plexpy/issues' % plexpy.CONFIG.GIT_USER)}" data-id="issue">GitHub Issues</a> |
-                <a class="no-highlight guidelines-modal-link" href="${anon_url('http://feathub.com/%s/plexpy' % plexpy.CONFIG.GIT_USER)}" data-id="feature request">FeatHub Feature Requests</a> | 
-                <a class="no-highlight" href="${anon_url('https://github.com/%s/plexpy/wiki' % plexpy.CONFIG.GIT_USER)}" target="_blank">Tautulli Wiki</a> |
-                <a id="faq-source-link" class="no-highlight" href="${anon_url('https://github.com/%s/plexpy/wiki/Frequently-Asked-Questions-(FAQ)' % plexpy.CONFIG.GIT_USER)}" target="_blank">Tautulli FAQ</a>
+                <a class="no-highlight" href="${anon_url('https://github.com/%s/plexpy/wiki' % plexpy.CONFIG.GIT_USER)}" target="_blank">GitHub Wiki &amp; FAQ</a> |
+                <a class="no-highlight guidelines-modal-link" href="${anon_url('http://feathub.com/%s/plexpy' % plexpy.CONFIG.GIT_USER)}" data-id="feature request">FeatHub Feature Requests</a> |
            </td>
        </tr>
        <tr>
@@ -112,7 +112,6 @@ DOCUMENTATION :: END

        $('.guidelines-modal-link').on('click', function (e) {
            e.preventDefault();
-            $('#guidelines-link').attr('href', $('#source-link').attr('href'));
            $('#guidelines-type').text($(this).data('id'))
            $('#guidelines-modal').modal();
            $('#guidelines-continue').attr('href', $(this).attr('href')).on('click', function () {
@@ -121,7 +120,6 @@ DOCUMENTATION :: END
        });
        $('.support-modal-link').on('click', function (e) {
            e.preventDefault();
-            $('#faq-link').attr('href', $('#faq-source-link').attr('href'));
            $('#support-modal').modal();
            $('#support-continue').attr('href', $(this).attr('href')).on('click', function () {
                $('#support-modal').modal('hide');
--- a/data/interfaces/default/css/plexpy.css
+++ b/data/interfaces/default/css/plexpy.css
@@ -13,6 +13,18 @@ a:focus {
    text-decoration: none;
    outline: none;
 }
+a.svg {
+  position: relative;
+  display: inline-block;
+}
+a.svg:after {
+  content: "";
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+}
 select, .react-selectize.bootstrap3.root-node .react-selectize-control {
    margin: 5px 0 5px 0;
    border: 2px solid #444;
@@ -113,7 +125,7 @@ img {
    box-shadow: 0 0 0 3px rgba(0,0,0,.2);
 }
 .navbar-brand {
-    padding: 5px 5px;
+    padding: 3px 3px;
 }
 .nav > li > a {
    color: #999;
@@ -841,6 +853,15 @@ a .users-poster-face:hover {
    -webkit-flex-grow: 1;
    flex-grow: 1;
 }
+.dashboard-activity-info-item .sub-value .ip-container {
+    display: inline-flex;
+}
+.dashboard-activity-info-item .sub-value .ip-address {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 140px;
+}
 .dashboard-activity-info-time {
    position: absolute;
    top: 200px;
@@ -899,15 +920,15 @@ a .users-poster-face:hover {
    height: 249px;
 }
 .dashboard-activity-container:hover .dashboard-activity-progress {
-	height: 14px; 
+	height: 14px;
 }
-.dashboard-activity-container:hover .progress-bar { 
+.dashboard-activity-container:hover .progress-bar {
    color: rgba(255, 255, 255, 1);
    background-image: -webkit-linear-gradient(left,rgba(0,0,0,0.25),0%,rgba(0,0,0,0),50px);
    background-image: -moz-linear-gradient(left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px);
    background-image: linear-gradient(to left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px);
 }
-.dashboard-activity-container:hover .buffer-bar { 
+.dashboard-activity-container:hover .buffer-bar {
    color: rgba(255, 255, 255, 1);
    background-image: -webkit-linear-gradient(left,rgba(0,0,0,0.25),0%,rgba(0,0,0,0),50px);
    background-image: -moz-linear-gradient(left,rgba(0,0,0,0.25) 0%,rgba(0,0,0,0) 50px);
@@ -1808,7 +1829,8 @@ a:hover .summary-poster-face-track .summary-poster-face-overlay span {
    margin-left: 2px;
    color: #999;
 }
-#children-list, #search-results-list {
+.children-list,
+.search-results-list {
    position: relative;
    z-index: 0;
 }
@@ -1874,15 +1896,15 @@ a:hover .item-children-poster {
    box-shadow: 0 0 4px rgba(0,0,0,.3),inset 0 0 0 1px rgba(255,255,255,.1);
    z-index: -2;
 }
-.item-children-poster-face.season-poster {
+.item-children-poster-face.poster-item {
    width: 150px;
    height: 225px;
 }
-.item-children-poster-face.episode-poster {
+.item-children-poster-face.episode-item {
    width: 250px;
    height: 140px;
 }
-.item-children-poster-face.album-poster {
+.item-children-poster-face.cover-item {
    width: 150px;
    height: 150px;
 }
@@ -1915,15 +1937,13 @@ a:hover .item-children-poster {
    margin-bottom: 20px;
    clear: both;
 }
-.item-children-instance-text-wrapper.season-item {
+.item-children-instance-text-wrapper.poster-item,
+.item-children-instance-text-wrapper.cover-item {
    width: 150px;
 }
 .item-children-instance-text-wrapper.episode-item {
    width: 250px;
 }
-.item-children-instance-text-wrapper.album-item {
-    width: 150px;
-}
 .item-children-instance-text-wrapper h3 {
    width: 100%;
    padding: 5px 3px 0 3px;
@@ -3155,8 +3175,8 @@ pre::-webkit-scrollbar-thumb {
    background-color: rgba(0,0,0,.15);
 }

-@media only screen 
-  and (min-device-width: 300px) 
+@media only screen
+  and (min-device-width: 300px)
  and (max-device-width: 450px) {
    .home-platforms-instance {
        width: calc(100% - 20px);
@@ -3578,6 +3598,10 @@ a:hover .overlay-refresh-image:hover {
    background-color: #10a4e8;
    background-image: url(../images/platforms/chromecast.svg);
 }
+.platform-default {
+    background-color: #e5a00d;
+    background-image: url(../images/platforms/default.svg);
+}
 .platform-dlna {
    background-color: #0cb14b;
    background-image: url(../images/platforms/dlna.svg);
@@ -3586,6 +3610,10 @@ a:hover .overlay-refresh-image:hover {
    background-color: #e67817;
    background-image: url(../images/platforms/firefox.svg);
 }
+.platform-gtv {
+    background-color: #008bcf;
+    background-image: url(../images/platforms/gtv.svg);
+}
 .platform-ie {
    background-color: #00599e;
    background-image: url(../images/platforms/ie.svg);
@@ -3602,6 +3630,10 @@ a:hover .overlay-refresh-image:hover {
    background-color: #1793d0;
    background-image: url(../images/platforms/linux.svg);
 }
+.platform-macos {
+    background-color: #858487;
+    background-image: url(../images/platforms/macos.svg);
+}
 .platform-msedge {
    background-color: #0078d7;
    background-image: url(../images/platforms/msedge.svg);
@@ -3622,10 +3654,6 @@ a:hover .overlay-refresh-image:hover {
    background-color: #e5a00d;
    background-image: url(../images/platforms/plexamp.svg);
 }
-.platform-plextogether {
-    background-color: #151924;
-    background-image: url(../images/platforms/plextogether.svg);
-}
 .platform-roku {
    background-color: #6d3c97;
    background-image: url(../images/platforms/roku.svg);
@@ -3638,6 +3666,18 @@ a:hover .overlay-refresh-image:hover {
    background-color: #034ea2;
    background-image: url(../images/platforms/samsung.svg);
 }
+.platform-synclounge {
+    background-color: #151924;
+    background-image: url(../images/platforms/synclounge.svg);
+}
+.platform-tivo {
+    background-color: #00a7e1;
+    background-image: url(../images/platforms/tivo.svg);
+}
+.platform-wiiu {
+    background-color: #03a9f4;
+    background-image: url(../images/platforms/wiiu.svg);
+}
 .platform-windows {
    background-color: #2fc0f5;
    background-image: url(../images/platforms/windows.svg);
@@ -3646,10 +3686,6 @@ a:hover .overlay-refresh-image:hover {
    background-color: #68217a;
    background-image: url(../images/platforms/windows.svg);
 }
-.platform-wiiu {
-    background-color: #03a9f4;
-    background-image: url(../images/platforms/wiiu.svg);
-}
 .platform-xbmc {
    background-color: #3b4872;
    background-image: url(../images/platforms/xbmc.svg);
@@ -3658,10 +3694,6 @@ a:hover .overlay-refresh-image:hover {
    background-color: #107c10;
    background-image: url(../images/platforms/xbox.svg);
 }
-.platform-default {
-    background-color: #e5a00d;
-    background-image: url(../images/platforms/default.svg);
-}
 .library-movie {
    background-image: url(../images/libraries/movie.svg);
 }
@@ -3686,4 +3718,75 @@ a:hover .overlay-refresh-image:hover {
 }
 .no-image {
    background-image: none !important;
-}
+}
+
+#info-modal .stream-info-item {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: baseline;
+    width: 100%;
+    margin-bottom: 5px;
+}
+#info-modal .stream-info-item .sub-heading {
+    height: 100%;
+    width: 75px;
+    color: #aaa;
+    font-size: 10px;
+    text-align: right;
+    text-transform: uppercase;
+    line-height: 14px;
+    -webkit-flex-shrink: 0;
+    flex-shrink: 0;
+}
+#info-modal .stream-info-item .sub-value {
+    color: #fff;
+    font-weight: bold;
+    margin-left: 10px;
+    text-align: left;
+    line-height: 14px;
+    -webkit-flex-grow: 1;
+    flex-grow: 1;
+}
+.stream-info {
+    width: 100%;
+    margin-top: 10px;
+    background-color: #282828;
+    table-layout: fixed;
+}
+.stream-info .heading {
+    color: #F9AA03;
+    text-transform: uppercase;
+    font-size: 15px;
+    font-weight: bold !important;
+}
+.stream-info th:first-child {
+    width: 125px;
+    height: 30px;
+    color: #fff;
+    font-size: 12px;
+    text-align: right;
+    text-transform: uppercase;
+}
+.stream-info th:not(:first-child) {
+    text-align: center;
+    font-weight: normal;
+}
+.stream-info td {
+    height: 25px;
+}
+.stream-info td:first-child {
+    color: #aaa;
+    font-size: 10px;
+    text-align: right;
+    text-transform: uppercase;
+}
+.stream-info td:not(:first-child) {
+    text-align: center;
+}
+.stream-info tr:nth-child(odd) td {
+    background-color: rgba(255,255,255,0.035);
+}
+.stream-info tr:nth-child(even) td {
+    background-color: rgba(255,255,255,0.010);
+}
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -72,7 +72,7 @@ DOCUMENTATION :: END
     data-rating_key="${data['rating_key']}" data-parent_rating_key="${data['parent_rating_key']}" data-grandparent_rating_key="${data['grandparent_rating_key']}">
    <div class="dashboard-activity-container">
        <div class="dashboard-activity-background-overlay">
-            % if data['channel_stream'] == '0':
+            % if data['channel_stream'] == 0:
            <div id="background-${sk}" class="dashboard-activity-background" style="background-image: url(pms_image_proxy?img=${data['art']}&width=500&height=280&fallback=art&refresh=true);"></div>
            % else:
                % if (data['art'] and data['art'].startswith('http')) or (data['thumb'] and data['thumb'].startswith('http')):
@@ -86,7 +86,7 @@ DOCUMENTATION :: END
                % if data['media_type'] == 'track':
                <div id="poster-${sk}-bg" class="dashboard-activity-poster-blur" style="background-image: url(pms_image_proxy?img=${data['parent_thumb']}&width=300&height=300&fallback=cover&refresh=true);"></div>
                % endif
-                % if data['channel_stream'] == '0':
+                % if data['channel_stream'] == 0:
                    % if data['media_type'] == 'movie':
                    <a id="poster-url-${sk}" href="info?rating_key=${data['rating_key']}" title="${data['title']}">
                        <div id="poster-${sk}" class="dashboard-activity-poster" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=300&height=450&fallback=poster&refresh=true);"></div>
@@ -158,11 +158,19 @@ DOCUMENTATION :: END
                                    % endif
                                </div>
                            </li>
-                            % if data['optimized_version'] == '1':
+                            % if data['optimized_version'] == 1:
                            <li class="dashboard-activity-info-item">
                                <div class="sub-heading">Optimized</div>
                                <div class="sub-value" id="optimized_version-${sk}">
-                                    ${data['optimized_version_profile']}
+                                    ${data['optimized_version_profile']} (${data['optimized_version_title']})
+                                </div>
+                            </li>
+                            % endif
+                            % if data['synced_version'] == 1:
+                            <li class="dashboard-activity-info-item">
+                                <div class="sub-heading">Synced</div>
+                                <div class="sub-value" id="synced_version-${sk}">
+                                    ${data['synced_version_profile']}
                                </div>
                            </li>
                            % endif
@@ -170,14 +178,14 @@ DOCUMENTATION :: END
                        <ul class="list-unstyled dashboard-activity-info-list">
                            <li class="dashboard-activity-info-item">
                                % if _session['user_group'] == 'admin':
-                                <div class="sub-heading"><span class="raw-stream-info-modal" data-toggle="modal" data-target="#raw-stream-info-modal" data-key="${sk}">Stream</span></div>\
+                                <div class="sub-heading"><span class="raw-stream-info-modal" data-toggle="modal" data-target="#raw-stream-info-modal" data-key="${sk}">Stream</span></div>
                                % else:
                                <div class="sub-heading">Stream</div>
                                % endif
                                <div class="sub-value" id="transcode_decision-${sk}">
                                    % if data['transcode_decision'] == 'transcode':
                                    Transcode
-                                        % if data['transcode_throttled'] == '1':
+                                        % if data['transcode_throttled'] == 1:
                                        (Throttled)
                                        % else:
                                        (Speed: ${data['transcode_speed']})
@@ -185,7 +193,7 @@ DOCUMENTATION :: END
                                    % elif data['transcode_decision'] == 'copy':
                                    Direct Stream
                                    % else:
-                                    Direct Play ${'(Synced)' if data['synced_version'] == '1' else ''}
+                                    Direct Play
                                    % endif
                                </div>
                            </li>
@@ -207,9 +215,9 @@ DOCUMENTATION :: END
                                        % if data.get('stream_video_decision') == 'transcode':
                                        <%
                                            hw_d = hw_e = ''
-                                            if data['transcode_hw_requested'] == '1' and data['transcode_hw_full_pipeline'] == '0':
+                                            if data['transcode_hw_requested'] == 1 and data['transcode_hw_full_pipeline'] == 0:
                                                hw_d = ' (HW)'
-                                            elif data['transcode_hw_requested'] == '1' and data['transcode_hw_full_pipeline'] == '1':
+                                            elif data['transcode_hw_requested'] == 1 and data['transcode_hw_full_pipeline'] == 1:
                                                hw_d = hw_e = ' (HW)'
                                        %>
                                        Transcode (${data['video_codec'].upper()}${hw_d} ${plexpy.common.VIDEO_RESOLUTION_OVERRIDES.get(data['video_resolution'], data['video_resolution'])} &rarr; ${data['stream_video_codec'].upper()}${hw_e} ${plexpy.common.VIDEO_RESOLUTION_OVERRIDES.get(data['stream_video_resolution'], data['stream_video_resolution'])})
@@ -242,7 +250,7 @@ DOCUMENTATION :: END
                            <li class="dashboard-activity-info-item">
                                <div class="sub-heading">Subtitle</div>
                                <div class="sub-value" id="subtitle_decision-${sk}">
-                                    % if data['subtitles'] == '1':
+                                    % if data['subtitles'] == 1:
                                        % if data['stream_subtitle_decision'] == 'transcode':
                                        Transcode (${data['subtitle_codec'].upper()} &rarr; ${data['stream_subtitle_codec'].upper()})
                                        % elif data['stream_subtitle_decision'] == 'copy':
@@ -250,7 +258,7 @@ DOCUMENTATION :: END
                                        % elif data['stream_subtitle_decision'] == 'burn':
                                        Burn (${data['subtitle_codec'].upper()})
                                        % else:
-                                        Direct Play (${data['subtitle_codec'].upper()})
+                                        Direct Play (${data['stream_subtitle_codec'].upper() if data['synced_version'] else data['subtitle_codec'].upper()})
                                        % endif
                                    % else:
                                    None
@@ -264,9 +272,9 @@ DOCUMENTATION :: END
                                <div class="sub-heading">Location</div>
                                <div class="sub-value">
                                    % if data['ip_address'] != 'N/A':
-                                    ${'LAN' if data['local'] == '1' else 'WAN'}: ${data['ip_address']} 
+                                    ${'LAN' if data['local'] == 1 else 'WAN'}: <span class="ip-container"><span class="ip-address">${data['ip_address']}</span></span>
                                    <a href="#" class="external_ip-modal" data-toggle="modal" data-target="#ip-info-modal" data-ip="${data['ip_address']}">
-                                        <span id="external_ip-${sk}" class="external-ip-tooltip" data-toggle="tooltip" title="Lookup IP" style="display: none;"><i class="fa fa-map-marker"></i></span>
+                                        <span id="external_ip-${sk}" class="external-ip-tooltip" data-toggle="tooltip" title="Lookup External IP" style="display: none;"><i class="fa fa-map-marker"></i></span>
                                    </a>
                                    <script>
                                        isPrivateIP("${data['ip_address']}").then(function () {
@@ -293,8 +301,8 @@ DOCUMENTATION :: END
                                                bw = str(bw) + ' kbps'
                                    %>
                                    <span id="stream-bandwidth-${sk}">${bw}</span>
-                                    <span id="streaming-brain-${sk}" data-toggle="tooltip" title="Streaming Brain Estimate"><i class="fa fa-info-circle"></i></span>
-                                    % elif data['synced_version'] == '1' or data['channel_stream'] == '1':
+                                    <span id="streaming-brain-${sk}" data-toggle="tooltip" title="Streaming Brain Estimate (Required Bandwidth)"><i class="fa fa-info-circle"></i></span>
+                                    % elif data['synced_version'] == 1 or data['channel_stream'] == 1:
                                    <span id="stream-bandwidth-${sk}">None</span>
                                    % else:
                                    <span id="stream-bandwidth-${sk}">Unknown</span>
@@ -358,7 +366,7 @@ DOCUMENTATION :: END
                % endif
            </div>
            <div class="dashboard-activity-metadata-title">
-                % if data['channel_stream'] == '0':
+                % if data['channel_stream'] == 0:
                % if data['media_type'] == 'movie':
                <a href="info?rating_key=${data['rating_key']}" title="${data['title']}">${data['title']}</a>
                % elif data['media_type'] == 'episode':
@@ -383,7 +391,7 @@ DOCUMENTATION :: END
            </div>
        </div>
        <div class="dashboard-activity-metadata-subtitle-container">
-            % if data['channel_stream'] == '0':
+            % if data['channel_stream'] == 0:
            <div id="media-type-${sk}" class="dashboard-activity-metadata-media_type-icon" title="${data['media_type'].capitalize()}">
                % if data['media_type'] == 'movie':
                <i class="fa fa-fw fa-film"></i>&nbsp;
@@ -403,7 +411,7 @@ DOCUMENTATION :: END
            </div>
            % endif
            <div class="dashboard-activity-metadata-subtitle">
-                % if data['channel_stream'] == '0':
+                % if data['channel_stream'] == 0:
                    % if data['media_type'] == 'movie':
                    <span title="${data['year']}" class="sub-heading">${data['year']}</span>
                    % elif data['media_type'] == 'episode':
--- a/data/interfaces/default/images/13AD46AC.png
+++ b/data/interfaces/default/images/13AD46AC.png
--- a/data/interfaces/default/images/13AD46AD.png
+++ b/data/interfaces/default/images/13AD46AD.png
--- a/data/interfaces/default/images/93124B54.png
+++ b/data/interfaces/default/images/93124B54.png
--- a/data/interfaces/default/images/93124B55.png
+++ b/data/interfaces/default/images/93124B55.png
--- a/data/interfaces/default/images/favicon/android-chrome-192x192.png
+++ b/data/interfaces/default/images/favicon/android-chrome-192x192.png
--- a/data/interfaces/default/images/favicon/android-chrome-256x256.png
+++ b/data/interfaces/default/images/favicon/android-chrome-256x256.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-120x120-precomposed.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-120x120-precomposed.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-120x120.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-120x120.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-152x152-precomposed.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-152x152-precomposed.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-152x152.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-152x152.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-180x180-precomposed.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-180x180-precomposed.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-180x180.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-180x180.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-60x60-precomposed.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-60x60-precomposed.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-60x60.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-60x60.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-76x76-precomposed.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-76x76-precomposed.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-76x76.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-76x76.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon-precomposed.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon-precomposed.png
--- a/data/interfaces/default/images/favicon/apple-touch-icon.png
+++ b/data/interfaces/default/images/favicon/apple-touch-icon.png
--- a/data/interfaces/default/images/favicon/browserconfig.xml
+++ b/data/interfaces/default/images/favicon/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="${http_root}images/favicon/mstile-150x150.png?v=2.0.5"/>
+            <TileColor>#282a2d</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
--- a/data/interfaces/default/images/favicon/favicon-16x16.png
+++ b/data/interfaces/default/images/favicon/favicon-16x16.png
--- a/data/interfaces/default/images/favicon/favicon-32x32.png
+++ b/data/interfaces/default/images/favicon/favicon-32x32.png
--- a/data/interfaces/default/images/favicon/favicon.ico
+++ b/data/interfaces/default/images/favicon/favicon.ico
--- a/data/interfaces/default/images/favicon/manifest.json
+++ b/data/interfaces/default/images/favicon/manifest.json
@@ -2,17 +2,17 @@
    "name": "Tautulli",
    "icons": [
        {
-            "src": "${http_root}images/favicon/android-chrome-192x192.png?v=2.0.0",
+            "src": "${http_root}images/favicon/android-chrome-192x192.png?v=2.0.5",
            "sizes": "192x192",
            "type": "image/png"
        },
        {
-            "src": "${http_root}images/favicon/android-chrome-256x256.png?v=2.0.0",
+            "src": "${http_root}images/favicon/android-chrome-256x256.png?v=2.0.5",
            "sizes": "256x256",
            "type": "image/png"
        }
    ],
-    "theme_color": "#1f1f1f",
-    "background_color": "#1f1f1f",
+    "theme_color": "#282a2d",
+    "background_color": "#282a2d",
    "display": "standalone"
 }
--- a/data/interfaces/default/images/favicon/mstile-144x144.png
+++ b/data/interfaces/default/images/favicon/mstile-144x144.png
--- a/data/interfaces/default/images/favicon/mstile-150x150.png
+++ b/data/interfaces/default/images/favicon/mstile-150x150.png
--- a/data/interfaces/default/images/favicon/mstile-310x310.png
+++ b/data/interfaces/default/images/favicon/mstile-310x310.png
--- a/data/interfaces/default/images/favicon/mstile-70x70.png
+++ b/data/interfaces/default/images/favicon/mstile-70x70.png
--- a/data/interfaces/default/images/favicon/safari-pinned-tab.svg
+++ b/data/interfaces/default/images/favicon/safari-pinned-tab.svg
@@ -1,70 +1 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="275.000000pt" height="275.000000pt" viewBox="0 0 275.000000 275.000000"
- preserveAspectRatio="xMidYMid meet">
-<metadata>
-Created by potrace 1.11, written by Peter Selinger 2001-2013
-</metadata>
-<g transform="translate(0.000000,275.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M2200 2569 c0 -4 -12 -11 -27 -17 -57 -20 -143 -130 -149 -187 -7
-82 -6 -105 6 -140 7 -22 23 -56 36 -75 13 -19 20 -37 16 -40 -5 -3 -11 -13
-15 -23 -4 -11 -12 -15 -19 -11 -7 4 -10 4 -6 -1 10 -11 -20 -65 -37 -65 -8 0
-12 -6 -9 -14 3 -7 -2 -16 -11 -20 -9 -3 -14 -10 -11 -15 4 -5 -5 -18 -19 -30
-15 -11 -26 -23 -27 -28 0 -4 -4 -7 -9 -6 -4 2 -6 -3 -4 -10 3 -6 -6 -24 -20
-39 -14 -16 -23 -28 -20 -28 4 0 0 -7 -7 -15 -30 -33 -38 -45 -38 -55 0 -5 -4
-10 -8 -10 -5 0 -17 -16 -28 -35 -10 -19 -22 -35 -26 -35 -5 0 -8 -5 -8 -10 0
-10 -8 -22 -37 -55 -7 -7 -13 -17 -13 -22 0 -5 -13 -23 -30 -41 -16 -18 -31
-36 -32 -40 -2 -4 -6 -6 -10 -5 -4 2 -4 -5 -1 -14 4 -10 2 -14 -4 -10 -6 4
-13 -3 -17 -16 -3 -12 -16 -34 -30 -48 -14 -15 -22 -29 -19 -33 3 -3 -2 -8
-11 -12 -9 -3 -16 -12 -16 -19 0 -6 -11 -24 -25 -39 -13 -14 -24 -30 -24 -33
-0 -4 -5 -9 -12 -12 -6 -2 -9 1 -6 6 3 5 -2 9 -12 8 -10 0 -45 2 -79 5 -34 3
-62 2 -62 -2 0 -4 -7 -8 -15 -8 -21 0 -95 -33 -95 -43 0 -4 -5 -5 -12 -1 -7 5
-8 3 -4 -5 5 -8 0 -14 -13 -18 -11 -3 -18 -9 -15 -14 3 -5 1 -9 -4 -9 -8 0
-43 -60 -48 -82 -1 -5 -3 -10 -4 -13 -1 -3 -4 -9 -5 -15 -1 -5 -4 -13 -5 -17
-1 -5 -1 -17 0 -28 1 -16 -5 -13 -28 15 -17 19 -28 38 -25 43 2 4 1 6 -4 5
-14 -5 -114 112 -107 124 4 6 3 8 -3 5 -5 -3 -44 33 -85 81 -42 48 -90 103
-107 122 -55 61 -72 88 -61 95 34 21 50 139 30 210 -6 22 -12 48 -13 57 -1 9
-5 14 -9 12 -4 -3 -8 -2 -8 3 0 17 -70 84 -110 104 -26 14 -67 24 -110 27 -57
-4 -76 1 -121 -20 -30 -14 -67 -38 -83 -54 -33 -34 -70 -84 -61 -84 3 0 -1 -10
-9 -22 -23 -37 -18 -147 8 -205 61 -130 212 -195 343 -149 38 13 41 13 59 -7
-10 -12 17 -23 15 -25 -1 -2 8 -13 21 -24 13 -11 22 -25 20 -32 -2 -6 -1 -8 3
-4 7 7 35 -15 35 -27 0 -4 14 -20 30 -35 17 -15 30 -32 30 -38 0 -5 7 -13 16
-16 8 -3 12 -11 8 -17 -4 -7 -3 -9 3 -6 11 7 49 -42 45 -56 -1 -5 1 -6 6 -3 8
-5 49 -35 43 -43 -1 -2 4 -8 13 -13 9 -5 13 -14 10 -20 -4 -6 -3 -8 3 -5 11 7
-45 -28 36 -37 -4 -3 2 -6 12 -6 10 0 15 -3 12 -6 -4 -4 4 -16 17 -28 13 -12
-31 -33 40 -47 15 -24 15 -27 0 -33 -8 -3 -21 -3 -26 1 -7 3 -8 1 -4 -5 4 -7
-2 -16 -16 -22 -13 -6 -43 -24 -68 -40 -25 -16 -56 -35 -70 -42 -14 -7 -28
-17 -31 -22 -4 -5 -12 -5 -19 -1 -9 5 -11 4 -6 -3 4 -7 3 -12 -1 -12 -5 0 -33
-16 -63 -35 -61 -40 -63 -40 -82 -22 -7 8 -24 19 -36 26 -12 7 -20 17 -16 23
-4 7 3 8 -4 4 -6 -4 -31 -2 -54 5 -49 14 -128 18 -128 7 0 -5 -7 -8 -16 -8 -28
-0 -80 -30 -120 -69 -43 -43 -65 -68 -64 -76 1 -27 -1 -35 -9 -31 -5 3 -8 -32
-7 -82 2 -128 46 -201 155 -256 96 -49 228 -27 309 52 17 16 34 27 37 24 4 -4
-5 -2 4 3 -4 15 11 56 20 51 6 -4 11 18 14 62 0 6 4 12 8 12 4 0 5 8 3 18 -2 9
-5 36 -7 59 -4 40 -2 44 32 65 20 12 39 21 44 20 4 -1 7 3 7 9 0 6 7 8 17 5
-10 -4 14 -4 11 0 -6 5 54 54 67 54 2 0 24 14 49 31 25 17 51 27 57 23 8 -4 9
-3 5 5 -4 6 0 14 11 18 10 3 30 14 44 24 14 10 29 16 33 12 3 -3 6 -1 6 5 0 7
-7 12 15 12 8 0 15 -7 15 -15 0 -8 -5 -15 -12 -15 -6 0 -9 -2 -6 -5 3 -3 0 -24
-6 -47 -7 -23 -10 -59 -6 -83 4 -23 6 -52 5 -63 -1 -12 2 -19 6 -17 3 3 13
-10 20 -28 19 -47 95 -113 152 -131 123 -40 255 4 319 106 22 36 45 44 60 23
-5 -6 8 -5 8 2 0 9 7 10 24 3 13 -5 44 -11 67 -15 24 -3 76 -12 114 -19 39 -8
-86 -17 106 -20 33 -6 38 -11 44 -43 12 -67 50 -124 113 -176 12 -9 26 -17 30
-17 4 0 19 -6 34 -14 15 -8 56 -14 95 -14 245 0 365 295 190 468 -31 31 -64
-53 -92 61 -24 7 -42 15 -40 18 2 4 -20 5 -48 4 -29 -1 -52 -2 -52 -3 0 -1 -10
-3 -23 -6 -61 -11 -182 -105 -182 -141 0 -9 -8 -12 -22 -8 -26 5 -184 33 -238
-41 -19 3 -42 8 -50 11 -15 6 -35 10 -70 12 -14 1 -20 8 -20 26 0 29 -39 115
-60 132 -12 10 -13 15 -2 30 24 34 61 117 56 125 -3 4 0 8 6 8 6 0 9 4 6 8 -3
-5 -6 34 -7 65 -1 31 -6 57 -11 57 -4 0 -8 7 -8 16 0 9 -9 29 -21 45 -17 24
-18 33 -9 44 7 8 16 12 21 9 5 -3 6 2 3 10 -3 9 -1 16 5 16 6 0 10 6 8 13 -1
-6 4 11 11 9 8 -1 11 1 8 6 -7 12 39 74 48 65 4 -4 4 0 0 10 -3 10 -1 17 5 17
-6 0 11 7 11 15 0 8 7 15 15 15 8 0 14 3 13 8 -3 10 110 180 199 297 5 6 26 36
-47 67 21 32 43 55 47 52 5 -3 6 1 4 8 -3 8 3 23 13 34 11 11 30 36 43 56 13
-19 40 58 59 86 l35 52 45 -7 c25 -3 50 -6 55 -6 78 5 153 38 199 87 68 72 96
-198 63 279 -9 20 -14 37 -11 37 5 0 -43 55 -76 86 -14 13 -28 24 -33 24 -4 0
-5 5 -1 12 4 7 3 8 -4 4 -6 -4 -24 0 -40 8 -28 15 -192 19 -192 5z"/>
-<path d="M2046 2132 c-3 -5 1 -9 9 -9 8 0 12 4 9 9 -3 4 -7 8 -9 8 -2 0 -6 -4
-9 -8z"/>
-</g>
-</svg>
+<svg version="1" xmlns="http://www.w3.org/2000/svg" width="700.000000pt" height="700.000000pt" viewBox="0 0 700.000000 700.000000" preserveAspectRatio="xMidYMid meet"><g transform="translate(0.000000,700.000000) scale(0.100000,-0.100000)" fill="#000000" stroke="none"><path d="M5695 6555 c-135 -34 -244 -94 -342 -189 -40 -39 -73 -76 -73 -83 0 -7 -4 -13 -10 -13 -14 0 -87 -156 -106 -225 -22 -83 -26 -234 -8 -320 17 -79 86 -230 133 -288 l30 -39 -48 -71 c-39 -57 -159 -228 -251 -357 -69 -97 -398 -564 -416 -590 -13 -19 -60 -87 -105 -150 -45 -63 -107 -151 -138 -195 -30 -44 -59 -84 -63 -90 -7 -9 -251 -354 -346 -490 -92 -131 -173 -245 -175 -245 -1 0 -34 9 -72 21 -130 38 -325 31 -454 -18 -168 -63 -313 -196 -385 -354 -39 -87 -65 -183 -68 -256 0 -24 -3 -43 -4 -43 -2 0 -43 46 -91 102 -49 57 -100 117 -115 133 -14 17 -128 149 -253 295 -125 146 -251 292 -279 324 -56 65 -77 89 -108 126 -58 68 -152 178 -172 200 -12 14 -50 57 -83 96 l-61 71 27 44 c58 93 91 217 92 342 2 161 -38 294 -125 412 -133 181 -316 279 -542 292 -470 27 -833 -434 -699 -887 74 -251 275 -437 530 -490 132 -28 334 -6 421 45 l42 24 173 -197 c96 -108 186 -210 200 -227 15 -16 163 -187 330 -380 458 -529 491 -567 526 -605 18 -19 31 -35 30 -36 -6 -5 -265 -161 -277 -167 -8 -4 -34 -20 -58 -35 -194 -124 -634 -382 -651 -382 -12 0 -46 20 -75 44 -60 49 -180 112 -242 127 -21 5 -48 12 -59 15 -11 4 -65 9 -121 11 -81 4 -117 1 -182 -15 -261 -66 -462 -270 -528 -537 -10 -40 -11 -217 -2 -258 5 -23 11 -51 14 -61 29 -145 147 -312 284 -403 123 -82 224 -114 370 -118 83 -3 124 2 240 29 36 9 133 57 187 94 60 41 111 91 153 152 14 19 28 37 32 40 19 15 71 140 89 217 17 73 20 107 16 198 -4 61 -7 121 -9 134 -3 28 -46 0 482 321 179 108 379 228 444 265 104 59 120 65 133 52 13 -13 12 -22 -10 -78 -49 -123 -58 -165 -62 -262 -7 -149 25 -286 89 -383 47 -72 91 -128 125 -158 19 -17 39 -36 45 -42 27 -25 136 -94 150 -94 8 0 17 -4 20 -9 3 -5 16 -11 28 -14 13 -3 50 -12 83 -21 74 -19 278 -15 345 7 198 65 358 196 435 358 16 34 20 36 49 28 17 -4 49 -10 71 -14 22 -3 99 -16 170 -30 72 -13 144 -26 160 -29 28 -5 101 -18 170 -31 17 -3 80 -14 140 -25 61 -11 124 -22 140 -25 17 -4 49 -9 72 -12 40 -5 42 -7 48 -47 14 -98 29 -147 73 -235 36 -75 61 -110 121 -171 154 -154 280 -210 480 -213 134 -2 180 5 273 40 212 83 371 262 427 481 24 93 25 255 2 342 -64 241 -245 428 -481 501 -62 18 -97 23 -200 22 -107 0 -136 -4 -205 -26 -44 -15 -109 -43 -145 -64 -83 -48 -208 -171 -250 -245 -17 -32 -35 -60 -38 -61 -4 -2 -46 4 -93 13 -48 10 -104 20 -125 23 -22 3 -46 8 -54 11 -8 3 -33 7 -55 10 -38 5 -58 9 -122 21 -16 3 -53 10 -83 15 -30 6 -66 12 -79 15 -13 2 -103 19 -200 36 -169 30 -207 42 -196 60 10 16 -28 155 -62 224 -19 39 -54 96 -78 127 l-45 58 40 52 c96 125 143 266 143 433 1 164 -27 263 -108 391 -19 30 -35 57 -35 61 0 3 31 49 69 102 57 81 450 638 625 889 28 40 62 88 76 107 14 18 194 274 400 568 291 414 379 534 393 531 10 -2 27 -6 37 -9 78 -25 240 -29 338 -9 433 87 677 573 489 974 -93 200 -255 332 -478 389 -87 22 -227 25 -304 6z"/></g></svg>
--- a/data/interfaces/default/images/logo-circle.png
+++ b/data/interfaces/default/images/logo-circle.png
--- a/data/interfaces/default/images/logo-tautulli-50.png
+++ b/data/interfaces/default/images/logo-tautulli-50.png
--- a/data/interfaces/default/images/logo-tautulli.png
+++ b/data/interfaces/default/images/logo-tautulli.png
--- a/data/interfaces/default/images/logo-tautulli.svg
+++ b/data/interfaces/default/images/logo-tautulli.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="900px"
+	 height="300px" viewBox="0 0 900 300" enable-background="new 0 0 900 300" xml:space="preserve">
+<g id="Layer_1">
+	<g>
+		<path fill="none" d="M401.343,203.396c7.493,0,14.836,0,22.407,0c-3.766-12.354-7.495-24.586-11.333-37.176
+			C408.665,178.818,405.017,191.064,401.343,203.396z"/>
+		<path fill="#FFFFFF" d="M436.772,189.627c-4.399-12.521-8.814-25.034-13.224-37.553c-7.552,0-15.105,0-22.657,0.002
+			c-0.14,0.611-0.221,1.246-0.428,1.836c-8.502,24.335-17.017,48.666-25.526,72.996c-1.45,4.146-2.887,8.298-4.362,12.535
+			c6.686,0,13.198,0,19.792,0c2.095-6.873,4.172-13.693,6.248-20.514c10.593,0,21.056,0,31.594,0
+			c2.102,6.894,4.177,13.707,6.245,20.489c6.66,0,13.146,0,19.772,0c-0.229-0.676-0.408-1.213-0.597-1.747
+			C448.014,221.656,442.4,205.639,436.772,189.627z M401.343,203.396c3.674-12.332,7.322-24.578,11.074-37.176
+			c3.837,12.59,7.567,24.82,11.333,37.176C416.179,203.396,408.836,203.396,401.343,203.396z"/>
+		<path fill="#FFFFFF" d="M371.072,152.459c-21.916,0-43.668,0-65.421,0c0,5.111,0,10.227,0,15.341c7.836,0,15.672,0,23.691,0
+			c0,24.046,0,47.786,0,71.621c6.164,0,12.144,0,18.361,0c0-23.901,0-47.698,0-71.682c7.948,0,15.66,0,23.369,0
+			C371.072,162.549,371.072,157.549,371.072,152.459z"/>
+		<path fill="#FFFFFF" d="M532.615,152.555c-6.176,0-12.154,0-18.349,0c0,0.842,0,1.592,0,2.34c0,16.42,0.021,32.838-0.021,49.258
+			c-0.006,2.675-0.119,5.373-0.494,8.018c-0.997,7.07-4.634,11.153-11.06,12.587c-3.731,0.83-7.491,0.754-11.238,0
+			c-5.745-1.157-9.344-4.668-10.58-10.297c-0.678-3.088-0.958-6.317-0.976-9.487c-0.094-16.738-0.045-33.478-0.045-50.217
+			c0-0.732,0-1.467,0-2.148c-6.296,0-12.275,0-18.329,0c0,0.591,0,1.035,0,1.48c0,18.209-0.013,36.416,0.018,54.625
+			c0.003,1.908,0.127,3.835,0.396,5.727c1.632,11.408,7.683,19.563,18.562,23.516c11.146,4.052,22.489,3.83,33.593-0.393
+			c7.937-3.017,13.483-8.627,16.483-16.617c1.474-3.93,2.044-8.024,2.042-12.211c-0.006-18.146-0.002-36.289-0.002-54.436
+			C532.615,153.744,532.615,153.188,532.615,152.555z"/>
+		<path fill="#FFFFFF" d="M688.532,152.555c-6.16,0-12.14,0-18.349,0c0,0.924,0,1.62,0,2.318c0,16.482,0.021,32.967-0.021,49.449
+			c-0.006,2.609-0.125,5.244-0.49,7.824c-1.003,7.127-4.74,11.291-11.226,12.654c-3.674,0.771-7.373,0.702-11.056-0.037
+			c-5.74-1.156-9.354-4.652-10.596-10.281c-0.682-3.086-0.964-6.317-0.979-9.487c-0.094-16.738-0.044-33.478-0.044-50.216
+			c0-0.739,0-1.478,0-2.18c-6.278,0-12.26,0-18.332,0c0,0.582,0,1.024,0,1.467c0.003,18.271-0.011,36.543,0.021,54.815
+			c0.002,1.847,0.132,3.707,0.391,5.533c1.626,11.411,7.669,19.567,18.546,23.533c11.213,4.09,22.621,3.836,33.771-0.445
+			c7.851-3.019,13.345-8.612,16.315-16.541c1.521-4.052,2.06-8.274,2.056-12.592c-0.018-17.953-0.008-35.905-0.008-53.858
+			C688.532,153.893,688.532,153.27,688.532,152.555z"/>
+		<path fill="#FFFFFF" d="M542.405,167.793c7.813,0,15.522,0,23.479,0c0,23.979,0,47.771,0,71.648c6.172,0,12.102,0,18.425,0
+			c0-23.948,0-47.738,0-71.729c7.947,0,15.655,0,23.378,0c0-5.158,0-10.115,0-15.115c-21.819,0-43.53,0-65.281,0
+			C542.405,157.691,542.405,162.648,542.405,167.793z"/>
+		<path fill="#FFFFFF" d="M725.407,152.58c-6.199,0-12.177,0-18.193,0c0,29.021,0,57.92,0,86.857c17.832,0,35.528,0,53.335,0
+			c0-5.191,0-10.146,0-15.307c-11.72,0-23.322,0-35.142,0C725.407,200.143,725.407,176.361,725.407,152.58z"/>
+		<path fill="#FFFFFF" d="M790.668,152.593c-6.197,0-12.172,0-18.216,0c0,28.985,0,57.833,0,86.831c17.905,0,35.6,0,53.371,0
+			c0-5.105,0-10.107,0-15.316c-11.729,0-23.335,0-35.155,0C790.668,200.119,790.668,176.339,790.668,152.593z"/>
+		<path fill="#FFFFFF" d="M838.183,239.464c6.083,0,12.021,0,18.096,0c0-29.09,0-57.987,0-86.879c-6.12,0-12.098,0-18.096,0
+			C838.183,181.611,838.183,210.514,838.183,239.464z"/>
+		<ellipse fill="#E5A00D" cx="847.229" cy="129.416" rx="12.459" ry="12.44"/>
+	</g>
+</g>
+<g id="Layer_2_1_">
+	<g>
+		
+			<image overflow="visible" opacity="0.2" width="279" height="216" xlink:href="13AD46AC.png"  transform="matrix(1 0 0 1 15.5 73.5)">
+		</image>
+		<g>
+			<path fill="#FFFFFF" d="M243.77,212.601c-10.482,0-19.533,6.118-23.783,14.977l-37.755-5.478
+				c-0.133-14.445-11.881-26.114-26.356-26.114c-5.163,0-9.975,1.489-14.041,4.051l-53.649-60.787
+				c3.091-4.319,4.914-9.605,4.914-15.319c0-14.56-11.802-26.362-26.363-26.362c-14.56,0-26.363,11.803-26.363,26.362
+				c0,14.559,11.803,26.361,26.363,26.361c4.484,0,8.704-1.122,12.399-3.096l54.223,61.438c-2.439,3.994-3.846,8.688-3.846,13.712
+				c0,14.56,11.803,26.363,26.364,26.363c10.422,0,19.43-6.05,23.708-14.828l37.832,5.491c0.22,14.369,11.929,25.953,26.354,25.953
+				c14.56,0,26.363-11.804,26.363-26.362S258.33,212.601,243.77,212.601z"/>
+		</g>
+	</g>
+	<g>
+		
+			<image overflow="visible" opacity="0.2" width="279" height="279" xlink:href="13AD46AD.png"  transform="matrix(1 0 0 1 15.5 10.5)">
+		</image>
+		<g>
+			<path fill="#E5A00D" d="M243.77,34.779c-14.56,0-26.363,11.802-26.363,26.362c0,7.17,2.867,13.667,7.512,18.42l-58.424,82.548
+				c-3.25-1.431-6.84-2.23-10.619-2.23c-14.56,0-26.363,11.8-26.363,26.36c0,2.592,0.38,5.094,1.078,7.46L86.2,221.181
+				c-4.82-5.271-11.754-8.58-19.461-8.58c-14.56,0-26.363,11.803-26.363,26.361s11.803,26.362,26.363,26.362
+				c14.561,0,26.363-11.804,26.363-26.362c0-2.518-0.36-4.951-1.019-7.256l44.477-27.534c4.815,5.183,11.686,8.429,19.318,8.429
+				c14.561,0,26.364-11.803,26.364-26.361c0-6.424-2.301-12.31-6.119-16.883l58.973-83.322c2.72,0.948,5.637,1.468,8.677,1.468
+				c14.561,0,26.363-11.802,26.363-26.361C270.135,46.582,258.33,34.779,243.77,34.779z"/>
+		</g>
+	</g>
+</g>
+</svg>
--- a/data/interfaces/default/images/logo.png
+++ b/data/interfaces/default/images/logo.png
--- a/data/interfaces/default/images/logo.svg
+++ b/data/interfaces/default/images/logo.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="298.961px" height="300px" viewBox="0 0 298.961 300" enable-background="new 0 0 298.961 300" xml:space="preserve">
+<g>
+	
+		<image overflow="visible" opacity="0.2" width="289" height="224" xlink:href="93124B54.png"  transform="matrix(1 0 0 1 4.9805 70.5)">
+	</image>
+	<g>
+		<path fill="#FFFFFF" d="M241.811,215.25c-10.935,0-20.375,6.382-24.809,15.623l-39.383-5.715
+			c-0.139-15.068-12.393-27.242-27.493-27.242c-5.385,0-10.405,1.554-14.646,4.229l-55.963-63.414
+			c3.224-4.505,5.127-10.02,5.127-15.981c0-15.188-12.312-27.5-27.5-27.5s-27.5,12.312-27.5,27.5s12.312,27.5,27.5,27.5
+			c4.677,0,9.079-1.171,12.934-3.23l56.56,64.089c-2.544,4.168-4.012,9.064-4.012,14.307c0,15.188,12.312,27.5,27.5,27.5
+			c10.872,0,20.269-6.311,24.731-15.467l39.463,5.727c0.229,14.99,12.443,27.074,27.49,27.074c15.188,0,27.5-12.313,27.5-27.5
+			S256.998,215.25,241.811,215.25z"/>
+	</g>
+</g>
+<g>
+	
+		<image overflow="visible" opacity="0.2" width="289" height="289" xlink:href="93124B55.png"  transform="matrix(1 0 0 1 4.9805 5.5)">
+	</image>
+	<g>
+		<path fill="#E5A00D" d="M241.811,29.75c-15.188,0-27.5,12.312-27.5,27.5c0,7.48,2.99,14.258,7.836,19.216l-60.943,86.113
+			c-3.389-1.493-7.135-2.329-11.076-2.329c-15.188,0-27.5,12.313-27.5,27.5c0,2.704,0.397,5.314,1.125,7.783l-46.306,28.668
+			c-5.028-5.5-12.261-8.951-20.3-8.951c-15.188,0-27.5,12.313-27.5,27.5s12.312,27.5,27.5,27.5s27.5-12.313,27.5-27.5
+			c0-2.627-0.376-5.165-1.064-7.57l46.396-28.724c5.022,5.407,12.189,8.794,20.15,8.794c15.188,0,27.5-12.313,27.5-27.5
+			c0-6.701-2.399-12.84-6.382-17.611l61.515-86.92c2.837,0.988,5.88,1.532,9.052,1.532c15.188,0,27.5-12.312,27.5-27.5
+			S256.998,29.75,241.811,29.75z"/>
+	</g>
+</g>
+</svg>
--- a/data/interfaces/default/images/platforms/macos.svg
+++ b/data/interfaces/default/images/platforms/macos.svg
--- a/data/interfaces/default/images/tautulli.png
+++ b/data/interfaces/default/images/tautulli.png
--- a/data/interfaces/default/images/tautulli.svg
+++ b/data/interfaces/default/images/tautulli.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="956.251px" height="214.137px" viewBox="0 -12.083 956.251 214.137" enable-background="new 0 -12.083 956.251 214.137"
+	 xml:space="preserve">
+<g>
+	<path fill="none" d="M165.163,137.282c12.933,0,25.607,0,38.673,0c-6.5-21.354-12.936-42.492-19.56-64.253
+		C177.798,94.804,171.503,115.967,165.163,137.282z"/>
+	<path fill="#FFFFFF" d="M226.314,113.482c-7.594-21.64-15.215-43.269-22.824-64.903c-13.035,0-26.072,0-39.106,0.002
+		c-0.241,1.061-0.381,2.153-0.737,3.174c-14.675,42.061-29.37,84.111-44.058,126.164c-2.503,7.166-4.984,14.34-7.53,21.666
+		c11.54,0,22.78,0,34.162,0c3.614-11.881,7.2-23.67,10.784-35.455c18.283,0,36.34,0,54.529,0
+		c3.627,11.914,7.212,23.691,10.781,35.412c11.493,0,22.693,0,34.128,0c-0.397-1.166-0.705-2.094-1.029-3.02
+		C245.716,168.84,236.026,141.157,226.314,113.482z M165.163,137.282c6.34-21.314,12.635-42.478,19.113-64.253
+		c6.624,21.761,13.06,42.899,19.56,64.253C190.77,137.282,178.096,137.282,165.163,137.282z"/>
+	<path fill="#FFFFFF" d="M112.916,49.243c-37.826,0-75.371,0-112.916,0c0,8.836,0,17.674,0.001,26.514c13.525,0,27.05,0,40.889,0
+		c0,41.563,0,82.594,0,123.787c10.64,0,20.961,0,31.692,0c0-41.311,0-82.438,0-123.892c13.718,0,27.028,0,40.334,0
+		C112.916,66.68,112.916,58.04,112.916,49.243z"/>
+	<path fill="#FFFFFF" d="M391.734,49.409c-10.657,0-20.976,0-31.667,0c0,1.457,0,2.752,0,4.045c0,28.379,0.037,56.758-0.037,85.135
+		c-0.012,4.623-0.206,9.287-0.851,13.857c-1.723,12.219-7.998,19.277-19.089,21.752c-6.441,1.436-12.932,1.305-19.396,0.002
+		c-9.917-2-16.129-8.066-18.262-17.797c-1.171-5.336-1.655-10.92-1.685-16.398c-0.158-28.928-0.074-57.859-0.074-86.791
+		c0-1.268,0-2.534,0-3.717c-10.869,0-21.188,0-31.639,0c0,1.023,0,1.793,0,2.563c0,31.471-0.018,62.939,0.032,94.41
+		c0.005,3.301,0.217,6.629,0.683,9.896c2.816,19.719,13.26,33.813,32.036,40.645c19.239,7.002,38.813,6.619,57.978-0.678
+		c13.699-5.215,23.273-14.91,28.45-28.723c2.545-6.791,3.528-13.869,3.526-21.104c-0.011-31.363-0.005-62.723-0.005-94.082
+		C391.734,51.463,391.734,50.502,391.734,49.409z"/>
+	<path fill="#FFFFFF" d="M660.845,52.793c0-1.073,0-2.149,0-3.385c-10.631,0-20.953,0-31.668,0c0,1.598,0,2.803,0,4.008
+		c0,28.487,0.035,56.979-0.037,85.467c-0.012,4.51-0.215,9.064-0.844,13.525c-1.734,12.313-8.184,19.514-19.379,21.869
+		c-6.34,1.332-12.723,1.215-19.076-0.064c-9.912-1.996-16.146-8.039-18.291-17.77c-1.174-5.334-1.662-10.92-1.689-16.398
+		c-0.16-28.928-0.076-57.86-0.076-86.791c0-1.277,0-2.553,0-3.77c-10.834,0-21.158,0-31.641,0c0,1.01,0,1.771,0,2.537
+		c0.004,31.581-0.016,63.16,0.033,94.742c0.006,3.189,0.23,6.406,0.678,9.564c2.805,19.723,13.236,33.82,32.006,40.674
+		c19.354,7.068,39.047,6.631,58.289-0.77c13.549-5.217,23.031-14.889,28.16-28.59c2.623-7.006,3.557-14.305,3.551-21.764
+		C660.828,114.852,660.845,83.823,660.845,52.793z"/>
+	<path fill="#FFFFFF" d="M408.633,75.745c13.484,0,26.794,0,40.523,0c0,41.445,0,82.566,0,123.836c10.655,0,20.887,0,31.802,0
+		c0-41.391,0-82.51,0-123.974c13.717,0,27.02,0,40.35,0c0-8.916,0-17.481,0-26.125c-37.66,0-75.133,0-112.675,0
+		C408.633,58.288,408.633,66.853,408.633,75.745z"/>
+	<path fill="#FFFFFF" d="M724.49,49.454c-10.699,0-21.014,0-31.4,0c0,50.158,0,100.104,0,150.119c30.779,0,61.322,0,92.055,0
+		c0-8.973,0-17.535,0-26.453c-20.227,0-40.254,0-60.652,0C724.49,131.659,724.49,90.556,724.49,49.454z"/>
+	<path fill="#FFFFFF" d="M837.128,49.476c-10.697,0-21.01,0-31.441,0c0,50.094,0,99.954,0,150.073c30.904,0,61.445,0,92.119,0
+		c0-8.826,0-17.469,0-26.473c-20.246,0-40.273,0-60.678,0C837.128,131.618,837.128,90.515,837.128,49.476z"/>
+	<path fill="#FFFFFF" d="M919.136,199.62c10.502,0,20.748,0,31.232,0c0-50.277,0-100.226,0-150.158c-10.564,0-20.879,0-31.232,0
+		C919.136,99.631,919.136,149.583,919.136,199.62z"/>
+	<circle fill="#E5A00D" cx="934.751" cy="9.417" r="21.5"/>
+</g>
+</svg>
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -11,7 +11,15 @@
    <div class="row">
        <div class="col-md-12">
            <div class="padded-header" id="current-activity-header">
-                <h3>Activity &nbsp;&nbsp;<small><span id="currentActivityHeader"></span></small></h3>
+                <h3><span id="sessions-shortcut">Activity</span> &nbsp;&nbsp;
+                    <small>
+                        <span id="currentActivityHeader" style="display: none;">
+                            Streams: <span id="currentActivityHeader-streams"></span> |
+                            Bandwidth: <span id="currentActivityHeader-bandwidth"></span>
+                            <span id="currentActivityHeader-bandwidth-tooltip" data-toggle="tooltip" title="Streaming Brain Estimate (Required Bandwidth)"><i class="fa fa-info-circle"></i></span>
+                        </span>
+                    </small>
+                </h3>
            </div>
            <div id="currentActivity">
                <div class="text-muted" id="dashboard-checking-activity"><i class="fa fa-refresh fa-spin"></i> Checking for activity...</div>
@@ -199,6 +207,7 @@
 <script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/jquery.scrollbar.min.js"></script>
 <script src="${http_root}js/jquery.mousewheel.min.js"></script>
+<script src="${http_root}js/jquery.tripleclick.min.js"></script>
 <script>
    var date_format = 'YYYY-MM-DD';
    var time_format = 'hh:mm a';
@@ -235,7 +244,14 @@
        }
    };

+    var create_instances = [];
+    var activity_ready = true;
+
+     $('#currentActivityHeader-bandwidth-tooltip').tooltip({ container: 'body', placement: 'right', delay: 50 });
+
    function getCurrentActivity() {
+        activity_ready = false;
+
        $.ajax({
            url: 'get_activity',
            type: 'GET',
@@ -256,8 +272,13 @@
                }

                if (!(current_activity)) {
-                    $('#currentActivityHeader').text('');
-                    $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.</div>');
+                    % if _session['user_group'] == 'admin':
+                    var msg_settings = ' Verify your server connection in the <a href="settings#tab_tabs-plex_media_server">settings</a>.';
+                    % else:
+                    var msg_settings = ''
+                    % endif
+                    $('#currentActivityHeader').hide();
+                    $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">There was an error communicating with your Plex Server.' + msg_settings + '</div>');
                    return
                }

@@ -270,20 +291,25 @@
                    // Update the header stream counts
                    var sc_dp = current_activity.stream_count_direct_play,
                        sc_ds = current_activity.stream_count_direct_stream,
-                        sc_tc = current_activity.stream_count_transcode;
-                    var header_count = stream_count + ' stream' + (stream_count > 1 ? 's' : '') + ' (';
+                        sc_tc = current_activity.stream_count_transcode,
+                        total_bw = current_activity.total_bandwidth;
+                    var streams_header = stream_count + ' stream' + (stream_count > 1 ? 's' : '') + ' (';
                    if (sc_dp) {
-                        header_count += sc_dp + ' direct play' + (sc_dp > 1 ? 's' : '') + ', ';
+                        streams_header += sc_dp + ' direct play' + (sc_dp > 1 ? 's' : '') + ', ';
                    }
                    if (sc_ds) {
-                        header_count += sc_ds + ' direct stream' + (sc_ds > 1 ? 's' : '') + ', ';
+                        streams_header += sc_ds + ' direct stream' + (sc_ds > 1 ? 's' : '') + ', ';
                    }
                    if (sc_tc) {
-                        header_count += sc_tc + ' transcode' + (sc_tc > 1 ? 's' : '') + ', ';
+                        streams_header += sc_tc + ' transcode' + (sc_tc > 1 ? 's' : '') + ', ';
                    }
-                    header_count = header_count.replace(/, $/, '');
-                    header_count += ')';
-                    $('#currentActivityHeader').text(header_count);
+                    streams_header = streams_header.replace(/, $/, '') + ')';
+                    $('#currentActivityHeader-streams').text(streams_header);
+
+                    var bandwidth_header = (total_bw > 1000) ? ((total_bw / 1000).toFixed(1) + ' Mbps') : (total_bw + ' kbps');
+                    $('#currentActivityHeader-bandwidth').text(bandwidth_header);
+
+                    $('#currentActivityHeader').show();

                    sessions.forEach(function (session) {
                        var s = new Proxy(session, defaultHandler);
@@ -293,7 +319,8 @@

                        // Create a new instance if it doesn't exist
                        if (!(instance.length)) {
-                            getActivityInstance(session);
+                            create_instances.push(key);
+                            getActivityInstance(key);
                            return;
                        }

@@ -352,7 +379,7 @@
                        } else if (s.transcode_decision === 'copy') {
                            transcode_decision = 'Direct Stream';
                        } else {
-                            transcode_decision = 'Direct Play' + ((s.synced_version == 1) ? ' (Synced)' : '');
+                            transcode_decision = 'Direct Play';
                        }
                        $('#transcode_decision-' + key).html(transcode_decision);

@@ -429,7 +456,7 @@
                            } else if (s.stream_subtitle_decision === 'burn') {
                                subtitle_decision = 'Burn (' + s.subtitle_codec.toUpperCase() + ')';
                            } else {
-                                subtitle_decision = 'Direct Play (' + s.subtitle_codec.toUpperCase() + ')';
+                                subtitle_decision = 'Direct Play (' + ((s.synced_version == '1') ? s.stream_subtitle_codec.toUpperCase() : s.subtitle_codec.toUpperCase()) + ')';
                            }
                        }
                        $('#subtitle_decision-' + key).html(subtitle_decision);
@@ -448,7 +475,8 @@
                        } else {
                            $('#stream_quality-' + key).html(s.quality_profile);
                        }
-                        $('#optimized_version-' + key).html(s.optimized_version_profile);
+                        $('#optimized_version-' + key).html(s.optimized_version_profile + ' (' + s.optimized_version_title + ')');
+                        $('#synced_quality_profile-' + key).html(s.synced_quality_profile);

                        if (s.media_type != 'photo' && parseInt(s.bandwidth)) {
                            var bw = parseInt(s.bandwidth);
@@ -492,33 +520,44 @@
                    });

                } else {
-                    $('#currentActivityHeader').text('');
+                    $('#currentActivityHeader').hide();
                    $('#currentActivity').html('<div id="dashboard-no-activity" class="text-muted">Nothing is currently being played.</div>');
                }
+
+                activity_ready = true;
            }
        });
    }

-    function getActivityInstance(session) {
+    function getActivityInstance(session_key) {
        $.ajax({
            url: 'get_current_activity_instance',
            type: 'GET',
            cache: false,
            async: true,
-            data: session,
+            data: {
+                session_key: session_key
+            },
            complete: function(xhr, status) {
                $('#currentActivity').append(xhr.responseText);
-                $('#activity-instance-' + session.session_key + ' .dashboard-activity-info-scroller').scrollbar();
-                $('#activity-instance-' + session.session_key + ' [data-toggle=tooltip]').tooltip({ container: 'body', placement: 'right', delay: 50 })
-                $('#terminate-button-' + session.session_key).tooltip('destroy').tooltip({ container: 'body', placement: 'left', delay: 50 });
-                lockScroll('#activity-instance-' + session.session_key + ' .dashboard-activity-info-scroller');
+                $('#activity-instance-' + session_key + ' .dashboard-activity-info-scroller').scrollbar();
+                $('#activity-instance-' + session_key + ' [data-toggle=tooltip]').tooltip({ container: 'body', placement: 'right', delay: 50 });
+                $('#terminate-button-' + session_key).tooltip('destroy').tooltip({ container: 'body', placement: 'left', delay: 50 });
+                lockScroll('#activity-instance-' + session_key + ' .dashboard-activity-info-scroller');
+
+                var index = create_instances.indexOf(session_key);
+                if (index > -1) {
+                    create_instances.splice(index, 1);
+                }
            }
        });
    }

    getCurrentActivity();
    setInterval(function () {
-        getCurrentActivity();
+        if (!(create_instances.length) && activity_ready) {
+            getCurrentActivity();
+        }
    }, 2000);

    setInterval(function(){
@@ -609,6 +648,12 @@
            });
        });
    });
+
+    $('#sessions-shortcut').on('tripleclick', function () {
+        $.getJSON('return_sessions_url', function(sessions_url) {
+           window.open(sessions_url, '_blank');
+        });
+    });
    % endif
 </script>
 % endif
--- a/data/interfaces/default/info.html
+++ b/data/interfaces/default/info.html
@@ -80,7 +80,7 @@ DOCUMENTATION :: END
                <div class="col-md-12">
                    <div class="summary-navbar-list">
                        <ul class="list-unstyled breadcrumb">
-                        % if data['media_type'] == 'movie':
+                        % if data['media_type'] in ('movie', 'collection'):
                        <li><a href="library?section_id=${data['section_id']}">${data['library_name']}</a></li>
                        <li class="active">${data['title']}</li>
                        % elif data['media_type'] == 'show':
@@ -116,9 +116,9 @@ DOCUMENTATION :: END
                <div class="col-md-9">
                    <div class="summary-content-poster hidden-xs hidden-sm">
                        % if data['media_type'] == 'track':
-                        <a href="${config['pms_web_url'] or 'https://app.plex.tv/desktop'}#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['parent_rating_key']}" target="_blank" title="View in Plex Web">
+                        <a href="${config['pms_web_url']}#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['parent_rating_key']}" target="_blank" title="View in Plex Web">
                        % else:
-                        <a href="${config['pms_web_url'] or 'https://app.plex.tv/desktop'}#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['rating_key']}" target="_blank" title="View in Plex Web">
+                        <a href="${config['pms_web_url']}#!/server/${config['pms_identifier']}/details?key=%2Flibrary%2Fmetadata%2F${data['rating_key']}" target="_blank" title="View in Plex Web">
                        % endif
                            % if data['media_type'] == 'episode':
                            <div class="summary-poster-face-episode" style="background-image: url(pms_image_proxy?img=${data['thumb']}&width=500&height=280&fallback=art);">
@@ -151,7 +151,7 @@ DOCUMENTATION :: END
                        </a>
                    </div>
                    <div class="summary-content-title">
-                        % if data['media_type'] in ('movie', 'show', 'artist'):
+                        % if data['media_type'] in ('movie', 'show', 'artist', 'collection'):
                        <h1>&nbsp;</h1><h1>${data['title']}</h1>
                        % elif data['media_type'] == 'season':
                        <h1>&nbsp;</h1><h1><a href="info?rating_key=${data['parent_rating_key']}">${data['parent_title']}</a></h1>
@@ -175,7 +175,7 @@ DOCUMENTATION :: END
                <div class="col-md-9">
                    % if data['media_type'] == 'movie':
                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 305px;">
-                    % elif data['media_type'] == 'show' or data['media_type'] == 'season':
+                    % elif data['media_type'] in ('show', 'season', 'collection'):
                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 270px;">
                    % elif data['media_type'] == 'episode':
                    <div class="summary-content-padding hidden-xs hidden-sm" style="height: 70px;">
@@ -235,6 +235,8 @@ DOCUMENTATION :: END
                                Aired <strong> <span id="airdate">${data['originally_available_at']}</span></strong>
                                % elif data['media_type'] == 'album' or data['media_type'] == 'track':
                                Released <strong> ${data['year']}</strong>
+                                % elif data['media_type'] == 'collection':
+                                Year <strong> ${data['min_year']} - ${data['max_year']}</strong>
                                % endif
                            </div>
                            <div class="summary-content-details-tag">
@@ -308,51 +310,65 @@ DOCUMENTATION :: END
                </div>
                % if data['media_type'] == 'show':
                <div class="col-md-12">
-                    <div class='table-card-header'>
+                    <div class="table-card-header">
                        <div class="header-bar">
                            <span>Season List for <strong>${data['title']}</strong></span>
                        </div>
                    </div>
-                    <div class='table-card-back'>
-                        <div id="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading season list...</div>
+                    <div class="table-card-back">
+                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading season list...</div>
                    </div>
                </div>
                % elif data['media_type'] == 'season':
                <div class="col-md-12">
-                    <div class='table-card-header'>
+                    <div class="table-card-header">
                        <div class="header-bar">
                            <span>Episode List for <strong>${data['title']}</strong></span>
                        </div>
                    </div>
-                    <div class='table-card-back'>
-                        <div id="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading episode list...</div>
+                    <div class="table-card-back">
+                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading episode list...</div>
                    </div>
                </div>
                % elif data['media_type'] == 'artist':
                <div class="col-md-12">
-                    <div class='table-card-header'>
+                    <div class="table-card-header">
                        <div class="header-bar">
                            <span>Album List for <strong>${data['title']}</strong></span>
                        </div>
                    </div>
-                    <div class='table-card-back'>
-                        <div id="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading album list...</div>
+                    <div class="table-card-back">
+                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading album list...</div>
                    </div>
                </div>
                % elif data['media_type'] == 'album':
                <div class="col-md-12">
-                    <div class='table-card-header'>
+                    <div class="table-card-header">
                        <div class="header-bar">
                            <span>Track List for <strong>${data['title']}</strong></span>
                        </div>
                    </div>
-                    <div class='table-card-back'>
-                        <div id="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading track list...</div>
+                    <div class="table-card-back">
+                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading track list...</div>
                    </div>
                </div>
-                % endif
+                % elif data['media_type'] == 'collection':
                <div class="col-md-12">
-                    <div class='table-card-header'>
+                    <div class="table-card-header">
+                        <div class="header-bar">
+                            <span>Movies in <strong>${data['title']}</strong> collection</span>
+                        </div>
+                    </div>
+                    <div class="table-card-back">
+                        <div id="children-list" class="children-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading movies list...</div>
+                    </div>
+                </div>
+                <div id="collection-related-list-container" style="display: none;">
+                </div>
+                % endif
+                % if data['media_type'] != 'collection':
+                <div class="col-md-12">
+                    <div class="table-card-header">
                        <div class="header-bar">
                            <span>Watch History for <strong>${data['title']}</strong></span>
                        </div>
@@ -420,6 +436,7 @@ DOCUMENTATION :: END
                        </table>
                    </div>
                </div>
+                % endif
            </div>
        </div>
    </div>
@@ -428,7 +445,7 @@ DOCUMENTATION :: END
 </%def>

 <%def name="modalIncludes()">
-<div id="info-modal" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="info-modal">
+<div class="modal fade" id="info-modal" tabindex="-1" role="dialog" aria-labelledby="info-modal">
 </div>
 <div class="modal fade" id="ip-info-modal" tabindex="-1" role="dialog" aria-labelledby="ip-info-modal">
 </div>
@@ -562,6 +579,7 @@ DOCUMENTATION :: END
    }
 </script>
 % endif
+% if data['media_type'] != 'collection':
 <script>
    $(document).ready(function () {
        get_history();
@@ -638,7 +656,8 @@ DOCUMENTATION :: END
        });
    });
 </script>
-% if data['media_type'] in ('show', 'season', 'artist', 'album'):
+% endif
+% if data['media_type'] in ('show', 'season', 'artist', 'album', 'collection'):
 <script>
    $.ajax({
        url: 'get_item_children',
@@ -646,7 +665,24 @@ DOCUMENTATION :: END
        async: true,
        data: { rating_key : "${data['rating_key']}" },
        complete: function(xhr, status) {
-        $("#children-list").html(xhr.responseText); }
+            $("#children-list").html(xhr.responseText);
+        }
+    });
+</script>
+% endif
+% if data['media_type'] == 'collection':
+<script>
+    $.ajax({
+        url: 'get_item_children_related',
+        type: 'GET',
+        async: true,
+        data: {
+            rating_key : "${data['rating_key']}",
+            title: "${data['title']}"
+        },
+        complete: function(xhr, status) {
+            $("#collection-related-list-container").html(xhr.responseText).show();
+        }
    });
 </script>
 % endif
--- a/data/interfaces/default/info_children_list.html
+++ b/data/interfaces/default/info_children_list.html
@@ -37,13 +37,42 @@ DOCUMENTATION :: END
        % else:
        <li>
        % endif
-            %if data['children_type'] == 'season':
+            % if data['children_type'] == 'movie':
+            <a href="info?rating_key=${child['rating_key']}" title="${child['title']}">
+                <div class="item-children-poster">
+                    <div class="item-children-poster-face poster-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);"></div>
+                    % if _session['user_group'] == 'admin':
+                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
+                    % endif
+                </div>
+            </a>
+            <div class="item-children-instance-text-wrapper poster-item">
+                <h3>
+                     <a href="info?rating_key=${child['rating_key']}" title="${child['title']}">${child['title']}</a>
+                </h3>
+                <h3 class="text-muted">${child['year']}</h3>
+            </div>
+            % elif data['children_type'] == 'show':
+            <a href="info?rating_key=${child['rating_key']}" title="${child['title']}">
+                <div class="item-children-poster">
+                    <div class="item-children-poster-face poster-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);"></div>
+                    % if _session['user_group'] == 'admin':
+                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
+                    % endif
+                </div>
+            </a>
+            <div class="item-children-instance-text-wrapper poster-item">
+                <h3>
+                     <a href="info?rating_key=${child['rating_key']}" title="${child['title']}">${child['title']}</a>
+                </h3>
+            </div>
+            % elif data['children_type'] == 'season':
            <a href="info?rating_key=${child['rating_key']}" title="Season ${child['media_index']}">
                <div class="item-children-poster">
                    % if child['thumb']:
-                    <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);">
+                    <div class="item-children-poster-face poster-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);">
                    % else:
-                    <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['parent_thumb']}&width=300&height=450&fallback=poster);">
+                    <div class="item-children-poster-face poster-item" style="background-image: url(pms_image_proxy?img=${child['parent_thumb']}&width=300&height=450&fallback=poster);">
                    % endif
                        <div class="item-children-card-overlay">
                            <div class="item-children-overlay-text">
@@ -59,7 +88,7 @@ DOCUMENTATION :: END
            % elif data['children_type'] == 'episode':
            <a href="info?rating_key=${child['rating_key']}" title="Episode ${child['media_index']}">
                <div class="item-children-poster">
-                    <div class="item-children-poster-face episode-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=500&height=250&fallback=art);">
+                    <div class="item-children-poster-face episode-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=500&height=250&fallback=art);">
                        <div class="item-children-card-overlay">
                            <div class="item-children-overlay-text">
                                Episode ${child['media_index']}
@@ -79,13 +108,13 @@ DOCUMENTATION :: END
            % elif data['children_type'] == 'album':
            <a href="info?rating_key=${child['rating_key']}" title="${child['title']}">
                <div class="item-children-poster">
-                    <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300&fallback=cover);"></div>
+                    <div class="item-children-poster-face cover-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300&fallback=cover);"></div>
                    % if _session['user_group'] == 'admin':
                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                    % endif
                </div>
            </a>
-            <div class="item-children-instance-text-wrapper album-item">
+            <div class="item-children-instance-text-wrapper cover-item">
                <h3>
                    <a href="info?rating_key=${child['rating_key']}" title="${child['title']}">${child['title']}</a>
                </h3>
--- a/data/interfaces/default/info_collection_list.html
+++ b/data/interfaces/default/info_collection_list.html
@@ -0,0 +1,99 @@
+<%doc>
+USAGE DOCUMENTATION :: PLEASE LEAVE THIS AT THE TOP OF THIS FILE
+
+For Mako templating syntax documentation please visit: http://docs.makotemplates.org/en/latest/
+
+Filename:           info_collection_list.html
+Version:            0.1
+Variable names:     data [list]
+
+data :: Usable parameters
+
+== Global keys ==
+children_type           Returns the type of children in the array.
+children_count          Returns the number of episodes in the array.
+children_list           Returns an array of episodes.
+
+data['children_list'] :: Usable paramaters
+
+== Global keys ==
+rating_key              Returns the unique identifier for the media item.
+media_index             Returns the episode number.
+title                   Returns the name of the episode.
+thumb                   Returns the location of the item's thumbnail. Use with pms_image_proxy.
+parent_thumb            Returns the location of the item's parent thumbnail. Use with pms_image_proxy.
+
+DOCUMENTATION :: END
+</%doc>
+
+% if data != None:
+<%
+    types = ('movie', 'show', 'artist', 'album')
+    headers = {'movie': 'Movies',
+               'show': 'TV Shows',
+               'season': 'Seasons',
+               'episode': 'Episodes',
+               'artist': 'Artists',
+               'album': 'Albums',
+               'track': 'Tracks',
+               }
+%>
+% for media_type in types:
+% if data['results_list'][media_type]:
+<div class="col-md-12">
+    <div class="table-card-header">
+        <div class="header-bar">
+            <span>${headers[media_type]} in <strong>${title}</strong> collection</span>
+        </div>
+    </div>
+    <div class="table-card-back">
+        <div id="children-list" class="children-list">
+            <div class="item-children-wrapper">
+                <ul class="item-children-instance list-unstyled">
+                    % for child in data['results_list'][media_type]:
+                    <li>
+                        <a href="info?rating_key=${child['rating_key']}" title="${child['title']}">
+                            <div class="item-children-poster">
+                                % if media_type in ('artist', 'album'):
+                                <div class="item-children-poster-face cover-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300&fallback=cover);"></div>
+                                % else:
+                                <div class="item-children-poster-face poster-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);"></div>
+                                % endif
+                                % if _session['user_group'] == 'admin':
+                                <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
+                                % endif
+                            </div>
+                        </a>
+                        % if media_type == 'artist':
+                        <div class="item-children-instance-text-wrapper cover-item">
+                            <h3>
+                                 <a href="info?rating_key=${child['rating_key']}" title="${child['title']}">${child['title']}</a>
+                            </h3>
+                        </div>
+                        % elif media_type == 'album':
+                        <div class="item-children-instance-text-wrapper cover-item">
+                            <h3>
+                                 <a href="info?rating_key=${child['parent_rating_key']}" title="${child['parent_title']}">${child['parent_title']}</a>
+                            </h3>
+                            <h3>
+                                 <a href="info?rating_key=${child['rating_key']}" title="${child['title']}">${child['title']}</a>
+                            </h3>
+                        </div>
+                        % else:
+                        <div class="item-children-instance-text-wrapper poster-item">
+                            <h3>
+                                 <a href="info?rating_key=${child['rating_key']}" title="${child['title']}">${child['title']}</a>
+                            </h3>
+                            <h3 class="text-muted">${child['year']}</h3>
+                        </div>
+                        % endif
+                    </li>
+                    % endfor
+                </ul>
+            </div>
+        </div>
+    </div>
+</div>
+% endif
+% endfor
+% endif
--- a/data/interfaces/default/info_search_results_list.html
+++ b/data/interfaces/default/info_search_results_list.html
@@ -54,6 +54,31 @@ DOCUMENTATION :: END

 % if data != None:
 % if data['results_count'] > 0:
+% if 'collection' in data['results_list'] and data['results_list']['collection']:
+<div class="item-children-wrapper">
+    <div class="item-children-section-title">
+        <h4>Collections</h4>
+    </div>
+    <ul class="item-children-instance list-unstyled">
+        % for child in data['results_list']['collection']:
+        <li>
+            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
+                <div class="item-children-poster">
+                    <div class="item-children-poster-face poster-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);"></div>
+                    % if _session['user_group'] == 'admin':
+                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
+                    % endif
+                </div>
+                <div class="item-children-instance-text-wrapper poster-item">
+                    <h3 title="${child['title']}">${child['title']}</h3>
+                    <h3 class="text-muted">${child['min_year']} - ${child['max_year']}</h3>
+                </div>
+            </a>
+        </li>
+        % endfor
+    </ul>
+</div>
+% endif
 % if 'movie' in data['results_list'] and data['results_list']['movie']:
 <div class="item-children-wrapper">
    <div class="item-children-section-title">
@@ -64,12 +89,12 @@ DOCUMENTATION :: END
        <li>
            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                <div class="item-children-poster">
-                    <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);"></div>
+                    <div class="item-children-poster-face poster-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);"></div>
                    % if _session['user_group'] == 'admin':
                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                    % endif
                </div>
-                <div class="item-children-instance-text-wrapper season-item">
+                <div class="item-children-instance-text-wrapper poster-item">
                    <h3 title="${child['title']}">${child['title']}</h3>
                    <h3 class="text-muted">${child['year']}</h3>
                </div>
@@ -89,12 +114,12 @@ DOCUMENTATION :: END
        <li>
            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                <div class="item-children-poster">
-                    <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);"></div>
+                    <div class="item-children-poster-face poster-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);"></div>
                    % if _session['user_group'] == 'admin':
                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                    % endif
                </div>
-                <div class="item-children-instance-text-wrapper season-item">
+                <div class="item-children-instance-text-wrapper poster-item">
                    <h3 title="${child['title']}">${child['title']}</h3>
                    <h3 class="text-muted">${child['year']}</h3>
                </div>
@@ -114,12 +139,12 @@ DOCUMENTATION :: END
        <li>
            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                <div class="item-children-poster">
-                    <div class="item-children-poster-face season-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);"></div>
+                    <div class="item-children-poster-face poster-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=450&fallback=poster);"></div>
                    % if _session['user_group'] == 'admin':
                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                    % endif
                </div>
-                <div class="item-children-instance-text-wrapper season-item">
+                <div class="item-children-instance-text-wrapper poster-item">
                    <h3 title="${child['parent_title']}">${child['parent_title']}</h3>
                    <h3 class="text-muted">S${child['media_index']}</h3>
                </div>
@@ -139,7 +164,7 @@ DOCUMENTATION :: END
        <li>
            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                <div class="item-children-poster">
-                    <div class="item-children-poster-face episode-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=500&height=250&fallback=art);"></div>
+                    <div class="item-children-poster-face episode-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=500&height=250&fallback=art);"></div>
                    % if _session['user_group'] == 'admin':
                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                    % endif
@@ -165,7 +190,7 @@ DOCUMENTATION :: END
        <li>
            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                <div class="item-children-poster">
-                    <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300&fallback=cover);"></div>
+                    <div class="item-children-poster-face cover-item style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300&fallback=cover);"></div>
                    % if _session['user_group'] == 'admin':
                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                    % endif
@@ -189,7 +214,7 @@ DOCUMENTATION :: END
        <li>
            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                <div class="item-children-poster">
-                    <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300&fallback=cover);"></div>
+                    <div class="item-children-poster-face cover-item" style="background-image: url(pms_image_proxy?img=${child['thumb']}&width=300&height=300&fallback=cover);"></div>
                    % if _session['user_group'] == 'admin':
                    <span class="overlay-refresh-image" title="Refresh image"><i class="fa fa-refresh refresh_pms_image"></i></span>
                    % endif
@@ -214,7 +239,7 @@ DOCUMENTATION :: END
        <li>
            <a href="info?rating_key=${child['rating_key']}" id="${child['rating_key']}">
                <div class="item-children-poster">
-                    <div class="item-children-poster-face album-poster" style="background-image: url(pms_image_proxy?img=${child['parent_thumb']}&width=300&height=300&fallback=cover);">
+                    <div class="item-children-poster-face cover-item" style="background-image: url(pms_image_proxy?img=${child['parent_thumb']}&width=300&height=300&fallback=cover);">
                        <div class="item-children-card-overlay">
                            <div class="item-children-overlay-text">
                                Track ${child['media_index']}
--- a/data/interfaces/default/js/jquery.tripleclick.min.js
+++ b/data/interfaces/default/js/jquery.tripleclick.min.js
@@ -0,0 +1 @@
+!function(t){function i(t){var i=jQuery(this);settings=jQuery.extend({},e,t.data);var a=i.data("triclick_clicks")||0,c=i.data("triclick_start")||0;0===a&&(c=t.timeStamp),0!=c&&t.timeStamp>c+settings.threshold&&(a=0,c=t.timeStamp),a+=1,3===a&&(a=0,c=0,t.type="tripleclick",void 0===jQuery.event.handle?jQuery.event.dispatch.apply(this,arguments):jQuery.event.handle.apply(this,arguments)),i.data("triclick_clicks",a),i.data("triclick_start",c)}var e={threshold:1e3};t.event.special.tripleclick={setup:function(e,a){t(this).bind("touchstart click.triple",e,i)},teardown:function(e){t(this).unbind("touchstart click.triple",i)}}}(jQuery);
--- a/data/interfaces/default/js/tables/history_table.js
+++ b/data/interfaces/default/js/tables/history_table.js
@@ -59,6 +59,8 @@ history_table_options = {
                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Paused"><i class="fa fa-pause fa-fw"></i></span>';
                    } else if (rowData['state'] === 'buffering') {
                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Buffering"><i class="fa fa-spinner fa-fw"></i></span>';
+                    } else if (rowData['state'] === 'stopped') {
+                        state = '<span class="current-activity-tooltip" data-toggle="tooltip" title="Currently Stopped"><i class="fa fa-stop fa-fw"></i></span>';
                    }
                    $(td).html('<div><div style="float: left;">' + state + '&nbsp;' + date + '</div></div>');
                } else if (rowData['group_count'] > 1) {
@@ -203,7 +205,7 @@ history_table_options = {
            "targets": [9],
            "data":"stopped",
            "createdCell": function (td, cellData, rowData, row, col) {
-                if (cellData === null || rowData['state'] != null) {
+                if (cellData === null || rowData['state'] != "stopped") {
                    $(td).html('n/a');
                } else {
                    $(td).html(moment(cellData,"X").format(time_format));
--- a/data/interfaces/default/js/tables/media_info_table.js
+++ b/data/interfaces/default/js/tables/media_info_table.js
@@ -68,7 +68,7 @@ media_info_table_options = {
        },
        {
            "targets": [1],
-            "data": "title",
+            "data": "sort_title",
            "createdCell": function (td, cellData, rowData, row, col) {
                if (cellData !== null && cellData !== '') {
                    var parent_info = '';
@@ -77,31 +77,31 @@ media_info_table_options = {
                    if (rowData['media_type'] === 'movie') {
                        if (rowData['year']) { parent_info = ' (' + rowData['year'] + ')'; }
                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Movie"><i class="fa fa-film fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + cellData + parent_info + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + parent_info + '</span>'
                        $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                    } else if (rowData['media_type'] === 'show') {
                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="TV Show"><i class="fa fa-television fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + cellData + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + '</span>'
                        $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                    } else if (rowData['media_type'] === 'season') {
                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Season"><i class="fa fa-television fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + cellData + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=poster" data-height="120" data-width="80">' + rowData['title'] + '</span>'
                        $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                    } else if (rowData['media_type'] === 'episode') {
                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Episode"><i class="fa fa-television fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=art" data-height="80" data-width="140">E' + rowData['media_index'] + ' - ' + cellData + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=450&fallback=art" data-height="80" data-width="140">E' + rowData['media_index'] + ' - ' + rowData['title'] + '</span>'
                        $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left; padding-left: 30px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                    } else if (rowData['media_type'] === 'artist') {
                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Artist"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">' + cellData + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">' + rowData['title'] + '</span>'
                        $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                    } else if (rowData['media_type'] === 'album') {
                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Album"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">' + cellData + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">' + rowData['title'] + '</span>'
                        $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left; padding-left: 15px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                    } else if (rowData['media_type'] === 'track') {
                        media_type = '<span class="media-type-tooltip" data-toggle="tooltip" title="Track"><i class="fa fa-music fa-fw"></i></span>';
-                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">T' + rowData['media_index'] + ' - ' + cellData + '</span>'
+                        thumb_popover = '<span class="thumb-tooltip" data-toggle="popover" data-img="pms_image_proxy?img=' + rowData['thumb'] + '&width=300&height=300&fallback=cover" data-height="80" data-width="80">T' + rowData['media_index'] + ' - ' + rowData['title'] + '</span>'
                        $(td).html('<div class="history-title"><a href="info?rating_key=' + rowData['rating_key'] + '"><div style="float: left; padding-left: 30px;">' + media_type + '&nbsp;' + thumb_popover + '</div></a></div>');
                    } else {
                        $(td).html(cellData);
--- a/data/interfaces/default/js/tables/sync_table.js
+++ b/data/interfaces/default/js/tables/sync_table.js
@@ -47,7 +47,7 @@ sync_table_options = {
        },
        {
            "targets": [2],
-            "data": "friendly_name",
+            "data": "user",
            "createdCell": function (td, cellData, rowData, row, col) {
                if (cellData !== '') {
                    if (rowData['user_id']) {
@@ -63,7 +63,7 @@ sync_table_options = {
        },
        {
            "targets": [3],
-            "data": "title",
+            "data": "sync_title",
            "createdCell": function (td, cellData, rowData, row, col) {
                if (cellData !== '') {
                    if (rowData['metadata_type'] !== '') {
--- a/data/interfaces/default/libraries.html
+++ b/data/interfaces/default/libraries.html
@@ -8,17 +8,6 @@

 <%def name="body()">
 <div class='container-fluid'>
-    % if config['update_section_ids'] == 1:
-    <div id="update_section_ids_message" style="text-align: center; margin-top: 20px;">
-        <i class="fa fa-exclamation-triangle"></i> Tautulli needs to update the Library IDs in your databse. Click the "<strong>Refresh libraries</strong>" button below to begin the update.
-    </div>
-    % elif config['update_section_ids'] == -1:
-    <div id="update_section_ids_message" style="text-align: center; margin-top: 20px;">
-        <i class="fa fa-refresh fa-spin"></i> Tautulli is updating library IDs in the database. This could take a few minutes to hours depending on the size of your database.
-        <br />
-        You may leave this page and come back later.
-    </div>
-    % endif
    <div class='table-card-header'>
        <div class="header-bar">
            <span><i class="fa fa-book"></i> All Libraries</span>
@@ -31,16 +20,10 @@
                    <i class="fa fa-pencil"></i> Edit mode
                </button>&nbsp
            </div>
-            % if config['update_section_ids'] == -1:
-            <div class="btn-group">
-                <button class="btn btn-dark refresh-libraries-button" id="refresh-libraries-list" disabled><i class="fa fa-refresh"></i> Refresh libraries</button>
-            </div>
-            % else:
            <div class="btn-group">
                <button class="btn btn-dark refresh-libraries-button" id="refresh-libraries-list"><i class="fa fa-refresh"></i> Refresh libraries</button>
            </div>
            % endif
-            % endif
            <div class="btn-group colvis-button-bar"></div>
        </div>
    </div>
@@ -197,14 +180,6 @@

    % if _session['user_group'] == 'admin':
    $("#refresh-libraries-list").click(function () {
-        if ("${config['update_section_ids']}" == "1") {
-            $('#update_section_ids_message').html(
-                '<i class="fa fa-refresh fa-spin"></i> Tautulli is updating library IDs in the database. This could take a few minutes to hours depending on the size of your database.' +
-                '<br />' + 
-                'You may leave this page and come back later.');
-            $(this).prop('disabled', true);
-        }
-
        $.ajax({
            url: 'refresh_libraries_list',
            cache: false,
--- a/data/interfaces/default/library.html
+++ b/data/interfaces/default/library.html
@@ -71,11 +71,11 @@ DOCUMENTATION :: END
                                % endif
                            </div>
                            <div class="user-info-nav">
-                                <ul class="user-info-nav">
-                                    <li class="active"><a href="#profile" data-toggle="tab">Profile</a></li>
-                                    <li><a id="history-tab-btn" href="#libraryHistory" data-toggle="tab">History</a></li>
+                                <ul class="user-info-nav" role="tablist">
+                                    <li class="active"><a href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
+                                    <li><a id="history-tab-btn" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
                                    % if _session['user_group'] == 'admin':
-                                    <li><a id="media-info-tab-btn" href="#libraryMediaInfo" data-toggle="tab">Media Info</a></li>
+                                    <li><a id="media-info-tab-btn" href="#tabs-mediainfo" role="tab" data-toggle="tab">Media Info</a></li>
                                    % endif
                                </ul>
                            </div>
@@ -83,7 +83,7 @@ DOCUMENTATION :: END
                    </div>
                </div>
                <div class="tab-content">
-                    <div class="tab-pane active" id="profile">
+                    <div role="tabpanel" class="tab-pane active" id="tabs-profile">
                        <div class="container-fluid">
                            <div class="row">
                                <div class="col-md-12">
@@ -169,7 +169,7 @@ DOCUMENTATION :: END
                            </div>
                        </div>
                    </div>
-                    <div class="tab-pane" id="libraryHistory">
+                    <div role="tabpanel" class="tab-pane" id="tabs-history">
                        <div class="container-fluid">
                            <div class="row">
                                <div class="col-md-12">
@@ -221,7 +221,7 @@ DOCUMENTATION :: END
                            </div>
                        </div>
                    </div>
-                    <div class="tab-pane" id="libraryMediaInfo">
+                    <div role="tabpanel" class="tab-pane" id="tabs-mediainfo">
                        <div class="container-fluid">
                            <div class="row">
                                <div class="col-md-12">
@@ -366,8 +366,253 @@ DOCUMENTATION :: END
 <script src="${http_root}js/tables/history_table.js${cache_param}"></script>
 <script src="${http_root}js/tables/media_info_table.js${cache_param}"></script>
 <script>
+    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+        $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
+    });
+
+    function loadHistoryTable() {
+        // Build watch history table
+        history_table_options.ajax = {
+            url: 'get_history',
+            type: 'post',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    section_id: section_id,
+                    user_id: "${_session['user_id']}" == "None" ? null : "${_session['user_id']}"
+                };
+            }
+        }
+        history_table = $('#history_table-SID-${data["section_id"]}').DataTable(history_table_options);
+
+        var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 11] });
+        $(colvis.button()).appendTo('#button-bar-history');
+
+        clearSearchButton('history_table-SID-${data["section_id"]}', history_table);
+    }
+
+    $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
+        loadHistoryTable();
+    });
+
+    % if _session['user_group'] == 'admin':
+    function loadMediaInfoTable() {
+        // Build media info table
+        media_info_table_options.ajax = {
+            url: 'get_library_media_info',
+            type: 'post',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    section_id: section_id,
+                    refresh: refresh_table
+                };
+            }
+        }
+        media_info_table = $('#media_info_table-SID-${data["section_id"]}').DataTable(media_info_table_options);
+
+        var colvis = new $.fn.dataTable.ColVis(media_info_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
+        $(colvis.button()).appendTo('#button-bar-media-info');
+
+        clearSearchButton('media_info_table-SID-${data["section_id"]}', media_info_table);
+    }
+
+    $('a[href="#tabs-mediainfo"]').on('shown.bs.tab', function() {
+        loadMediaInfoTable();
+    });
+
+    $("#refresh-media-info-table").click(function () {
+        media_info_child_table = {};
+        refresh_table = true;
+        refresh_child_tables = true;
+        media_info_table.draw();
+        refresh_table = false;
+    });
+
+    $("#edit-library-tooltip").tooltip();
+
+    // Load edit library modal
+    $("#toggle-edit-library-modal").click(function() {
+        $("#edit-library-tooltip").tooltip('hide');
+        $.ajax({
+            url: 'edit_library_dialog',
+            data: { section_id: section_id },
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#edit-library-modal").html(xhr.responseText);
+            }
+        });
+    });
+
+    $('#row-edit-mode').on('click', function() {
+        $('#row-edit-mode-alert').fadeIn(200);
+
+        if ($(this).hasClass('active')) {
+            if (history_to_delete.length > 0) {
+                $('#deleteCount').text(history_to_delete.length);
+                $('#confirm-modal-delete').modal();
+                $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
+                    history_to_delete.forEach(function(row, idx) {
+                        $.ajax({
+                            url: 'delete_history_rows',
+                            type: 'POST',
+                            data: { row_id: row },
+                            async: true,
+                            success: function (data) {
+                                var msg = "History deleted";
+                                showMsg(msg, false, true, 2000);
+                            }
+                        });
+                    });
+                    history_table.draw();
+                });
+            }
+
+            $('.delete-control').each(function () {
+                $(this).addClass('hidden');
+                $('#row-edit-mode-alert').fadeOut(200);
+            });
+
+        } else {
+            history_to_delete = [];
+            $('.delete-control').each(function() {
+                $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
+                $(this).removeClass('hidden');
+            });
+        }
+    });
+    % endif
+
+    $("#refresh-history-list").click(function () {
+        history_table.draw();
+    });
+
+    function recentlyWatched() {
+        // Populate recently watched
+        $.ajax({
+            url: 'library_recently_watched',
+            async: true,
+            data: {
+                section_id: section_id,
+                limit: 50
+            },
+            complete: function(xhr, status) {
+                $("#library-recently-watched").html(xhr.responseText);
+                highlightWatchedScrollerButton();
+            }
+        });
+    }
+
+    function recentlyAdded() {
+        // Populate recently added
+        $.ajax({
+            url: 'library_recently_added',
+            async: true,
+            data: {
+                section_id: section_id,
+                limit: 50
+            },
+            complete: function(xhr, status) {
+                $("#library-recently-added").html(xhr.responseText);
+                highlightAddedScrollerButton();
+            }
+        });
+    }
+
+    recentlyWatched();
+    recentlyAdded();
+
+    function highlightWatchedScrollerButton() {
+        var scroller = $("#recently-watched-row-scroller");
+        var numElems = scroller.find("li").length;
+        scroller.width(numElems * 175);
+        if (scroller.width() > $("#library-recently-watched").width()) {
+            $("#recently-watched-page-right").removeClass("disabled");
+        } else {
+            $("#recently-watched-page-right").addClass("disabled");
+        }
+    }
+
+    function highlightAddedScrollerButton() {
+        var scroller = $("#recently-added-row-scroller");
+        var numElems = scroller.find("li").length;
+        scroller.width(numElems * 175);
+        if (scroller.width() > $("#library-recently-added").width()) {
+            $("#recently-added-page-right").removeClass("disabled");
+        } else {
+            $("#recently-added-page-right").addClass("disabled");
+        }
+    }
+
+    $(window).resize(function() {
+        highlightWatchedScrollerButton();
+        highlightAddedScrollerButton();
+    });
+
+    $('div.art-face').animate({ opacity: 0.2 }, { duration: 1000 });
+
+    var leftTotalWatched = 0;
+    $(".paginate-watched").click(function (e) {
+        e.preventDefault();
+        var scroller = $("#recently-watched-row-scroller");
+        var containerWidth = $("#library-recently-watched").width();
+        var scrollAmount = $(this).data("id") * parseInt(containerWidth / 175) * 175;
+        var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
+
+        leftTotalWatched = Math.max(Math.min(leftTotalWatched + scrollAmount, 0), leftMax);
+        scroller.animate({ left: leftTotalWatched }, 250);
+
+        if (leftTotalWatched == 0) {
+            $("#recently-watched-page-left").addClass("disabled").blur();
+        } else {
+            $("#recently-watched-page-left").removeClass("disabled");
+        }
+
+        if (leftTotalWatched == leftMax) {
+            $("#recently-watched-page-right").addClass("disabled").blur();
+        } else {
+            $("#recently-watched-page-right").removeClass("disabled");
+        }
+    });
+
+    var leftTotalAdded = 0;
+    $(".paginate-added").click(function (e) {
+        e.preventDefault();
+        var scroller = $("#recently-added-row-scroller");
+        var containerWidth = $("#library-recently-added").width();
+        var scrollAmount = $(this).data("id") * parseInt(containerWidth / 175) * 175;
+        var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
+
+        leftTotalAdded = Math.max(Math.min(leftTotalAdded + scrollAmount, 0), leftMax);
+        scroller.animate({ left: leftTotalAdded }, 250);
+
+        if (leftTotalAdded == 0) {
+            $("#recently-added-page-left").addClass("disabled").blur();
+        } else {
+            $("#recently-added-page-left").removeClass("disabled");
+        }
+
+        if (leftTotalAdded == leftMax) {
+            $("#recently-added-page-right").addClass("disabled").blur();
+        } else {
+            $("#recently-added-page-right").removeClass("disabled");
+        }
+    });
+
    $(document).ready(function () {
-        $("#edit-library-tooltip").tooltip();
+
+        // Javascript to enable link to tab
+        var hash = document.location.hash;
+        var prefix = "tab_";
+        if (hash) {
+            $('.user-info-nav a[href='+hash.replace(prefix,"")+']').tab('show').trigger('show.bs.tab');
+        }
+
+        // Change hash for page-reload
+        $('.user-info-nav a').on('shown.bs.tab', function (e) {
+            window.location.hash = e.target.hash.replace("#", "#" + prefix);
+        });

        // Populate watch time stats
        $.ajax({
@@ -389,237 +634,6 @@ DOCUMENTATION :: END
            }
        });

-        function loadHistoryTable() {
-            // Build watch history table
-            history_table_options.ajax = {
-                url: 'get_history',
-                type: 'post',
-                data: function ( d ) {
-                    return {
-                        json_data: JSON.stringify( d ),
-                        section_id: section_id,
-                        user_id: "${_session['user_id']}" == "None" ? null : "${_session['user_id']}"
-                    };
-                }
-            }
-            history_table = $('#history_table-SID-${data["section_id"]}').DataTable(history_table_options);
-
-            var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 11] });
-            $(colvis.button()).appendTo('#button-bar-history');
-
-            clearSearchButton('history_table-SID-${data["section_id"]}', history_table);
-        }
-
-        $( "#history-tab-btn" ).one( "click", function() {
-            loadHistoryTable();
-        });
-
-        $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-            $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
-        });
-
-        % if _session['user_group'] == 'admin':
-        function loadMediaInfoTable() {
-            // Build media info table
-            media_info_table_options.ajax = {
-                url: 'get_library_media_info',
-                type: 'post',
-                data: function ( d ) {
-                    return { 
-                        json_data: JSON.stringify( d ),
-                        section_id: section_id,
-                        refresh: refresh_table
-                    };
-                }
-            }
-            media_info_table = $('#media_info_table-SID-${data["section_id"]}').DataTable(media_info_table_options);
-
-            var colvis = new $.fn.dataTable.ColVis(media_info_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' });
-            $(colvis.button()).appendTo('#button-bar-media-info');
-
-            clearSearchButton('media_info_table-SID-${data["section_id"]}', media_info_table);
-        }
-
-        $( "#media-info-tab-btn" ).one( "click", function() {
-            loadMediaInfoTable();
-        });        
-        
-        $("#refresh-media-info-table").click(function () {
-            media_info_child_table = {};
-            refresh_table = true;
-            refresh_child_tables = true;
-            media_info_table.draw();
-            refresh_table = false;
-        });
-
-        // Load edit library modal
-        $("#toggle-edit-library-modal").click(function() {
-            $("#edit-library-tooltip").tooltip('hide');
-            $.ajax({
-                url: 'edit_library_dialog',
-                data: { section_id: section_id },
-                cache: false,
-                async: true,
-                complete: function(xhr, status) {
-                    $("#edit-library-modal").html(xhr.responseText);
-                }
-            });
-        });
-
-        $('#row-edit-mode').on('click', function() {
-            $('#row-edit-mode-alert').fadeIn(200);
-
-            if ($(this).hasClass('active')) {
-                if (history_to_delete.length > 0) {
-                    $('#deleteCount').text(history_to_delete.length);
-                    $('#confirm-modal-delete').modal();
-                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        history_to_delete.forEach(function(row, idx) {
-                            $.ajax({
-                                url: 'delete_history_rows',
-                                type: 'POST',
-                                data: { row_id: row },
-                                async: true,
-                                success: function (data) {
-                                    var msg = "History deleted";
-                                    showMsg(msg, false, true, 2000);
-                                }
-                            });
-                        });
-                        history_table.draw();
-                    });
-                }
-
-                $('.delete-control').each(function () {
-                    $(this).addClass('hidden');
-                    $('#row-edit-mode-alert').fadeOut(200);
-                });
-
-            } else {
-                history_to_delete = [];
-                $('.delete-control').each(function() {
-                    $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                    $(this).removeClass('hidden');
-                });
-            }
-        });
-        % endif
-
-        $("#refresh-history-list").click(function () {
-            history_table.draw();
-        });
-
-        function recentlyWatched() {
-            // Populate recently watched
-            $.ajax({
-                url: 'library_recently_watched',
-                async: true,
-                data: {
-                    section_id: section_id,
-                    limit: 50
-                },
-                complete: function(xhr, status) {
-                    $("#library-recently-watched").html(xhr.responseText);
-                    highlightWatchedScrollerButton();
-                }
-            });
-        }
-
-        function recentlyAdded() {
-            // Populate recently added
-            $.ajax({
-                url: 'library_recently_added',
-                async: true,
-                data: {
-                    section_id: section_id,
-                    limit: 50
-                },
-                complete: function(xhr, status) {
-                    $("#library-recently-added").html(xhr.responseText);
-                    highlightAddedScrollerButton();
-                }
-            });
-        }
-
-        recentlyWatched();
-        recentlyAdded();
-
-        function highlightWatchedScrollerButton() {
-            var scroller = $("#recently-watched-row-scroller");
-            var numElems = scroller.find("li").length;
-            scroller.width(numElems * 175);
-            if (scroller.width() > $("#library-recently-watched").width()) {
-                $("#recently-watched-page-right").removeClass("disabled");
-            } else {
-                $("#recently-watched-page-right").addClass("disabled");
-            }
-        }
-
-        function highlightAddedScrollerButton() {
-            var scroller = $("#recently-added-row-scroller");
-            var numElems = scroller.find("li").length;
-            scroller.width(numElems * 175);
-            if (scroller.width() > $("#library-recently-added").width()) {
-                $("#recently-added-page-right").removeClass("disabled");
-            } else {
-                $("#recently-added-page-right").addClass("disabled");
-            }
-        }
-
-        $(window).resize(function() {
-            highlightWatchedScrollerButton();
-            highlightAddedScrollerButton();
-        });
-
-        $('div.art-face').animate({ opacity: 0.2 }, { duration: 1000 });
-
-        var leftTotalWatched = 0;
-        $(".paginate-watched").click(function (e) {
-            e.preventDefault();
-            var scroller = $("#recently-watched-row-scroller");
-            var containerWidth = $("#library-recently-watched").width();
-            var scrollAmount = $(this).data("id") * parseInt(containerWidth / 175) * 175;
-            var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
-            
-            leftTotalWatched = Math.max(Math.min(leftTotalWatched + scrollAmount, 0), leftMax);
-            scroller.animate({ left: leftTotalWatched }, 250);
-
-            if (leftTotalWatched == 0) {
-                $("#recently-watched-page-left").addClass("disabled").blur();
-            } else {
-                $("#recently-watched-page-left").removeClass("disabled");
-            }
-
-            if (leftTotalWatched == leftMax) {
-                $("#recently-watched-page-right").addClass("disabled").blur();
-            } else {
-                $("#recently-watched-page-right").removeClass("disabled");
-            }
-        });
-
-        var leftTotalAdded = 0;
-        $(".paginate-added").click(function (e) {
-            e.preventDefault();
-            var scroller = $("#recently-added-row-scroller");
-            var containerWidth = $("#library-recently-added").width();
-            var scrollAmount = $(this).data("id") * parseInt(containerWidth / 175) * 175;
-            var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
-            
-            leftTotalAdded = Math.max(Math.min(leftTotalAdded + scrollAmount, 0), leftMax);
-            scroller.animate({ left: leftTotalAdded }, 250);
-
-            if (leftTotalAdded == 0) {
-                $("#recently-added-page-left").addClass("disabled").blur();
-            } else {
-                $("#recently-added-page-left").removeClass("disabled");
-            }
-
-            if (leftTotalAdded == leftMax) {
-                $("#recently-added-page-right").addClass("disabled").blur();
-            } else {
-                $("#recently-added-page-right").removeClass("disabled");
-            }
-        });
    });
 </script>
 % endif
--- a/data/interfaces/default/login.html
+++ b/data/interfaces/default/login.html
@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
    <meta charset="utf-8">
-    <title>Tautulli - ${title} | ${server_name}</title>
+    <title>Tautulli - ${title}</title>
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <meta name="description" content="">
    <meta name="author" content="">
@@ -14,28 +14,21 @@
    <link href="${http_root}css/font-awesome.min.css" rel="stylesheet">

    <!-- Favicons -->
-    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.0.0">
-    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.0.0">
-    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.0.0">
+    <link rel="icon" type="image/png" sizes="32x32" href="${http_root}images/favicon/favicon-32x32.png?v=2.0.5">
+    <link rel="icon" type="image/png" sizes="16x16" href="${http_root}images/favicon/favicon-16x16.png?v=2.0.5">
+    <link rel="shortcut icon" href="${http_root}images/favicon/favicon.ico?v=2.0.5">

    <!-- ICONS -->
-    <!-- Android >M39 icon -->
-    <link rel="icon" type="image/png" sizes="192x192" href="${http_root}images/favicon/android-chrome-192x192.png?v=2.0.0">
-    <link rel="manifest" href="${http_root}json/Android-manifest.json?v=2.0.0">
-    <meta name="theme-color" content="#1f1f1f">
+    <!-- Android -->
+    <link rel="manifest" href="${http_root}images/favicon/manifest.json?v=2.0.5">
+    <meta name="theme-color" content="#282a2d">
    <!-- Apple -->
-    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.0.0">
-    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.0.0" color="#1f1f1f">
+    <link rel="apple-touch-icon" sizes="180x180" href="${http_root}images/favicon/apple-touch-icon.png?v=2.0.5">
+    <link rel="mask-icon" href="${http_root}images/favicon/safari-pinned-tab.svg?v=2.0.5" color="#282a2d">
    <meta name="apple-mobile-web-app-title" content="Tautulli">
-    <meta name="apple-mobile-web-app-capable" content="yes">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
-    <meta name="viewport" content="initial-scale=1">
-    <meta name="format-detection" content="telephone=no">
-    <!-- IE10 icon -->
+    <!-- Microsoft -->
    <meta name="application-name" content="Tautulli">
-    <meta name="msapplication-TileColor" content="#1f1f1f">
-    <meta name="msapplication-TileImage" content="${http_root}images/favicon/mstile-144x144.png?v=2.0.0">
-    <meta name="msapplication-config" content="${http_root}xml/IEconfig.xml?v=2.0.0" />
+    <meta name="msapplication-config" content="${http_root}images/favicon/browserconfig.xml?v=2.0.5">
 </head>

 <body>
@@ -44,7 +37,7 @@
        <div class="row">
            <div class="login-container">
                <div class="login-logo">
-                    <img alt="Tautulli" src="${http_root}images/logo-tautulli.png">
+                    <object data="${http_root}images/logo-tautulli.svg" type="image/svg+xml" style="height: 100px;"></object>
                </div>
                <div class="row">
                    <div class="col-sm-6 col-sm-offset-3">
--- a/data/interfaces/default/notifier_config.html
+++ b/data/interfaces/default/notifier_config.html
@@ -142,8 +142,9 @@
                            <input type="hidden" name="custom_conditions" id="custom_conditions" />

                            <div class="form-group">
-                                <label for="custom_condition_logic">Condition Logic</label>
+                                <label for="custom_conditions_logic">Condition Logic</label>
                                <input type="text" class="form-control" name="custom_conditions_logic" id="custom_conditions_logic" value="${notifier['custom_conditions_logic']}" required />
+                                <div id="custom_conditions_logic_error" class="alert alert-danger" role="alert" style="padding-top: 5px; padding-bottom: 5px; margin: 0; display: none;"><i class="fa fa-exclamation-triangle" style="color: #a94442;"></i> <span></span></div>
                                <p class="help-block">
                                    Enter the logic to use when evaluating the conditions (e.g. <span class="inline-pre">{1} and ({2} or {3})</span>).
                                </p>
@@ -365,8 +366,10 @@
        $('input[type=text]').val(function(_, value) {
            return $.trim(value);
        });
-        // Reload modal to update certain fields
-        doAjaxCall('set_notifier_config', $(this), 'tabs', true, true, saveCallback);
+        if (validateLogic()) {
+            // Reload modal to update certain fields
+            doAjaxCall('set_notifier_config', $(this), 'tabs', true, true, saveCallback);
+        }
    }

    $('#delete-notifier-item').click(function () {
@@ -466,6 +469,107 @@
    })
    % endif

+    function validateLogic() {
+        const valid_tokens = /(\(|\)|and|or)/g;
+        const conditions_pattern = /{\d+}/g;
+
+        var custom_conditions = $.parseJSON($('#custom_conditions').val());
+        var custom_conditions_logic = $('#custom_conditions_logic').val();
+        var num_cond = custom_conditions.length;
+
+        var tokens = $.map(custom_conditions_logic.toLowerCase().split(valid_tokens), $.trim).filter(String);
+
+        var stack = [[]];
+        var temp;
+
+        var cond_next = true;
+        var bool_next = false;
+        var open_bracket_next = true;
+        var close_bracket_next = false;
+        var nest_and = 0;
+        var nest_nest_and = 0;
+
+        try {
+            $.each(tokens, function(i, x) {
+                if (open_bracket_next && x === '(') {
+                    stack[stack.length-1].push([]);
+                    temp = stack[stack.length-1];
+                    stack.push(temp[temp.length-1]);
+                    cond_next = true;
+                    bool_next = false;
+                    open_bracket_next = true;
+                    close_bracket_next = false;
+                    if (nest_and) {
+                        nest_nest_and += 1
+                    }
+                } else if (close_bracket_next && x === ')') {
+                    stack.pop();
+                    if (stack.length === 0) {
+                        throw 'opening bracket is missing';
+                    }
+                    cond_next = false;
+                    bool_next = true;
+                    open_bracket_next = false;
+                    close_bracket_next = true;
+                    if (nest_and > 0 && nest_nest_and > 0 && nest_and === nest_nest_and) {
+                        stack.pop();
+                        nest_and -= 1;
+                        nest_nest_and -= 1;
+                    }
+                } else if (cond_next && x.match(conditions_pattern)) {
+                    if (isNaN(x.slice(1, -1))) {
+                        throw 'invalid condition logic'
+                    } else {
+                        var num = parseInt(x.slice(1, -1));
+                    }
+                    if (!(0 < num && num <= num_cond)) {
+                        throw 'invalid condition number in condition logic'
+                    }
+                    stack[stack.length-1].push(num);
+                    cond_next = false;
+                    bool_next = true;
+                    open_bracket_next = false;
+                    close_bracket_next = true;
+                    if (nest_and > nest_nest_and) {
+                        stack.pop();
+                        nest_and -= 1;
+                    }
+                } else if (bool_next && x === 'and' && i < tokens.length-1) {
+                    stack[stack.length-1].push([]);
+                    temp = stack[stack.length-1];
+                    stack.push(temp[temp.length-1]);
+                    temp = stack[stack.length-2];
+                    stack[stack.length-1].push(temp.splice(0, temp.length-2) + temp.splice(temp.length-2, temp.length-1));
+                    stack[stack.length-1].push(x);
+                    cond_next = true;
+                    bool_next = false;
+                    open_bracket_next = true;
+                    close_bracket_next = false;
+                    nest_and += 1;
+                } else if (bool_next && x === 'or' && i < tokens.length-1) {
+                    stack[stack.length-1].push(x);
+                    cond_next = true;
+                    bool_next = false;
+                    open_bracket_next = true;
+                    close_bracket_next = false;
+                } else {
+                    throw 'invalid condition logic';
+                }
+            });
+
+            if (stack.length > 1) {
+                throw 'closing bracket is missing';
+            }
+
+            $('#custom_conditions_logic_error').hide();
+            return true;
+        } catch (e) {
+            $('#custom_conditions_logic_error span').text(e);
+            $('#custom_conditions_logic_error').show();
+            showMsg('<i class="fa fa-times"></i> Failed to save notifier. Invalid condition logic.', false, true, 5000, true);
+        }
+    }
+
    $('.notifier-text-preview').click(function () {
        var action = $(this).data('action');
        var subject = $('#' + action + '_subject').val();
@@ -564,10 +668,10 @@
            <button type="button" class="close" data-dismiss="modal" aria-hidden="true"><i class="fa fa-remove"></i></button>
            <h4 class="modal-title" id="notifier-config-modal-header">Error</h4>
        </div>
-        <div class="modal-body">
-            <center><strong>
+        <div class="modal-body" style="text-align: center">
+            <strong>
                <i class="fa fa-exclamation-circle"></i> Failed to retrieve notifier configuration. Check the <a href="logs">logs</a> for more info.
-            </strong></center>
+            </strong>
        </div>
        <div class="modal-footer">
        </div>
--- a/data/interfaces/default/scheduler_table.html
+++ b/data/interfaces/default/scheduler_table.html
@@ -45,7 +45,7 @@ DOCUMENTATION :: END
        % elif job in ('Check for active sessions', 'Check for recently added items') and plexpy.WS_CONNECTED:
        <tr>
            <td>${job}</td>
-            <td><i class="fa fa-sm fa-fw fa-check"></i> Using Websocket</td>
+            <td><i class="fa fa-sm fa-fw fa-check"></i> Websocket</td>
            <td>N/A</td>
            <td>N/A</td>
            <td>N/A</td>
--- a/data/interfaces/default/search.html
+++ b/data/interfaces/default/search.html
@@ -18,7 +18,7 @@
        </div>
    </div>
    <div class='table-card-back'>
-        <div id="search-results-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading search results...</div>
+        <div id="search-results-list" class="search-results-list"><i class="fa fa-refresh fa-spin"></i>&nbsp; Loading search results...</div>
    </div>
 </div>
 </%def>
--- a/data/interfaces/default/settings.html
+++ b/data/interfaces/default/settings.html
@@ -357,6 +357,12 @@
                            </div>
                            <p class="help-block">The base URL of the web server. Used for reverse proxies.</p>
                        </div>
+                       <div class="checkbox">
+                            <label>
+                                <input type="checkbox" class="http-settings" name="http_proxy" id="http_proxy" value="1" ${config['http_proxy']}> Enable HTTP Proxy
+                            </label>
+                            <p class="help-block">Respect the X-Forwarded-Proto header. Used for reverse proxies with SSL.</p>
+                        </div>
                        <br />
                        <div class="checkbox">
                            <label>
@@ -553,7 +559,7 @@
                            <p class="help-block">Enable to have Tautulli check if remote access to the Plex Media Server goes down.</p>
                        </div>

-                        <div class="form-group has-feedback" id="pms-ip-group">
+                        <div class="form-group has-feedback" id="pms_ip_group">
                            <label for="pms_ip">Plex IP or Hostname</label>
                            <div class="row">
                                <div class="col-md-6">
@@ -563,7 +569,7 @@
                                            <button class="btn btn-form" type="button" id="verify_server_button">Verify Server</button>
                                        </span>
                                    </div>
-                                    <span class="form-control-feedback" id="pms-verify" aria-hidden="true" style="display: none; right: 110px;"></span>
+                                    <span class="form-control-feedback" id="pms_verify" aria-hidden="true" style="display: none; right: 110px;"></span>
                                </div>
                                <div id="pms_ip_error" class="alert alert-danger settings-alert" role="alert"></div>
                            </div>
@@ -601,7 +607,12 @@
                            <label for="pms_logs_folder">Plex Web URL</label>
                            <div class="row">
                                <div class="col-md-6">
-                                    <input type="text" class="form-control" id="pms_web_url" name="pms_web_url" value="${config['pms_web_url']}" size="30" data-parsley-trigger="change" data-parsley-pattern="^https?:\/\/.+\/web\/index\.html$|^https:\/\/app.plex.tv\/desktop$" data-parsley-errors-container="#pms_web_url_error"  data-parsley-error-message="Invalid Plex Web URL." required>
+                                    <div class="input-group">
+                                        <input type="text" class="form-control" id="pms_web_url" name="pms_web_url" value="${config['pms_web_url']}" size="30" data-parsley-trigger="change" data-parsley-pattern="^https?:\/\/\S+$|^https:\/\/app.plex.tv\/desktop$" data-parsley-errors-container="#pms_web_url_error"  data-parsley-error-message="Invalid Plex Web URL.">
+                                        <span class="input-group-btn">
+                                            <button class="btn btn-form" type="button" id="test_pms_web_button">Test URL</button>
+                                        </span>
+                                    </div>
                                </div>
                                <div id="pms_web_url_error" class="alert alert-danger settings-alert" role="alert"></div>
                            </div>
@@ -642,7 +653,7 @@
                        </div>

                        <div class="form-group">
-                            <label for="pms_token">PMS Token</label>
+                            <label for="pms_token">Plex.tv Account Token</label>
                            <div class="row">
                                <div class="col-md-6">
                                    <div class="input-group">
@@ -827,7 +838,7 @@

                        <div class="checkbox">
                            <label>
-                                <input type="checkbox" name="notify_upload_posters" id="notify_upload_posters" value="1" ${config['notify_upload_posters']}> Enable Posters in Notifications
+                                <input type="checkbox" name="notify_upload_posters" id="notify_upload_posters" value="1" ${config['notify_upload_posters']}> Upload Posters to Imgur for Notifications
                            </label>
                            <p class="help-block">Enable to upload Plex posters to Imgur for notifications. Disable if posters are not being used to save bandwidth.</p>
                        </div>
@@ -848,13 +859,13 @@
                            <label>
                                <input type="checkbox" name="themoviedb_lookup" id="themoviedb_lookup" value="1" ${config['themoviedb_lookup']}> Lookup TheMovieDB Links
                            </label>
-                            <p class="help-block">Enable to lookup links to TheMovieDB for movies and TV shows when available.</p>
+                            <p class="help-block">Enable to lookup links to TheMovieDB (and IMDb if needed) for movies and TV shows when available.</p>
                        </div>
                        <div class="checkbox">
                            <label>
                                <input type="checkbox" name="tvmaze_lookup" id="tvmaze_lookup" value="1" ${config['tvmaze_lookup']}> Lookup TVmaze Links
                            </label>
-                            <p class="help-block">Enable to lookup links to TVmaze for TV shows when available.</p>
+                            <p class="help-block">Enable to lookup links to TVmaze (and IMDb if needed) for TV shows when available.</p>
                        </div>

                        <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
@@ -884,12 +895,6 @@
                            <h3>Extra Settings</h3>
                        </div>

-                        <div class="checkbox">
-                            <label>
-                                <input type="checkbox" id="pms_use_bif" name="pms_use_bif" value="1" ${config['pms_use_bif']}> Use Video Preview Thumbnails (BIF)
-                            </label>
-                            <p class="help-block">If you have media indexing enabled on your server, use these on the activity pane.</p>
-                        </div>
                        <div class="checkbox">
                            <label>
                                <input type="checkbox" id="get_file_sizes" name="get_file_sizes" value="1" ${config['get_file_sizes']}> Calculate Total File Sizes <span style="color: #eb8600; padding-left: 10px;">[experimental]</span>
@@ -1061,6 +1066,8 @@
                            </div>
                        </div>

+                        <p><input type="button" class="btn btn-bright save-button" value="Save" data-success="Changes saved successfully"></p>
+
                    </div>

                    <div role="tabpanel" class="tab-pane" id="tabs-android_app">
@@ -1108,7 +1115,8 @@
            </div>
            <div class="modal-body">
                <div style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
-                    <strong>Please read the <a href="#" target="_blank" id="guidelines-link">guidelines</a> in the README document <br />before submitting a new <span id="guidelines-type"></span>!</strong>
+                    <strong>Please read the <a href="${anon_url('https://github.com/%s/plexpy/blob/master/CONTRIBUTING.md' % plexpy.CONFIG.GIT_USER)}" target="_blank">guidelines</a>
+                        in the CONTRIBUTING document <br />before submitting a new <span id="guidelines-type"></span>!</strong>
                    <br /><br />
                    Your post may be removed for failure to follow the guidelines.
                </div>
@@ -1129,7 +1137,8 @@
            </div>
            <div class="modal-body">
                <div style="text-align: center; margin-top: 20px; margin-bottom: 20px;">
-                    <strong>Please read the <a href="#" target="_blank" id="faq-link">FAQ</a> before asking for help!</strong>
+                    <strong>Please read the <a href="${anon_url('https://github.com/%s/plexpy/wiki/Frequently-Asked-Questions-(FAQ)' % plexpy.CONFIG.GIT_USER)}" target="_blank">FAQ</a>
+                        before asking for help!</strong>
                </div>
            </div>
            <div class="modal-footer">
@@ -1578,6 +1587,17 @@ $(document).ready(function() {
        }
    }

+    function preSaveChecks(_callback) {
+        if ($("#pms_identifier").val() == "") {
+            verifyServer();
+        }
+        verifyPMSWebURL();
+
+        if (_callback) {
+            _callback();
+        }
+    }
+
    // Alert the user that their changes require a restart.
    function postSaveChecks() {
        if (serverChanged || authChanged || httpChanged || directoryChanged) {
@@ -1607,11 +1627,7 @@ $(document).ready(function() {
    }

    $('.save-button').click(function() {
-        if ($("#pms_identifier").val() == "") {
-            verifyServer(function () { saveSettings() });
-        } else {
-            saveSettings();
-        }
+        preSaveChecks(function () { saveSettings() });
    });

    initConfigCheckbox('#api_enabled');
@@ -1756,43 +1772,45 @@ $(document).ready(function() {
        var pms_identifier = $("#pms_identifier").val();
        var pms_ssl = $("#pms_ssl").is(':checked') ? 1 : 0;
        var pms_is_remote = $("#pms_is_remote").is(':checked') ? 1 : 0;
+
        if (($("#pms_ip").val() !== '') || ($("#pms_port").val() !== '')) {
-            $("#pms-verify").html('<i class="fa fa-refresh fa-spin"></i>');
-            $('#pms-verify').fadeIn('fast');
+            $("#pms_verify").html('<i class="fa fa-refresh fa-spin"></i>').fadeIn('fast');
            $.ajax({
                url: 'get_server_id',
-                data : { hostname: pms_ip, port: pms_port, identifier: pms_identifier, ssl: pms_ssl, remote: pms_is_remote },
+                data: {
+                    hostname: pms_ip,
+                    port: pms_port,
+                    identifier: pms_identifier,
+                    ssl: pms_ssl,
+                    remote: pms_is_remote
+                },
                cache: true,
                async: true,
                timeout: 10000,
-                error: function(jqXHR, textStatus, errorThrown) {
-                    $("#pms-verify").html('<i class="fa fa-close"></i>');
-                    $('#pms-verify').fadeIn('fast');
-                    $("#pms-ip-group").addClass("has-error");
+                error: function (jqXHR, textStatus, errorThrown) {
+                    $("#pms_verify").html('<i class="fa fa-close"></i>').fadeIn('fast');
+                    $("#pms_ip_group").addClass("has-error");
                },
                success: function (json) {
                    var machine_identifier = json;
                    if (machine_identifier) {
                        $("#pms_identifier").val(machine_identifier);
-                        $("#pms-verify").html('<i class="fa fa-check"></i>');
-                        $('#pms-verify').fadeIn('fast');
-                        $("#pms-ip-group").removeClass("has-error");
+                        $("#pms_verify").html('<i class="fa fa-check"></i>').fadeIn('fast');
+                        $("#pms_ip_group").removeClass("has-error");

                        if (_callback) {
                            _callback();
                        }
                    } else {
-                        $("#pms-verify").html('<i class="fa fa-close"></i>');
-                        $('#pms-verify').fadeIn('fast');
-                        $("#pms-ip-group").addClass("has-error");
+                        $("#pms_verify").html('<i class="fa fa-close"></i>').fadeIn('fast');
+                        $("#pms_ip_group").addClass("has-error");
                        showMsg('<i class="fa fa-exclamation-circle"></i> Could not verify your server.', false, true, 5000, true)
                    }
                }
            });
        } else {
-            $("#pms-verify").html('<i class="fa fa-close"></i>');
-            $('#pms-verify').fadeIn('fast');
-            $("#pms-ip-group").addClass("has-error");
+            $("#pms_verify").html('<i class="fa fa-close"></i>').fadeIn('fast');
+            $("#pms_ip_group").addClass("has-error");
            showMsg('<i class="fa fa-exclamation-circle"></i> Could not verify your server.', false, true, 5000, true)
        }
    }
@@ -1802,11 +1820,21 @@ $(document).ready(function() {
        verifyServer();
    });

+    function verifyPMSWebURL() {
+        var pms_web_url = $.trim($("#pms_web_url").val());
+        $("#pms_web_url").val(pms_web_url || 'https://app.plex.tv/desktop');
+    }
+
+    $('#test_pms_web_button').on('click', function(){
+        var pms_web_url = $.trim($("#pms_web_url").val());
+        window.open(pms_web_url, '_blank');
+    });
+
    // Plex.tv auth token fetch
    $("#get-pms-auth-token").click(function() {
        $("#pms-token-status").html('<i class="fa fa-refresh fa-spin"></i> Fetching token...');
-        var pms_username = $("#pms_username").val().trim();
-        var pms_password = $("#pms_password").val().trim();
+        var pms_username = $.trim($("#pms_username").val());
+        var pms_password = $.trim($("#pms_password").val());
        if ((pms_username !== '') && (pms_password !== '')) {
            $.ajax({
                type: 'GET',
--- a/data/interfaces/default/stream_data.html
+++ b/data/interfaces/default/stream_data.html
@@ -38,6 +38,9 @@ DOCUMENTATION :: END
 </%doc>

 % if data:
+<%
+    import plexpy
+%>
 <div class="modal-dialog" role="document">
    <div class="modal-content">
        <div class="modal-header">
@@ -51,86 +54,177 @@ DOCUMENTATION :: END
            </h4>
        </div>
        <div class="modal-body">
-            <div class="container-fluid">
-                <div class="row">
-                    <div class="col-sm-12">
-                        <h4><strong>Stream Details</strong></h4>
-                    </div>
-                    <div class="col-sm-4">
-                        <h5>Media</h5>
-                        <ul class="list-unstyled">
-                            <li>Container: <strong>${data['transcode_container'] if data['transcode_container'] else data['container']}</strong></li>
-                            % if data['media_type'] != 'track':
-                            <li>Resolution: <strong>${data['transcode_height'] if data['transcode_height'] else data['height']}p</strong></li>
-                            % endif
-                        </ul>
-                    </div>
+            <table class="stream-info" style="margin-top: 0;">
+                <thead>
+                    <tr>
+                        <th>
+                        </th>
+                        <th class="heading">
+                            Stream Details
+                        </th>
+                        <th class="heading">
+                            Source Details
+                        </th>
+                    </tr>
+                </thead>
+            </table>
+            <table class="stream-info">
+                <thead>
+                    <tr>
+                        <th>
+                            Media
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Bitrate</td>
+                        <td>${data['stream_bitrate']} kbps</td>
+                        <td>${data['bitrate']} kbps</td>
+                    </tr>
                    % if data['media_type'] != 'track':
-                    <div class="col-sm-4">
-                        <h5>Video</h5>
-                        <ul class="list-unstyled">
-                            <li>Stream: <strong>${data['transcode_video_dec']}</strong></li>
-                            % if data['transcode_video_dec'] != 'direct play':
-                            <li>Width: <strong>${data['transcode_width']}</strong></li>
-                            <li>Height: <strong>${data['transcode_height']}</strong></li>
-                            <li>Codec: <strong>${data['transcode_video_codec']}</strong></li>
-                            % else:
-                            <li>Width: <strong>${data['width']}</strong></li>
-                            <li>Height: <strong>${data['height']}</strong></li>
-                            <li>Codec: <strong>${data['video_codec']}</strong></li>
-                            % endif
-                        </ul>
-                    </div>
+                    <tr>
+                        <td>Resolution</td>
+                        <td>${plexpy.common.VIDEO_RESOLUTION_OVERRIDES.get(data['stream_video_resolution'], data['stream_video_resolution'])}</td>
+                        <td>${plexpy.common.VIDEO_RESOLUTION_OVERRIDES.get(data['video_resolution'], data['video_resolution'])}</td>
+                    </tr>
                    % endif
-                    <div class="col-sm-4">
-                        <h5>Audio</h5>
-                        <ul class="list-unstyled">
-                            <li>Stream: <strong>${data['transcode_audio_dec']}</strong></li>
-                            % if data['transcode_audio_dec'] != 'direct play':
-                            <li>Codec: <strong>${data['transcode_audio_codec']}</strong></li>
-                            <li>Channels: <strong>${data['transcode_audio_channels']}</strong></li>
-                            % else:
-                            <li>Codec: <strong>${data['audio_codec']}</strong></li>
-                            <li>Channels: <strong>${data['audio_channels']}</strong></li>
-                            % endif
-                        </ul>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-sm-12">
-                        <h4><strong>Source Details</strong></h4>
-                    </div>
-                    <div class="col-sm-4">
-                        <h5>Media</h5>
-                        <ul class="list-unstyled">
-                            <li>Container: <strong>${data['container']}</strong></li>
-                            % if data['media_type'] != 'track':
-                            <li>Resolution: <strong>${data['video_resolution'] + 'p'  if data['video_resolution'] != 'sd' else data['video_resolution']}</strong></li>
-                            % endif
-                            <li>Bitrate: <strong>${data['bitrate']} kbps</strong></li>
-                        </ul>
-                    </div>
-                    % if data['media_type'] != 'track':
-                    <div class="col-sm-4">
-                        <h5>Video</h5>
-                        <ul class="list-unstyled">
-                            <li>Width: <strong>${data['width']}</strong></li>
-                            <li>Height: <strong>${data['height']}</strong></li>
-                            <li>Codec: <strong>${data['video_codec']}</strong></li>
-                            <li>Aspect Ratio: <strong>${data['aspect_ratio']}</strong></li>
-                            <li>Frame Rate: <strong>${data['video_framerate']}</strong></li>
-                        </ul>
-                    </div>
+                    <tr>
+                        <td>Quality</td>
+                        <td>${data['quality_profile']}</td>
+                        <td>-</td>
+                    </tr>
+                    % if data['optimized_version'] == 1:
+                    <tr>
+                        <td>Optimized Version</td>
+                        <td>-</td>
+                        <td>${data['optimized_version_profile']}<br>(${data['optimized_version_title']})</td>
+                    </tr>
                    % endif
-                    <div class="col-sm-4">
-                        <h5>Audio</h5>
-                        <ul class="list-unstyled">
-                            <li>Codec: <strong>${data['audio_codec']}</strong></li>
-                            <li>Channels: <strong>${data['audio_channels']}</strong></li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
+                    % if data['synced_version'] == 1:
+                    <tr>
+                        <td>Synced Version</td>
+                        <td>-</td>
+                        <td>${data['synced_version_profile']}</td>
+                    </tr>
+                    % endif
+                </tbody>
+            </table>
+            <table class="stream-info">
+                <thead>
+                    <tr>
+                        <th>
+                            Container
+                        </th>
+                        <th>
+                            ${data['stream_container_decision']}
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Container</td>
+                        <td>${data['stream_container']}</td>
+                        <td>${data['container']}</td>
+                    </tr>
+                </tbody>
+            </table>
+            % if data['media_type'] != 'track':
+            <table class="stream-info">
+                <thead>
+                    <tr>
+                        <th>
+                            Video
+                        </th>
+                        <th>
+                            ${data['stream_video_decision']}
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Codec</td>
+                        <td>${data['stream_video_codec']}</td>
+                        <td>${data['video_codec']}</td>
+                    </tr>
+                    <tr>
+                        <td>Bitrate</td>
+                        <td>${data['stream_video_bitrate']} kbps</td>
+                        <td>${data['video_bitrate']} kbps</td>
+                    </tr>
+                    <tr>
+                        <td>Width</td>
+                        <td>${data['stream_video_width']}</td>
+                        <td>${data['video_width']}</td>
+                    </tr>
+                    <tr>
+                        <td>Height</td>
+                        <td>${data['stream_video_height']}</td>
+                        <td>${data['video_height']}</td>
+                    </tr>
+                    <tr>
+                        <td>Framerate</td>
+                        <td>${data['stream_video_framerate']}</td>
+                        <td>${data['video_framerate']}</td>
+                    </tr>
+                    <tr>
+                        <td>Aspect Ratio</td>
+                        <td>-</td>
+                        <td>${data['aspect_ratio']}</td>
+                    </tr>
+                </tbody>
+            </table>
+            % endif
+            <table class="stream-info">
+                <thead>
+                    <tr>
+                        <th>
+                            Audio
+                        </th>
+                        <th>
+                            ${data['stream_audio_decision']}
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Codec</td>
+                        <td>${data['stream_audio_codec']}</td>
+                        <td>${data['audio_codec']}</td>
+                    </tr>
+                    <tr>
+                        <td>Bitrate</td>
+                        <td>${data['stream_audio_bitrate']} kbps</td>
+                        <td>${data['audio_bitrate']} kbps</td>
+                    </tr>
+                    <tr>
+                        <td>Channels</td>
+                        <td>${data['stream_audio_channels']}</td>
+                        <td>${data['audio_channels']}</td>
+                    </tr>
+                </tbody>
+            </table>
+            % if data['subtitles'] == 1:
+            <table class="stream-info">
+                <thead>
+                    <tr>
+                        <th>
+                            Subtitles
+                        </th>
+                        <th>
+                            ${data['stream_subtitle_decision']}
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td>Codec</td>
+                        <td>${data['stream_subtitle_codec']}</td>
+                        <td>${data['subtitle_codec']}</td>
+                    </tr>
+                </tbody>
+            </table>
+            % endif
        </div>
        <div class="modal-footer">
        </div>
--- a/data/interfaces/default/sync.html
+++ b/data/interfaces/default/sync.html
@@ -40,7 +40,7 @@
                <th align="left" id="delete_row">Delete</th>
                <th align="left" id="state">State</th>
                <th align="left" id="user">User</th>
-                <th align="left" id="title">Title</th>
+                <th align="left" id="sync_title">Title</th>
                <th align="left" id="type">Type</th>
                <th align="left" id="platform">Platform</th>
                <th align="left" id="device">Device</th>
--- a/data/interfaces/default/user.html
+++ b/data/interfaces/default/user.html
@@ -61,19 +61,19 @@ DOCUMENTATION :: END
                                % endif
                            </div>
                            <div class="user-info-nav">
-                                <ul class="user-info-nav">
-                                    <li class="active"><a href="#profile" data-toggle="tab">Profile</a></li>
-                                    <li><a id="history-tab-btn" href="#userHistory" data-toggle="tab">History</a></li>
-                                    <li><a id="sync-tab-btn" href="#userSyncItems" data-toggle="tab">Synced Items</a></li>
-                                    <li><a id="ip-tab-btn" href="#userAddresses" data-toggle="tab">IP Addresses</a></li>
-                                    <li><a id="login-tab-btn" href="#userLogins" data-toggle="tab">Tautulli Logins</a></li>
+                                <ul class="user-info-nav" role="tablist">
+                                    <li class="active"><a href="#tabs-profile" role="tab" data-toggle="tab">Profile</a></li>
+                                    <li><a id="history-tab-btn" href="#tabs-history" role="tab" data-toggle="tab">History</a></li>
+                                    <li><a id="sync-tab-btn" href="#tabs-synceditems" role="tab" data-toggle="tab">Synced Items</a></li>
+                                    <li><a id="ip-tab-btn" href="#tabs-ipaddresses" role="tab" data-toggle="tab">IP Addresses</a></li>
+                                    <li><a id="login-tab-btn" href="#tabs-tautullilogins" role="tab" data-toggle="tab">Tautulli Logins</a></li>
                                </ul>
                            </div>
                        </div>
                    </div>
                </div>
                <div class="tab-content">
-                    <div class="tab-pane active" id="profile">
+                    <div role="tabpanel" class="tab-pane active" id="tabs-profile">
                        <div class="container-fluid">
                            <div class="row">
                                <div class="col-md-12">
@@ -134,7 +134,7 @@ DOCUMENTATION :: END
                            </div>
                        </div>
                    </div>
-                    <div class="tab-pane" id="userHistory">
+                    <div role="tabpanel" class="tab-pane" id="tabs-history">
                        <div class="container-fluid">
                            <div class="row">
                                <div class="col-md-12">
@@ -200,7 +200,7 @@ DOCUMENTATION :: END
                            </div>
                        </div>
                    </div>
-                    <div class="tab-pane" id="userSyncItems">
+                    <div role="tabpanel" class="tab-pane" id="tabs-synceditems">
                        <div class="container-fluid">
                            <div class="row">
                                <div class="col-md-12">
@@ -240,7 +240,7 @@ DOCUMENTATION :: END
                            </div>
                        </div>
                    </div>
-                    <div class="tab-pane" id="userAddresses">
+                    <div role="tabpanel" class="tab-pane" id="tabs-ipaddresses">
                        <div class="container-fluid">
                            <div class="row">
                                <div class="col-md-12">
@@ -271,7 +271,7 @@ DOCUMENTATION :: END
                            </div>
                        </div>
                    </div>
-                    <div class="tab-pane" id="userLogins">
+                    <div role="tabpanel" class="tab-pane" id="tabs-tautullilogins">
                        <div class="container-fluid">
                            <div class="row">
                                <div class="col-md-12">
@@ -369,23 +369,246 @@ DOCUMENTATION :: END
 <script src="${http_root}js/dataTables.bootstrap.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
 % if data:
+<script>
+    % if str(data['user_id']).isdigit():
+    var user_id = ${data['user_id']};
+    % else:
+    var user_id = null;
+    % endif
+
+    var username = '${data['username'].replace("'", "\\'")}';
+</script>
 <script src="${http_root}js/moment-with-locale.js"></script>
 <script src="${http_root}js/tables/history_table.js${cache_param}"></script>
 <script src="${http_root}js/tables/user_ips.js${cache_param}"></script>
 <script src="${http_root}js/tables/sync_table.js${cache_param}"></script>
 <script src="${http_root}js/tables/login_logs.js${cache_param}"></script>
 <script>
+    $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
+        $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
+    });
+
+    $('a[href="#tabs-profile"]').on('shown.bs.tab', function() {
+        var media_type = null;
+        loadHistoryTable(media_type);
+    });
+
+    function loadHistoryTable(media_type) {
+        // Build watch history table
+        history_table_options.ajax = {
+            url: 'get_history',
+            type: 'post',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    user_id: user_id,
+                    media_type: media_type
+                };
+            }
+        }
+        history_table = $('#history_table-UID-${data["user_id"]}').DataTable(history_table_options);
+        history_table.column(2).visible(false);
+
+        var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 11] });
+        $(colvis.button()).appendTo('#button-bar-history');
+
+        clearSearchButton('history_table-UID-${data["user_id"]}', history_table);
+
+        $('#media_type-selection').on('change', function () {
+            $('#media_type-selection > label').removeClass('active');
+            selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
+            $(selected_filter).closest('label').addClass('active');
+            media_type = $(selected_filter).val();
+            history_table.draw();
+        });
+    }
+
+    $('a[href="#tabs-history"]').on('shown.bs.tab', function() {
+        var media_type = null;
+        loadHistoryTable(media_type);
+    });
+
+    $('a[href="#tabs-synceditems"]').on('shown.bs.tab', function() {
+        // Build user sync table
+        sync_table_options.ajax = {
+            url: 'get_sync',
+            data: function(d) {
+                d.user_id = user_id;
+            }
+        }
+        sync_table = $('#sync_table-UID-${data["user_id"]}').DataTable(sync_table_options);
+        sync_table.column(1).visible(false);
+
+        var colvis_sync = new $.fn.dataTable.ColVis( sync_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' } );
+        $( colvis_sync.button() ).appendTo('#button-bar-sync');
+
+        clearSearchButton('sync_table-UID-${data["user_id"]}', sync_table);
+    });
+
+    $('a[href="#tabs-ipaddresses"]').on('shown.bs.tab', function() {
+        // Build user IP table
+        user_ip_table_options.ajax = {
+            url: 'get_user_ips',
+            type: 'post',
+            data: function ( d ) {
+                return {
+                    json_data: JSON.stringify( d ),
+                    user_id: user_id
+                };
+            }
+        }
+        user_ip_table = $('#user_ip_table-UID-${data["user_id"]}').DataTable(user_ip_table_options);
+
+        clearSearchButton('user_ip_table-UID-${data["user_id"]}', user_ip_table);
+    });
+
+    $('a[href="#tabs-tautullilogins"]').on('shown.bs.tab', function() {
+        // Build user login table
+        login_log_table_options.ajax = {
+            url: 'get_user_logins',
+            data: function(d) {
+                d.user_id = user_id;
+            }
+        }
+        login_log_table = $('#login_log_table-UID-${data["user_id"]}').DataTable(login_log_table_options);
+        login_log_table.columns([1, 2]).visible(false);
+
+        var colvis_login = new $.fn.dataTable.ColVis( login_log_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' } );
+        $( colvis_login.button() ).appendTo('#button-bar-login');
+
+        clearSearchButton('login_log_table-UID-${data["user_id"]}', login_log_table);
+    });
+
+    % if _session['user_group'] == 'admin':
+    $("#edit-user-tooltip").tooltip();
+
+    // Load edit user modal
+    $("#toggle-edit-user-modal").click(function() {
+        $("#edit-user-tooltip").tooltip('hide');
+        $.ajax({
+            url: 'edit_user_dialog',
+            data: { user_id: user_id },
+            cache: false,
+            async: true,
+            complete: function(xhr, status) {
+                $("#edit-user-modal").html(xhr.responseText);
+            }
+        });
+    });
+
+    $('#row-edit-mode').on('click', function() {
+        $('#row-edit-mode-alert').fadeIn(200);
+
+        if ($(this).hasClass('active')) {
+            if (history_to_delete.length > 0) {
+                $('#deleteCount').text(history_to_delete.length);
+                $('#confirm-modal-delete').modal();
+                $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
+                    history_to_delete.forEach(function(row, idx) {
+                        $.ajax({
+                            url: 'delete_history_rows',
+                            type: 'POST',
+                            data: { row_id: row },
+                            async: true,
+                            success: function (data) {
+                                var msg = "History deleted";
+                                showMsg(msg, false, true, 2000);
+                            }
+                        });
+                    });
+                    history_table.draw();
+                });
+            }
+
+            $('.delete-control').each(function () {
+                $(this).addClass('hidden');
+                $('#row-edit-mode-alert').fadeOut(200);
+            });
+
+        } else {
+            history_to_delete = [];
+            $('.delete-control').each(function() {
+                $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
+                $(this).removeClass('hidden');
+            });
+        }
+    });
+    % endif
+
+    $("#refresh-history-list").click(function () {
+        history_table.draw();
+    });
+
+    function recentlyWatched() {
+        // Populate recently watched
+        $.ajax({
+            url: 'get_user_recently_watched',
+            async: true,
+            data: {
+                user_id: user_id,
+                limit: 50
+            },
+            complete: function(xhr, status) {
+                $("#user-recently-watched").html(xhr.responseText);
+                highlightWatchedScrollerButton();
+            }
+        });
+    }
+
+    recentlyWatched();
+
+    function highlightWatchedScrollerButton() {
+        var scroller = $("#recently-watched-row-scroller");
+        var numElems = scroller.find("li").length;
+        scroller.width(numElems * 175);
+        if (scroller.width() > $("#user-recently-watched").width()) {
+            $("#recently-watched-page-right").removeClass("disabled");
+        } else {
+            $("#recently-watched-page-right").addClass("disabled");
+        }
+    }
+
+    $(window).resize(function() {
+        highlightWatchedScrollerButton();
+    });
+
+    var leftTotal = 0;
+    $(".paginate").click(function (e) {
+        e.preventDefault();
+        var scroller = $("#recently-watched-row-scroller");
+        var containerWidth = $("#user-recently-watched").width();
+        var scrollAmount = $(this).data("id") * parseInt(containerWidth / 175) * 175;
+        var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
+
+        leftTotal = Math.max(Math.min(leftTotal + scrollAmount, 0), leftMax);
+        scroller.animate({ left: leftTotal }, 250);
+
+        if (leftTotal == 0) {
+            $("#recently-watched-page-left").addClass("disabled").blur();
+        } else {
+            $("#recently-watched-page-left").removeClass("disabled");
+        }
+
+        if (leftTotal == leftMax) {
+            $("#recently-watched-page-right").addClass("disabled").blur();
+        } else {
+            $("#recently-watched-page-right").removeClass("disabled");
+        }
+    });
+
    $(document).ready(function () {

-        % if str(data['user_id']).isdigit():
-        var user_id = ${data['user_id']};
-        % else:
-        var user_id = null;
-        % endif
+        // Javascript to enable link to tab
+        var hash = document.location.hash;
+        var prefix = "tab_";
+        if (hash) {
+            $('.user-info-nav a[href='+hash.replace(prefix,"")+']').tab('show').trigger('show.bs.tab');
+        }

-        var username = '${data['username'].replace("'", "\\'")}';
-
-        $("#edit-user-tooltip").tooltip();
+        // Change hash for page-reload
+        $('.user-info-nav a').on('shown.bs.tab', function (e) {
+            window.location.hash = e.target.hash.replace("#", "#" + prefix);
+        });

        // Populate watch time stats
        $.ajax({
@@ -407,210 +630,6 @@ DOCUMENTATION :: END
            }
        });

-        function loadHistoryTable(media_type) {
-            // Build watch history table
-            history_table_options.ajax = {
-                url: 'get_history',
-                type: 'post',
-                data: function ( d ) {
-                    return {
-                        json_data: JSON.stringify( d ),
-                        user_id: user_id,
-                        media_type: media_type
-                    };
-                }
-            }
-            history_table = $('#history_table-UID-${data["user_id"]}').DataTable(history_table_options);
-            history_table.column(2).visible(false);
-
-            var colvis = new $.fn.dataTable.ColVis(history_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark', exclude: [0, 11] });
-            $(colvis.button()).appendTo('#button-bar-history');
-
-            clearSearchButton('history_table-UID-${data["user_id"]}', history_table);
-
-            $('#media_type-selection').on('change', function () {
-                $('#media_type-selection > label').removeClass('active');
-                selected_filter = $('input[name=media_type-filter]:checked', '#media_type-selection');
-                $(selected_filter).closest('label').addClass('active');
-                media_type = $(selected_filter).val();
-                history_table.draw();
-            });
-        }
-
-        $( "#history-tab-btn" ).one( "click", function() {
-            var media_type = null;
-            loadHistoryTable(media_type);
-        });
-
-        $( "#ip-tab-btn" ).one( "click", function() {
-            // Build user IP table
-            user_ip_table_options.ajax = {
-                url: 'get_user_ips',
-                type: 'post',
-                data: function ( d ) {
-                    return { 
-                        json_data: JSON.stringify( d ),
-                        user_id: user_id
-                    };
-                }
-            }
-            user_ip_table = $('#user_ip_table-UID-${data["user_id"]}').DataTable(user_ip_table_options);
-
-            clearSearchButton('user_ip_table-UID-${data["user_id"]}', user_ip_table);
-        });
-
-        $( "#sync-tab-btn" ).one( "click", function() {
-            // Build user sync table
-            sync_table_options.ajax = {
-                url: 'get_sync',
-                data: function(d) {
-                    d.user_id = user_id;
-                }
-            }
-            sync_table = $('#sync_table-UID-${data["user_id"]}').DataTable(sync_table_options);
-            sync_table.column(1).visible(false);
-
-            var colvis_sync = new $.fn.dataTable.ColVis( sync_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' } );
-            $( colvis_sync.button() ).appendTo('#button-bar-sync');
-
-            clearSearchButton('sync_table-UID-${data["user_id"]}', sync_table);
-        });
-
-        $( "#login-tab-btn" ).one( "click", function() {
-            // Build user login table
-            login_log_table_options.ajax = {
-                url: 'get_user_logins',
-                data: function(d) {
-                    d.user_id = user_id;
-                }
-            }
-            login_log_table = $('#login_log_table-UID-${data["user_id"]}').DataTable(login_log_table_options);
-            login_log_table.columns([1, 2]).visible(false);
-
-            var colvis_login = new $.fn.dataTable.ColVis( login_log_table, { buttonText: '<i class="fa fa-columns"></i> Select columns', buttonClass: 'btn btn-dark' } );
-            $( colvis_login.button() ).appendTo('#button-bar-login');
-
-            clearSearchButton('login_log_table-UID-${data["user_id"]}', login_log_table);
-        });
-
-        $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-            $.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
-        });
-
-        % if _session['user_group'] == 'admin':
-        // Load edit user modal
-        $("#toggle-edit-user-modal").click(function() {
-            $("#edit-user-tooltip").tooltip('hide');
-            $.ajax({
-                url: 'edit_user_dialog',
-                data: { user_id: user_id },
-                cache: false,
-                async: true,
-                complete: function(xhr, status) {
-                    $("#edit-user-modal").html(xhr.responseText);
-                }
-            });
-        });
-
-        $('#row-edit-mode').on('click', function() {
-            $('#row-edit-mode-alert').fadeIn(200);
-
-            if ($(this).hasClass('active')) {
-                if (history_to_delete.length > 0) {
-                    $('#deleteCount').text(history_to_delete.length);
-                    $('#confirm-modal-delete').modal();
-                    $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
-                        history_to_delete.forEach(function(row, idx) {
-                            $.ajax({
-                                url: 'delete_history_rows',
-                                type: 'POST',
-                                data: { row_id: row },
-                                async: true,
-                                success: function (data) {
-                                    var msg = "History deleted";
-                                    showMsg(msg, false, true, 2000);
-                                }
-                            });
-                        });
-                        history_table.draw();
-                    });
-                }
-
-                $('.delete-control').each(function () {
-                    $(this).addClass('hidden');
-                    $('#row-edit-mode-alert').fadeOut(200);
-                });
-
-            } else {
-                history_to_delete = [];
-                $('.delete-control').each(function() {
-                    $(this).find('button.btn-danger').toggleClass('btn-warning').toggleClass('btn-danger');
-                    $(this).removeClass('hidden');
-                });
-            }
-        });
-        % endif
-
-        $("#refresh-history-list").click(function () {
-            history_table.draw();
-        });
-
-        function recentlyWatched() {
-            // Populate recently watched
-            $.ajax({
-                url: 'get_user_recently_watched',
-                async: true,
-                data: {
-                    user_id: user_id,
-                    limit: 50
-                },
-                complete: function(xhr, status) {
-                    $("#user-recently-watched").html(xhr.responseText);
-                    highlightWatchedScrollerButton();
-                }
-            });
-        }
-
-        recentlyWatched();
-
-        function highlightWatchedScrollerButton() {
-            var scroller = $("#recently-watched-row-scroller");
-            var numElems = scroller.find("li").length;
-            scroller.width(numElems * 175);
-            if (scroller.width() > $("#user-recently-watched").width()) {
-                $("#recently-watched-page-right").removeClass("disabled");
-            } else {
-                $("#recently-watched-page-right").addClass("disabled");
-            }
-        }
-
-        $(window).resize(function() {
-            highlightWatchedScrollerButton();
-        });
-
-        var leftTotal = 0;
-        $(".paginate").click(function (e) {
-            e.preventDefault();
-            var scroller = $("#recently-watched-row-scroller");
-            var containerWidth = $("#user-recently-watched").width();
-            var scrollAmount = $(this).data("id") * parseInt(containerWidth / 175) * 175;
-            var leftMax = Math.min(-parseInt(scroller.width()) + Math.abs(scrollAmount), 0);
-            
-            leftTotal = Math.max(Math.min(leftTotal + scrollAmount, 0), leftMax);
-            scroller.animate({ left: leftTotal }, 250);
-
-            if (leftTotal == 0) {
-                $("#recently-watched-page-left").addClass("disabled").blur();
-            } else {
-                $("#recently-watched-page-left").removeClass("disabled");
-            }
-
-            if (leftTotal == leftMax) {
-                $("#recently-watched-page-right").addClass("disabled").blur();
-            } else {
-                $("#recently-watched-page-right").removeClass("disabled");
-            }
-        });
    });
 </script>
 % endif
--- a/data/interfaces/default/users.html
+++ b/data/interfaces/default/users.html
@@ -83,7 +83,7 @@
 <script src="${http_root}js/dataTables.bootstrap.min.js"></script>
 <script src="${http_root}js/dataTables.bootstrap.pagination.js"></script>
 <script src="${http_root}js/moment-with-locale.js"></script>
-<script src="${http_root}js/tables/users.js"></script>
+<script src="${http_root}js/tables/users.js${cache_param}"></script>
 <script>
    $(document).ready(function () {
        users_list_table_options.ajax = {
--- a/data/interfaces/default/welcome.html
+++ b/data/interfaces/default/welcome.html
@@ -164,12 +164,15 @@
                    <!-- Required fields but hidden -->
                    <div style="display: none;">
                        <input type="checkbox" name="first_run" id="first_run" value="1" checked>
-                        <input type="checkbox" name="launch_browser" id="launch_browser" value="1" ${config['launch_browser']}>
-                        <input type="checkbox" name="refresh_users_on_startup" id="refresh_users_on_startup" value="1" ${config['refresh_users_on_startup']}>
-                        <input type="checkbox" name="refresh_libraries_on_startup" id="refresh_libraries_on_startup" value="1" ${config['refresh_libraries_on_startup']}>
-                        <input type="checkbox" name="check_github" id="check_github" value="1" ${config['check_github']}>
-                        <input type="checkbox" name="log_blacklist" id="log_blacklist" value="1" ${config['log_blacklist']}>
-                        <input type="checkbox" name="cache_images" id="cache_images" value="1" ${config['cache_images']}>
+                        <input type="checkbox" name="group_history_tables" id="group_history_tables" value="1" checked>
+                        <input type="checkbox" name="history_table_activity" id="history_table_activity" value="1" checked>
+                        <input type="checkbox" name="launch_browser" id="launch_browser" value="1" checked>
+                        <input type="checkbox" name="api_enabled" id="api_enabled" value="1" checked>
+                        <input type="checkbox" name="refresh_users_on_startup" id="refresh_users_on_startup" value="1" checked>
+                        <input type="checkbox" name="refresh_libraries_on_startup" id="refresh_libraries_on_startup" value="1" checked>
+                        <input type="checkbox" name="check_github" id="check_github" value="1" checked>
+                        <input type="checkbox" name="log_blacklist" id="log_blacklist" value="1" checked>
+                        <input type="checkbox" name="cache_images" id="cache_images" value="1" checked>
                        <input type="checkbox" name="server_changed" id="server_changed" value="1" checked>
                        <input type="checkbox" name="first_run_complete" id="first_run_complete" value="1" checked>
                        <input type="text" name="home_stats_cards" id="home_stats_cards" value="first_run_wizard">
--- a/data/interfaces/default/xml/IEconfig.xml
+++ b/data/interfaces/default/xml/IEconfig.xml
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square70x70logo src="${http_root}images/favicon/mstile-70x70.png?v=2.0.0"/>
-            <square150x150logo src="${http_root}images/favicon/mstile-150x150.png?v=2.0.0"/>
-            <square310x310logo src="${http_root}images/favicon/mstile-310x310.png?v=2.0.0"/>
-            <TileColor>#1f1f1f</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>
--- a/lib/cherrypy/wsgiserver/ssl_pyopenssl.py
+++ b/lib/cherrypy/wsgiserver/ssl_pyopenssl.py
@@ -39,6 +39,10 @@ from cherrypy import wsgiserver
 try:
    from OpenSSL import SSL
    from OpenSSL import crypto
+    if hasattr(SSL, 'Connection'):
+        SSLConnectionType = SSL.Connection
+    else:
+        SSLConnectionType = SSL.ConnectionType
 except ImportError:
    SSL = None

@@ -244,7 +248,7 @@ class pyOpenSSLAdapter(wsgiserver.SSLAdapter):
        return ssl_environ

    def makefile(self, sock, mode='r', bufsize=-1):
-        if SSL and isinstance(sock, SSL.ConnectionType):
+        if SSL and isinstance(sock, SSLConnectionType):
            timeout = sock.gettimeout()
            f = SSL_fileobject(sock, mode, bufsize)
            f.ssl_timeout = timeout
--- a/plexpy/init.py
+++ b/plexpy/init.py
@@ -36,12 +36,14 @@ import activity_handler
 import activity_pinger
 import config
 import database
+import libraries
 import logger
 import mobile_app
 import notification_handler
 import notifiers
 import plextv
 import pmsconnect
+import users
 import versioncheck
 import plexpy.config

@@ -172,10 +174,18 @@ def initialize(config_file):

        # Check if Tautulli has a uuid
        if CONFIG.PMS_UUID == '' or not CONFIG.PMS_UUID:
+            logger.debug(u"Generating UUID...")
            my_uuid = generate_uuid()
            CONFIG.__setattr__('PMS_UUID', my_uuid)
            CONFIG.write()
-
+        
+        # Check if Tautulli has an API key
+        if CONFIG.API_KEY == '':
+            logger.debug(u"Generating API key...")
+            api_key = generate_uuid()
+            CONFIG.__setattr__('API_KEY', api_key)
+            CONFIG.write()
+        
        # Get the currently installed version. Returns None, 'win32' or the git
        # hash.
        CURRENT_VERSION, CONFIG.GIT_REMOTE, CONFIG.GIT_BRANCH = versioncheck.getVersion()
@@ -205,16 +215,15 @@ def initialize(config_file):

        # Get the real PMS urls for SSL and remote access
        if CONFIG.PMS_TOKEN and CONFIG.PMS_IP and CONFIG.PMS_PORT:
-            plextv.get_real_pms_url()
-            pmsconnect.get_server_friendly_name()
+            plextv.get_server_resources()

        # Refresh the users list on startup
        if CONFIG.PMS_TOKEN and CONFIG.REFRESH_USERS_ON_STARTUP:
-            plextv.refresh_users()
+            users.refresh_users()

        # Refresh the libraries list on startup
        if CONFIG.PMS_IP and CONFIG.PMS_TOKEN and CONFIG.REFRESH_LIBRARIES_ON_STARTUP:
-            pmsconnect.refresh_libraries()
+            libraries.refresh_libraries()

        # Store the original umask
        UMASK = os.umask(0)
@@ -315,14 +324,8 @@ def initialize_scheduler():
                     hours=backup_hours, minutes=0, seconds=0, args=(True, True))

        if WS_CONNECTED and CONFIG.PMS_IP and CONFIG.PMS_TOKEN:
-            #schedule_job(activity_pinger.check_active_sessions, 'Check for active sessions',
-            #             hours=0, minutes=0, seconds=1)
-            #schedule_job(activity_pinger.check_recently_added, 'Check for recently added items',
-            #             hours=0, minutes=0, seconds=monitor_seconds * bool(CONFIG.NOTIFY_RECENTLY_ADDED))
-            schedule_job(plextv.get_real_pms_url, 'Refresh Plex server URLs',
+            schedule_job(plextv.get_server_resources, 'Refresh Plex server URLs',
                         hours=12 * (not bool(CONFIG.PMS_URL_MANUAL)), minutes=0, seconds=0)
-            schedule_job(pmsconnect.get_server_friendly_name, 'Refresh Plex server name',
-                         hours=12, minutes=0, seconds=0)

            schedule_job(activity_pinger.check_server_access, 'Check for Plex remote access',
                         hours=0, minutes=0, seconds=60 * bool(CONFIG.MONITOR_REMOTE_ACCESS))
@@ -333,9 +336,9 @@ def initialize_scheduler():
            user_hours = CONFIG.REFRESH_USERS_INTERVAL if 1 <= CONFIG.REFRESH_USERS_INTERVAL <= 24 else 12
            library_hours = CONFIG.REFRESH_LIBRARIES_INTERVAL if 1 <= CONFIG.REFRESH_LIBRARIES_INTERVAL <= 24 else 12

-            schedule_job(plextv.refresh_users, 'Refresh users list',
+            schedule_job(users.refresh_users, 'Refresh users list',
                         hours=user_hours, minutes=0, seconds=0)
-            schedule_job(pmsconnect.refresh_libraries, 'Refresh libraries list',
+            schedule_job(libraries.refresh_libraries, 'Refresh libraries list',
                         hours=library_hours, minutes=0, seconds=0)

            schedule_job(activity_pinger.check_server_response, 'Check server response',
@@ -343,9 +346,7 @@ def initialize_scheduler():

        else:
            # Cancel all jobs
-            schedule_job(plextv.get_real_pms_url, 'Refresh Plex server URLs',
-                         hours=0, minutes=0, seconds=0)
-            schedule_job(pmsconnect.get_server_friendly_name, 'Refresh Plex server name',
+            schedule_job(plextv.get_server_resources, 'Refresh Plex server URLs',
                         hours=0, minutes=0, seconds=0)

            schedule_job(activity_pinger.check_server_access, 'Check for Plex remote access',
@@ -353,9 +354,9 @@ def initialize_scheduler():
            schedule_job(activity_pinger.check_server_updates, 'Check for Plex updates',
                         hours=0, minutes=0, seconds=0)

-            schedule_job(plextv.refresh_users, 'Refresh users list',
+            schedule_job(users.refresh_users, 'Refresh users list',
                         hours=0, minutes=0, seconds=0)
-            schedule_job(pmsconnect.refresh_libraries, 'Refresh libraries list',
+            schedule_job(libraries.refresh_libraries, 'Refresh libraries list',
                         hours=0, minutes=0, seconds=0)

            # Schedule job to reconnect websocket
@@ -438,11 +439,12 @@ def dbcheck():
        'stream_video_decision TEXT, stream_video_codec TEXT, stream_video_bitrate INTEGER, stream_video_width INTEGER, '
        'stream_video_height INTEGER, stream_video_framerate TEXT, '
        'stream_audio_decision TEXT, stream_audio_codec TEXT, stream_audio_bitrate INTEGER, stream_audio_channels INTEGER, '
-        'stream_subtitle_decision TEXT, stream_subtitle_codec TEXT, '
+        'subtitles INTEGER, stream_subtitle_decision TEXT, stream_subtitle_codec TEXT, '
        'transcode_protocol TEXT, transcode_container TEXT, '
        'transcode_video_codec TEXT, transcode_audio_codec TEXT, transcode_audio_channels INTEGER,'
        'transcode_width INTEGER, transcode_height INTEGER, '
-        'optimized_version INTEGER, optimized_version_profile TEXT, synced_version INTEGER, '
+        'optimized_version INTEGER, optimized_version_profile TEXT, optimized_version_title TEXT, '
+        'synced_version INTEGER, synced_version_profile TEXT, '
        'buffer_count INTEGER DEFAULT 0, buffer_last_triggered INTEGER, last_paused INTEGER, write_attempts INTEGER DEFAULT 0, '
        'raw_stream_info TEXT)'
    )
@@ -474,7 +476,8 @@ def dbcheck():
        'stream_video_framerate TEXT, '
        'stream_audio_decision TEXT, stream_audio_codec TEXT, stream_audio_bitrate INTEGER, stream_audio_channels INTEGER, '
        'stream_subtitle_decision TEXT, stream_subtitle_codec TEXT, stream_subtitle_container TEXT, stream_subtitle_forced INTEGER, '
-        'subtitles INTEGER, synced_version INTEGER, optimized_version INTEGER, optimized_version_profile TEXT)'
+        'subtitles INTEGER, subtitle_codec TEXT, synced_version INTEGER, synced_version_profile TEXT, '
+        'optimized_version INTEGER, optimized_version_profile TEXT, optimized_version_title TEXT)'
    )

    # session_history_metadata table :: This is a table which logs each session's media metadata
@@ -893,6 +896,27 @@ def dbcheck():
            'ALTER TABLE sessions ADD COLUMN video_height INTEGER'
        )

+    # Upgrade sessions table from earlier versions
+    try:
+        c_db.execute('SELECT subtitles FROM sessions')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table sessions.")
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN subtitles INTEGER'
+        )
+
+    # Upgrade sessions table from earlier versions
+    try:
+        c_db.execute('SELECT synced_version_profile FROM sessions')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table sessions.")
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN synced_version_profile TEXT'
+        )
+        c_db.execute(
+            'ALTER TABLE sessions ADD COLUMN optimized_version_title TEXT'
+        )
+
    # Upgrade session_history table from earlier versions
    try:
        c_db.execute('SELECT reference_id FROM session_history')
@@ -1114,6 +1138,27 @@ def dbcheck():
            'UPDATE session_history_media_info SET video_resolution=REPLACE(video_resolution, "SD", "sd")'
        )

+    # Upgrade session_history_media_info table from earlier versions
+    try:
+        c_db.execute('SELECT subtitle_codec FROM session_history_media_info')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table session_history_media_info.")
+        c_db.execute(
+            'ALTER TABLE session_history_media_info ADD COLUMN subtitle_codec TEXT '
+        )
+
+    # Upgrade session_history_media_info table from earlier versions
+    try:
+        c_db.execute('SELECT synced_version_profile FROM session_history_media_info')
+    except sqlite3.OperationalError:
+        logger.debug(u"Altering database. Updating database table session_history_media_info.")
+        c_db.execute(
+            'ALTER TABLE session_history_media_info ADD COLUMN synced_version_profile TEXT '
+        )
+        c_db.execute(
+            'ALTER TABLE session_history_media_info ADD COLUMN optimized_version_title TEXT '
+        )
+
    # Upgrade users table from earlier versions
    try:
        c_db.execute('SELECT do_notify FROM users')
@@ -1491,5 +1536,4 @@ def shutdown(restart=False, update=False, checkout=False):


 def generate_uuid():
-    logger.debug(u"Generating UUID...")
    return uuid.uuid4().hex
--- a/plexpy/activity_handler.py
+++ b/plexpy/activity_handler.py
@@ -484,6 +484,11 @@ def on_created(rating_key, **kwargs):

    if metadata:
        notify = True
+        now = int(time.time())
+
+        if helpers.cast_to_int(metadata['updated_at']) < now - 86400:  # Updated more than 24 hours ago
+            logger.debug(u"Tautulli TimelineHandler :: Library item %s updated more than 24 hours ago. Not notifying." % str(rating_key))
+            notify = False

        data_factory = datafactory.DataFactory()
        if 'child_keys' not in kwargs:
--- a/plexpy/activity_pinger.py
+++ b/plexpy/activity_pinger.py
@@ -278,7 +278,6 @@ def check_server_response():


 def check_server_access():
-
    with monitor_lock:
        pms_connect = pmsconnect.PmsConnect()
        server_response = pms_connect.get_server_response()
@@ -287,7 +286,7 @@ def check_server_access():

        # Check for remote access
        if server_response:
-        
+
            mapping_state = server_response['mapping_state']
            mapping_error = server_response['mapping_error']

--- a/plexpy/activity_processor.py
+++ b/plexpy/activity_processor.py
@@ -13,6 +13,7 @@
 #  You should have received a copy of the GNU General Public License
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.

+from collections import defaultdict
 import json
 import threading
 import time
@@ -89,9 +90,11 @@ class ActivityProcessor(object):
                      'transcode_audio_channels': session.get('transcode_audio_channels', ''),
                      'transcode_width': session.get('stream_video_width', ''),
                      'transcode_height': session.get('stream_video_height', ''),
+                      'synced_version': session.get('synced_version', ''),
+                      'synced_version_profile': session.get('synced_version_profile', ''),
                      'optimized_version': session.get('optimized_version', ''),
                      'optimized_version_profile': session.get('optimized_version_profile', ''),
-                      'synced_version': session.get('synced_version', ''),
+                      'optimized_version_title': session.get('optimized_version_title', ''),
                      'stream_bitrate': session.get('stream_bitrate', ''),
                      'stream_video_resolution': session.get('stream_video_resolution', ''),
                      'quality_profile': session.get('quality_profile', ''),
@@ -109,6 +112,7 @@ class ActivityProcessor(object):
                      'stream_audio_channels': session.get('stream_audio_channels', ''),
                      'stream_subtitle_decision': session.get('stream_subtitle_decision', ''),
                      'stream_subtitle_codec': session.get('stream_subtitle_codec', ''),
+                      'subtitles': session.get('subtitles', ''),
                      'raw_stream_info': json.dumps(session),
                      'stopped': int(time.time())
                      }
@@ -153,9 +157,11 @@ class ActivityProcessor(object):
            logging_enabled = False

            # Reload json from raw stream info
-            if 'raw_stream_info' in session:
+            if session.get('raw_stream_info'):
                session.update(json.loads(session['raw_stream_info']))

+            session = defaultdict(str, session)
+
            if is_import:
                if str(session['stopped']).isdigit():
                    stopped = int(session['stopped'])
@@ -353,8 +359,10 @@ class ActivityProcessor(object):
                          'stream_subtitle_forced': session['stream_subtitle_forced'],
                          'subtitles': session['subtitles'],
                          'synced_version': session['synced_version'],
+                          'synced_version_profile': session['synced_version_profile'],
                          'optimized_version': session['optimized_version'],
-                          'optimized_version_profile': session['optimized_version_profile']
+                          'optimized_version_profile': session['optimized_version_profile'],
+                          'optimized_version_title': session['optimized_version_title']
                          }

                # logger.debug(u"Tautulli ActivityProcessor :: Writing session_history_media_info transaction...")
--- a/plexpy/api2.py
+++ b/plexpy/api2.py
@@ -32,10 +32,10 @@ import xmltodict
 import plexpy
 import config
 import database
+import libraries
 import logger
 import mobile_app
-import plextv
-import pmsconnect
+import users


 class API2:
@@ -345,14 +345,14 @@ class API2:

    def refresh_libraries_list(self, **kwargs):
        """ Refresh the Tautulli libraries list."""
-        data = pmsconnect.refresh_libraries()
+        data = libraries.refresh_libraries()
        self._api_result_type = 'success' if data else 'error'

        return data

    def refresh_users_list(self, **kwargs):
        """ Refresh the Tautulli users list."""
-        data = plextv.refresh_users()
+        data = users.refresh_users()
        self._api_result_type = 'success' if data else 'error'

        return data
--- a/plexpy/common.py
+++ b/plexpy/common.py
@@ -68,11 +68,12 @@ PLATFORM_NAMES = {'android': 'android',
                  'safari': 'safari',
                  'samsung': 'samsung',
                  'synclounge': 'synclounge',
+                  'tivo': 'tivo',
                  'tvos': 'atv',
                  'vizio': 'opera',
+                  'wiiu': 'wiiu',
                  'windows': 'windows',
                  'windows phone': 'wp',
-                  'wiiu': 'wiiu',
                  'xbmc': 'xbmc',
                  'xbox': 'xbox'
                  }
@@ -139,10 +140,10 @@ SCHEDULER_LIST = ['Check GitHub for updates',
                  'Check for recently added items',
                  'Check for Plex updates',
                  'Check for Plex remote access',
+                  'Check server response',
                  'Refresh users list',
                  'Refresh libraries list',
                  'Refresh Plex server URLs',
-                  'Refresh Plex server name',
                  'Backup Tautulli database',
                  'Backup Tautulli config'
                  ]
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -45,6 +45,7 @@ _CONFIG_DEFINITIONS = {
    'PLEXWATCH_DATABASE': (str, 'PlexWatch', ''),
    'PMS_IDENTIFIER': (str, 'PMS', ''),
    'PMS_IP': (str, 'PMS', '127.0.0.1'),
+    'PMS_IS_CLOUD': (int, 'PMS', 0),
    'PMS_IS_REMOTE': (int, 'PMS', 0),
    'PMS_LOGS_FOLDER': (str, 'PMS', ''),
    'PMS_LOGS_LINE_CAP': (int, 'PMS', 1000),
@@ -66,7 +67,7 @@ _CONFIG_DEFINITIONS = {
    'PMS_WEB_URL': (str, 'PMS', 'https://app.plex.tv/desktop'),
    'TIME_FORMAT': (str, 'General', 'HH:mm'),
    'ANON_REDIRECT': (str, 'General', 'http://www.nullrefer.com/?'),
-    'API_ENABLED': (int, 'General', 0),
+    'API_ENABLED': (int, 'General', 1),
    'API_KEY': (str, 'General', ''),
    'API_SQL': (int, 'General', 0),
    'BOXCAR_ENABLED': (int, 'Boxcar', 0),
@@ -863,7 +864,6 @@ class Config(object):
            self.NOTIFY_GROUP_RECENTLY_ADDED_PARENT = self.NOTIFY_GROUP_RECENTLY_ADDED

            self.MONITORING_USE_WEBSOCKET = 1
-            self.HTTP_PROXY = 1

            self.CONFIG_VERSION = 8

@@ -872,4 +872,4 @@ class Config(object):
            self.TV_WATCHED_PERCENT = self.NOTIFY_WATCHED_PERCENT
            self.MUSIC_WATCHED_PERCENT = self.NOTIFY_WATCHED_PERCENT

-            self.CONFIG_VERSION == 9
+            self.CONFIG_VERSION = 9
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -872,9 +872,16 @@ class DataFactory(object):
            user_cond = 'AND %s.user_id = %s ' % (table, session.get_session_user_id())

        if row_id:
-            query = 'SELECT container, bitrate, video_resolution, width, height, aspect_ratio, video_framerate, ' \
-                    'video_codec, audio_codec, audio_channels, video_decision, transcode_video_codec, transcode_height, ' \
-                    'transcode_width, audio_decision, transcode_audio_codec, transcode_audio_channels, transcode_container, ' \
+            query = 'SELECT bitrate, video_resolution, ' \
+                    'optimized_version, optimized_version_profile, optimized_version_title, ' \
+                    'synced_version, synced_version_profile, ' \
+                    'container, video_codec, video_bitrate, video_width, video_height, video_framerate, aspect_ratio, ' \
+                    'audio_codec, audio_bitrate, audio_channels, subtitle_codec, ' \
+                    'stream_bitrate, stream_video_resolution, quality_profile, stream_container_decision, stream_container, ' \
+                    'stream_video_decision, stream_video_codec, stream_video_bitrate, stream_video_width, stream_video_height, ' \
+                    'stream_video_framerate, ' \
+                    'stream_audio_decision, stream_audio_codec, stream_audio_bitrate, stream_audio_channels, ' \
+                    'subtitles, stream_subtitle_decision, stream_subtitle_codec, ' \
                    'session_history_metadata.media_type, title, grandparent_title ' \
                    'FROM session_history_media_info ' \
                    'JOIN session_history ON session_history_media_info.id = session_history.id ' \
@@ -882,9 +889,16 @@ class DataFactory(object):
                    'WHERE session_history_media_info.id = ? %s' % user_cond
            result = monitor_db.select(query, args=[row_id])
        elif session_key:
-            query = 'SELECT container, bitrate, video_resolution, width, height, aspect_ratio, video_framerate, ' \
-                    'video_codec, audio_codec, audio_channels, video_decision, transcode_video_codec, transcode_height, ' \
-                    'transcode_width, audio_decision, transcode_audio_codec, transcode_audio_channels, transcode_container, ' \
+            query = 'SELECT bitrate, video_resolution, ' \
+                    'optimized_version, optimized_version_profile, optimized_version_title, ' \
+                    'synced_version, synced_version_profile, ' \
+                    'container, video_codec, video_bitrate, video_width, video_height, video_framerate, aspect_ratio, ' \
+                    'audio_codec, audio_bitrate, audio_channels, subtitle_codec, ' \
+                    'stream_bitrate, stream_video_resolution, quality_profile, stream_container_decision, stream_container, ' \
+                    'stream_video_decision, stream_video_codec, stream_video_bitrate, stream_video_width, stream_video_height, ' \
+                    'stream_video_framerate, ' \
+                    'stream_audio_decision, stream_audio_codec, stream_audio_bitrate, stream_audio_channels, ' \
+                    'subtitles, stream_subtitle_decision, stream_subtitle_codec, ' \
                    'media_type, title, grandparent_title ' \
                    'FROM sessions ' \
                    'WHERE session_key = ? %s' % user_cond
@@ -895,24 +909,42 @@ class DataFactory(object):
        stream_output = {}

        for item in result:
-            stream_output = {'container': item['container'],
-                             'bitrate': item['bitrate'],
+            stream_output = {'bitrate': item['bitrate'],
                             'video_resolution': item['video_resolution'],
-                             'width': item['width'],
-                             'height': item['height'],
-                             'aspect_ratio': item['aspect_ratio'],
-                             'video_framerate': item['video_framerate'],
+                             'optimized_version': item['optimized_version'],
+                             'optimized_version_profile': item['optimized_version_profile'],
+                             'optimized_version_title': item['optimized_version_title'],
+                             'synced_version': item['synced_version'],
+                             'synced_version_profile': item['synced_version_profile'],
+                             'container': item['container'],
                             'video_codec': item['video_codec'],
+                             'video_bitrate': item['video_bitrate'],
+                             'video_width': item['video_width'],
+                             'video_height': item['video_height'],
+                             'video_framerate': item['video_framerate'],
+                             'aspect_ratio': item['aspect_ratio'],
                             'audio_codec': item['audio_codec'],
+                             'audio_bitrate': item['audio_bitrate'],
                             'audio_channels': item['audio_channels'],
-                             'transcode_video_dec': item['video_decision'],
-                             'transcode_video_codec': item['transcode_video_codec'],
-                             'transcode_height': item['transcode_height'],
-                             'transcode_width': item['transcode_width'],
-                             'transcode_audio_dec': item['audio_decision'],
-                             'transcode_audio_codec': item['transcode_audio_codec'],
-                             'transcode_audio_channels': item['transcode_audio_channels'],
-                             'transcode_container': item['transcode_container'],
+                             'subtitle_codec': item['subtitle_codec'],
+                             'stream_bitrate': item['stream_bitrate'],
+                             'stream_video_resolution': item['stream_video_resolution'],
+                             'quality_profile': item['quality_profile'],
+                             'stream_container_decision': item['stream_container_decision'],
+                             'stream_container': item['stream_container'],
+                             'stream_video_decision': item['stream_video_decision'],
+                             'stream_video_codec': item['stream_video_codec'],
+                             'stream_video_bitrate': item['stream_video_bitrate'],
+                             'stream_video_width': item['stream_video_width'],
+                             'stream_video_height': item['stream_video_height'],
+                             'stream_video_framerate': item['stream_video_framerate'],
+                             'stream_audio_decision': item['stream_audio_decision'],
+                             'stream_audio_codec': item['stream_audio_codec'],
+                             'stream_audio_bitrate': item['stream_audio_bitrate'],
+                             'stream_audio_channels': item['stream_audio_channels'],
+                             'subtitles': item['subtitles'],
+                             'stream_subtitle_decision': item['stream_subtitle_decision'],
+                             'stream_subtitle_codec': item['stream_subtitle_codec'],
                             'media_type': item['media_type'],
                             'title': item['title'],
                             'grandparent_title': item['grandparent_title']
@@ -1072,7 +1104,7 @@ class DataFactory(object):
        if str(rating_key).isdigit():
            poster_key = rating_key
        elif metadata:
-            if metadata['media_type'] in ('movie', 'show', 'artist'):
+            if metadata['media_type'] in ('movie', 'show', 'artist', 'collection'):
                poster_key = metadata['rating_key']
            elif metadata['media_type'] in ('season', 'album'):
                poster_key = metadata['rating_key']
--- a/plexpy/helpers.py
+++ b/plexpy/helpers.py
@@ -768,13 +768,13 @@ def build_datatables_json(kwargs, dt_columns, default_sort_col=None):

    # Build json data
    json_data = {"draw": 1,
-                    "columns": columns,
-                    "order": [{"column": order_column,
+                 "columns": columns,
+                 "order": [{"column": order_column,
                            "dir": kwargs.pop("order_dir", "desc")}],
-                    "start": int(kwargs.pop("start", 0)),
-                    "length": int(kwargs.pop("length", 25)),
-                    "search": {"value": kwargs.pop("search", "")}
-                    }
+                 "start": int(kwargs.pop("start", 0)),
+                 "length": int(kwargs.pop("length", 25)),
+                 "search": {"value": kwargs.pop("search", "")}
+                 }
    return json.dumps(json_data)

 def humanFileSize(bytes, si=False):
--- a/plexpy/http_handler.py
+++ b/plexpy/http_handler.py
@@ -1,24 +1,28 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-

-# This file is part of Tautulli.
+# This file is part of PlexPy.
 #
-#  Tautulli is free software: you can redistribute it and/or modify
+#  PlexPy is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation, either version 3 of the License, or
 #  (at your option) any later version.
 #
-#  Tautulli is distributed in the hope that it will be useful,
+#  PlexPy is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
 #
 #  You should have received a copy of the GNU General Public License
-#  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.
+#  along with PlexPy.  If not, see <http://www.gnu.org/licenses/>.

-from httplib import HTTPSConnection
-from httplib import HTTPConnection
-import ssl
+from functools import partial
+from multiprocessing.dummy import Pool as ThreadPool
+from urlparse import urljoin
+
+import certifi
+from requests.packages import urllib3
+from requests.packages.urllib3.exceptions import InsecureRequestWarning

 import plexpy
 import helpers
@@ -30,94 +34,144 @@ class HTTPHandler(object):
    Retrieve data from Plex Server
    """

-    def __init__(self, host, port, token, ssl_verify=True):
-        self.host = host
-        self.port = str(port)
+    def __init__(self, urls, token=None, timeout=10, ssl_verify=True):
+        if isinstance(urls, basestring):
+            self.urls = urls.split() or urls.split(',')
+        else:
+            self.urls = urls
+
        self.token = token
+        if self.token:
+            self.headers = {'X-Plex-Token': self.token}
+        else:
+            self.headers = {}
+
+        self.timeout = timeout
        self.ssl_verify = ssl_verify

-    """
-    Handle the HTTP requests.
+        self.valid_request_types = ('GET', 'POST', 'PUT', 'DELETE')

-    Output: object
-    """
    def make_request(self,
-                     uri=None, proto='HTTP',
-                     request_type='GET',
+                     uri=None,
                     headers=None,
+                     request_type='GET',
                     output_format='raw',
                     return_type=False,
                     no_token=False,
-                     timeout=None):
+                     timeout=None,
+                     callback=None):
+        """
+        Handle the HTTP requests.

-        if timeout is None:
-            timeout = plexpy.CONFIG.PMS_TIMEOUT
+        Output: list
+        """

-        valid_request_types = ['GET', 'POST', 'PUT', 'DELETE']
+        self.uri = uri
+        self.request_type = request_type.upper()
+        self.output_format = output_format.lower()
+        self.return_type = return_type
+        self.callback = callback
+        self.timeout = timeout or self.timeout

-        if request_type.upper() not in valid_request_types:
+        if self.request_type not in self.valid_request_types:
            logger.debug(u"HTTP request made but unsupported request type given.")
            return None

        if uri:
-            if proto.upper() == 'HTTPS':
-                if not self.ssl_verify and hasattr(ssl, '_create_unverified_context'):
-                    context = ssl._create_unverified_context()
-                    handler = HTTPSConnection(host=self.host, port=self.port, timeout=timeout, context=context)
-                    logger.warn(u"Tautulli HTTP Handler :: Unverified HTTPS request made. This connection is not secure.")
-                else:
-                    handler = HTTPSConnection(host=self.host, port=self.port, timeout=timeout)
-            else:
-                handler = HTTPConnection(host=self.host, port=self.port, timeout=timeout)
+            request_urls = [urljoin(url, self.uri) for url in self.urls]

-            if not no_token:
-                if headers:
-                    headers.update({'X-Plex-Token': self.token})
-                else:
-                    headers = {'X-Plex-Token': self.token}
+            if no_token and headers:
+                self.headers = headers
+            elif headers:
+                self.headers.update(headers)

-            try:
-                if headers:
-                    handler.request(request_type, uri, headers=headers)
-                else:
-                    handler.request(request_type, uri)
-                response = handler.getresponse()
-                request_status = response.status
-                request_content = response.read()
-                content_type = response.getheader('content-type')
-            except IOError as e:
-                logger.warn(u"Failed to access uri endpoint %s with error %s" % (uri, e))
-                return None
-            except Exception as e:
-                logger.warn(u"Failed to access uri endpoint %s. Is your server maybe accepting SSL connections only? %s" % (uri, e))
-                return None
-            except:
-                logger.warn(u"Failed to access uri endpoint %s with Uncaught exception." % uri)
-                return None
+            responses = []
+            for r in self._http_requests_pool(request_urls):
+                responses.append(r)

-            if request_status in (200, 201):
-                try:
-                    if output_format == 'dict':
-                        output = helpers.convert_xml_to_dict(request_content)
-                    elif output_format == 'json':
-                        output = helpers.convert_xml_to_json(request_content)
-                    elif output_format == 'xml':
-                        output = helpers.parse_xml(request_content)
-                    else:
-                        output = request_content
+            return responses[0]

-                    if return_type:
-                        return output, content_type
-
-                    return output
-
-                except Exception as e:
-                    logger.warn(u"Failed format response from uri %s to %s error %s" % (uri, output_format, e))
-                    return None
-
-            else:
-                logger.warn(u"Failed to access uri endpoint %s. Status code %r" % (uri, request_status))
-                return None
        else:
            logger.debug(u"HTTP request made but no enpoint given.")
            return None
+
+    def _http_requests_pool(self, urls, workers=10, chunk=None):
+        """Generator function to request urls in chunks"""
+        # From cpython
+        if chunk is None:
+            chunk, extra = divmod(len(urls), workers * 4)
+            if extra:
+                chunk += 1
+            if len(urls) == 0:
+                chunk = 0
+
+        if self.ssl_verify:
+            session = urllib3.PoolManager(cert_reqs='CERT_REQUIRED', ca_certs=certifi.where())
+        else:
+            urllib3.disable_warnings(InsecureRequestWarning)
+            session = urllib3.PoolManager()
+        part = partial(self._http_requests_urllib3, session=session)
+
+        if len(urls) == 1:
+            yield part(urls[0])
+        else:
+            pool = ThreadPool(workers)
+
+            try:
+                for work in pool.imap_unordered(part, urls, chunk):
+                    yield work
+            except Exception as e:
+                logger.error(u"Failed to yield request: %s" % e)
+            finally:
+                pool.close()
+                pool.join()
+
+    def _http_requests_urllib3(self, url, session):
+        """Request the data from the url"""
+        try:
+            r = session.request(self.request_type, url, headers=self.headers, timeout=self.timeout)
+        except IOError as e:
+            logger.warn(u"Failed to access uri endpoint %s with error %s" % (self.uri, e))
+            return None
+        except Exception as e:
+            logger.warn(u"Failed to access uri endpoint %s. Is your server maybe accepting SSL connections only? %s" % (self.uri, e))
+            return None
+        except:
+            logger.warn(u"Failed to access uri endpoint %s with Uncaught exception." % self.uri)
+            return None
+
+        response_status = r.status
+        response_content = r.data
+        response_headers = r.headers
+
+        if response_status in (200, 201):
+            return self._http_format_output(response_content, response_headers)
+        else:
+            logger.warn(u"Failed to access uri endpoint %s. Status code %r" % (self.uri, response_status))
+            return None
+
+    def  _http_format_output(self, response_content, response_headers):
+        """Formats the request response to the desired type"""
+        try:
+            if self.output_format == 'text':
+                output = response_content.decode('utf-8', 'ignore')
+            if self.output_format == 'dict':
+                output = helpers.convert_xml_to_dict(response_content.decode('utf-8', 'ignore'))
+            elif self.output_format == 'json':
+                output = helpers.convert_xml_to_json(response_content.decode('utf-8', 'ignore'))
+            elif self.output_format == 'xml':
+                output = helpers.parse_xml(response_content.decode('utf-8', 'ignore'))
+            else:
+                output = response_content
+
+            if self.callback:
+                return self.callback(output)
+
+            if self.return_type:
+                return output, response_headers['Content-Type']
+
+            return output
+
+        except Exception as e:
+            logger.warn(u"Failed format response from uri %s to %s error %s" % (self.uri, self.response_type, e))
+            return None
--- a/plexpy/libraries.py
+++ b/plexpy/libraries.py
@@ -27,6 +27,66 @@ import pmsconnect
 import session


+def refresh_libraries():
+    logger.info(u"Tautulli Libraries :: Requesting libraries list refresh...")
+
+    server_id = plexpy.CONFIG.PMS_IDENTIFIER
+    if not server_id:
+        logger.error(u"Tautulli Libraries :: No PMS identifier, cannot refresh libraries. Verify server in settings.")
+        return
+
+    library_sections = pmsconnect.PmsConnect().get_library_details()
+
+    if library_sections:
+        monitor_db = database.MonitorDatabase()
+
+        library_keys = []
+        new_keys = []
+
+        for section in library_sections:
+            section_keys = {'server_id': server_id,
+                            'section_id': section['section_id']}
+            section_values = {'server_id': server_id,
+                              'section_id': section['section_id'],
+                              'section_name': section['section_name'],
+                              'section_type': section['section_type'],
+                              'thumb': section['thumb'],
+                              'art': section['art'],
+                              'count': section['count'],
+                              'parent_count': section.get('parent_count', None),
+                              'child_count': section.get('child_count', None),
+                              }
+
+            result = monitor_db.upsert('library_sections', key_dict=section_keys, value_dict=section_values)
+
+            library_keys.append(section['section_id'])
+
+            if result == 'insert':
+                new_keys.append(section['section_id'])
+
+        if plexpy.CONFIG.HOME_LIBRARY_CARDS == ['first_run_wizard']:
+            plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', library_keys)
+            plexpy.CONFIG.write()
+        else:
+            new_keys = plexpy.CONFIG.HOME_LIBRARY_CARDS + new_keys
+            plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', new_keys)
+            plexpy.CONFIG.write()
+
+        #if plexpy.CONFIG.UPDATE_SECTION_IDS == 1 or plexpy.CONFIG.UPDATE_SECTION_IDS == -1:
+        #    # Start library section_id update on it's own thread
+        #    threading.Thread(target=libraries.update_section_ids).start()
+
+        #if plexpy.CONFIG.UPDATE_LABELS == 1 or plexpy.CONFIG.UPDATE_LABELS == -1:
+        #    # Start library labels update on it's own thread
+        #    threading.Thread(target=libraries.update_labels).start()
+
+        logger.info(u"Tautulli Libraries :: Libraries list refreshed.")
+        return True
+    else:
+        logger.warn(u"Tautulli Libraries :: Unable to refresh libraries list.")
+        return False
+
+
 def update_section_ids():
    plexpy.CONFIG.UPDATE_SECTION_IDS = -1

@@ -416,6 +476,7 @@ class Libraries(object):
                       'parent_rating_key': item['parent_rating_key'],
                       'grandparent_rating_key': item['grandparent_rating_key'],
                       'title': item['title'],
+                       'sort_title': item['sort_title'] or item['title'],
                       'year': item['year'],
                       'media_index': item['media_index'],
                       'parent_media_index': item['parent_media_index'],
@@ -483,12 +544,12 @@ class Libraries(object):
        filtered_count = len(results)

        # Sort results
-        results = sorted(results, key=lambda k: k['title'])
+        results = sorted(results, key=lambda k: k['sort_title'])
        sort_order = json_data['order']
        for order in reversed(sort_order):
            sort_key = json_data['columns'][int(order['column'])]['data']
            reverse = True if order['dir'] == 'desc' else False
-            if rating_key and sort_key == 'title':
+            if rating_key and sort_key == 'sort_title':
                results = sorted(results, key=lambda k: helpers.cast_to_int(k['media_index']), reverse=reverse)
            elif sort_key == 'file_size' or sort_key == 'bitrate':
                results = sorted(results, key=lambda k: helpers.cast_to_int(k[sort_key]), reverse=reverse)
@@ -964,7 +1025,7 @@ class Libraries(object):
        monitor_db = database.MonitorDatabase()

        # Refresh the PMS_URL to make sure the server_id is updated
-        plextv.get_real_pms_url()
+        plextv.get_server_resources()

        server_id = plexpy.CONFIG.PMS_IDENTIFIER

--- a/plexpy/notification_handler.py
+++ b/plexpy/notification_handler.py
@@ -16,6 +16,7 @@

 import arrow
 import bleach
+from collections import Counter
 from itertools import groupby
 import json
 from operator import itemgetter
@@ -145,10 +146,17 @@ def notify_conditions(notify_action=None, stream_data=None, timeline_data=None):
            return False

        if notify_action == 'on_concurrent':
-            ap = activity_processor.ActivityProcessor()
-            user_sessions = ap.get_sessions(user_id=stream_data['user_id'],
-                                            ip_address=plexpy.CONFIG.NOTIFY_CONCURRENT_BY_IP)
-            return len(user_sessions) >= plexpy.CONFIG.NOTIFY_CONCURRENT_THRESHOLD
+            pms_connect = pmsconnect.PmsConnect()
+            result = pms_connect.get_current_activity()
+
+            user_sessions = []
+            if result:
+                user_sessions = [s for s in result['sessions'] if s['user_id'] == stream_data['user_id']]
+
+            if plexpy.CONFIG.NOTIFY_CONCURRENT_BY_IP:
+                return len(Counter(s['ip_address'] for s in user_sessions)) >= plexpy.CONFIG.NOTIFY_CONCURRENT_THRESHOLD
+            else:
+                return len(user_sessions) >= plexpy.CONFIG.NOTIFY_CONCURRENT_THRESHOLD

        elif notify_action == 'on_newdevice':
            data_factory = datafactory.DataFactory()
@@ -453,17 +461,20 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
    if 'media_info' in metadata and len(metadata['media_info']) > 0:
        media_info = metadata['media_info'][0]
        if 'parts' in media_info and len(media_info['parts']) > 0:
-            media_part_info = media_info['parts'][0]
+            media_part_info = media_info.pop('parts')[0]

    stream_video = stream_audio = stream_subtitle = False
    if 'streams' in media_part_info:
-        for stream in media_part_info['streams']:
+        for stream in media_part_info.pop('streams'):
            if not stream_video and stream['type'] == '1':
                media_part_info.update(stream)
+                stream_video = True
            if not stream_audio and stream['type'] == '2':
                media_part_info.update(stream)
+                stream_audio = True
            if not stream_subtitle and stream['type'] == '3':
                media_part_info.update(stream)
+                stream_subtitle = True

    child_metadata = grandchild_metadata = []
    for key in kwargs.pop('child_keys', []):
@@ -501,7 +512,7 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m

    # Build Plex URL
    metadata['plex_url'] = '{web_url}#!/server/{pms_identifier}/details?key=%2Flibrary%2Fmetadata%2F{rating_key}'.format(
-        web_url=plexpy.CONFIG.PMS_WEB_URL or 'https://app.plex.tv/desktop',
+        web_url=plexpy.CONFIG.PMS_WEB_URL,
        pms_identifier=plexpy.CONFIG.PMS_IDENTIFIER,
        rating_key=rating_key)

@@ -766,32 +777,32 @@ def build_media_notify_params(notify_action=None, session=None, timeline=None, m
                        'container': session.get('container', media_info.get('container','')),
                        'bitrate': session.get('bitrate', media_info.get('bitrate','')),
                        'aspect_ratio': session.get('aspect_ratio', media_info.get('aspect_ratio','')),
-                        'video_codec': session.get('video_codec', media_info.get('video_codec','')),
-                        'video_codec_level': session.get('video_codec_level', media_info.get('video_codec_level','')),
-                        'video_bitrate': session.get('video_bitrate', media_info.get('video_bitrate','')),
-                        'video_bit_depth': session.get('video_bit_depth', media_info.get('video_bit_depth','')),
+                        'video_codec': session.get('video_codec', media_part_info.get('video_codec','')),
+                        'video_codec_level': session.get('video_codec_level', media_part_info.get('video_codec_level','')),
+                        'video_bitrate': session.get('video_bitrate', media_part_info.get('video_bitrate','')),
+                        'video_bit_depth': session.get('video_bit_depth', media_part_info.get('video_bit_depth','')),
                        'video_framerate': session.get('video_framerate', media_info.get('video_framerate','')),
-                        'video_ref_frames': session.get('video_ref_frames', media_info.get('video_ref_frames','')),
+                        'video_ref_frames': session.get('video_ref_frames', media_part_info.get('video_ref_frames','')),
                        'video_resolution': session.get('video_resolution', media_info.get('video_resolution','')),
                        'video_height': session.get('height', media_info.get('height','')),
                        'video_width': session.get('width', media_info.get('width','')),
-                        'video_language': session.get('video_language', media_info.get('video_language','')),
-                        'video_language_code': session.get('video_language_code', media_info.get('video_language_code','')),
-                        'audio_bitrate': session.get('audio_bitrate', media_info.get('audio_bitrate','')),
-                        'audio_bitrate_mode': session.get('audio_bitrate_mode', media_info.get('audio_bitrate_mode','')),
-                        'audio_codec': session.get('audio_codec', media_info.get('audio_codec','')),
-                        'audio_channels': session.get('audio_channels', media_info.get('audio_channels','')),
-                        'audio_channel_layout': session.get('audio_channel_layout', media_info.get('audio_channel_layout','')),
-                        'audio_sample_rate': session.get('audio_sample_rate', media_info.get('audio_sample_rate','')),
-                        'audio_language': session.get('audio_language', media_info.get('audio_language','')),
-                        'audio_language_code': session.get('audio_language_code', media_info.get('audio_language_code','')),
-                        'subtitle_codec': session.get('subtitle_codec', media_info.get('subtitle_codec','')),
-                        'subtitle_container': session.get('subtitle_container', media_info.get('subtitle_container','')),
-                        'subtitle_format': session.get('subtitle_format', media_info.get('subtitle_format','')),
-                        'subtitle_forced': session.get('subtitle_forced', media_info.get('subtitle_forced','')),
-                        'subtitle_location': session.get('subtitle_location', media_info.get('subtitle_location','')),
-                        'subtitle_language': session.get('subtitle_language', media_info.get('subtitle_language','')),
-                        'subtitle_language_code': session.get('subtitle_language_code', media_info.get('subtitle_language_code','')),
+                        'video_language': session.get('video_language', media_part_info.get('video_language','')),
+                        'video_language_code': session.get('video_language_code', media_part_info.get('video_language_code','')),
+                        'audio_bitrate': session.get('audio_bitrate', media_part_info.get('audio_bitrate','')),
+                        'audio_bitrate_mode': session.get('audio_bitrate_mode', media_part_info.get('audio_bitrate_mode','')),
+                        'audio_codec': session.get('audio_codec', media_part_info.get('audio_codec','')),
+                        'audio_channels': session.get('audio_channels', media_part_info.get('audio_channels','')),
+                        'audio_channel_layout': session.get('audio_channel_layout', media_part_info.get('audio_channel_layout','')),
+                        'audio_sample_rate': session.get('audio_sample_rate', media_part_info.get('audio_sample_rate','')),
+                        'audio_language': session.get('audio_language', media_part_info.get('audio_language','')),
+                        'audio_language_code': session.get('audio_language_code', media_part_info.get('audio_language_code','')),
+                        'subtitle_codec': session.get('subtitle_codec', media_part_info.get('subtitle_codec','')),
+                        'subtitle_container': session.get('subtitle_container', media_part_info.get('subtitle_container','')),
+                        'subtitle_format': session.get('subtitle_format', media_part_info.get('subtitle_format','')),
+                        'subtitle_forced': session.get('subtitle_forced', media_part_info.get('subtitle_forced','')),
+                        'subtitle_location': session.get('subtitle_location', media_part_info.get('subtitle_location','')),
+                        'subtitle_language': session.get('subtitle_language', media_part_info.get('subtitle_language','')),
+                        'subtitle_language_code': session.get('subtitle_language_code', media_part_info.get('subtitle_language_code','')),
                        'file': media_part_info.get('file',''),
                        'file_size': helpers.humanFileSize(media_part_info.get('file_size','')),
                        'indexes': media_part_info.get('indexes',''),
--- a/plexpy/notifiers.py
+++ b/plexpy/notifiers.py
@@ -1203,14 +1203,16 @@ class DISCORD(Notifier):
                         {'label': 'Movie Link Source',
                          'value': self.config['movie_provider'],
                          'name': 'discord_movie_provider',
-                          'description': 'Select the source for movie links on the info cards. Leave blank for default.',
+                          'description': 'Select the source for movie links on the info cards. Leave blank for default.<br> \
+                                          3rd party API lookup may need to be enabled under the notification settings tab.',
                          'input_type': 'select',
                          'select_options': PrettyMetadata().get_movie_providers()
                          },
                         {'label': 'TV Show Link Source',
                          'value': self.config['tv_provider'],
                          'name': 'discord_tv_provider',
-                          'description': 'Select the source for tv show links on the info cards. Leave blank for default.',
+                          'description': 'Select the source for tv show links on the info cards. Leave blank for default.<br> \
+                                          3rd party API lookup may need to be enabled under the notification settings tab.',
                          'input_type': 'select',
                          'select_options': PrettyMetadata().get_tv_providers()
                          },
@@ -1533,14 +1535,16 @@ class FACEBOOK(Notifier):
                         {'label': 'Movie Link Source',
                          'value': self.config['movie_provider'],
                          'name': 'facebook_movie_provider',
-                          'description': 'Select the source for movie links on the info cards. Leave blank for default.',
+                          'description': 'Select the source for movie links on the info cards. Leave blank for default.<br> \
+                                          3rd party API lookup may need to be enabled under the notification settings tab.',
                          'input_type': 'select',
                          'select_options': PrettyMetadata().get_movie_providers()
                          },
                         {'label': 'TV Show Link Source',
                          'value': self.config['tv_provider'],
                          'name': 'facebook_tv_provider',
-                          'description': 'Select the source for tv show links on the info cards. Leave blank for default.',
+                          'description': 'Select the source for tv show links on the info cards. Leave blank for default.<br> \
+                                          3rd party API lookup may need to be enabled under the notification settings tab.',
                          'input_type': 'select',
                          'select_options': PrettyMetadata().get_tv_providers()
                          },
@@ -1872,14 +1876,16 @@ class HIPCHAT(Notifier):
                         {'label': 'Movie Link Source',
                          'value': self.config['movie_provider'],
                          'name': 'hipchat_movie_provider',
-                          'description': 'Select the source for movie links on the info cards. Leave blank for default.',
+                          'description': 'Select the source for movie links on the info cards. Leave blank for default.<br> \
+                                          3rd party API lookup may need to be enabled under the notification settings tab.',
                          'input_type': 'select',
                          'select_options': PrettyMetadata().get_movie_providers()
                          },
                         {'label': 'TV Show Link Source',
                          'value': self.config['tv_provider'],
                          'name': 'hipchat_tv_provider',
-                          'description': 'Select the source for tv show links on the info cards. Leave blank for default.',
+                          'description': 'Select the source for tv show links on the info cards. Leave blank for default.<br> \
+                                          3rd party API lookup may need to be enabled under the notification settings tab.',
                          'input_type': 'select',
                          'select_options': PrettyMetadata().get_tv_providers()
                          },
@@ -1957,7 +1963,7 @@ class JOIN(Notifier):

        deviceid_key = 'deviceId%s' % ('s' if len(self.config['device_id'].split(',')) > 1 else '')

-        data = {'api_key': self.config['api_key'],
+        data = {'apikey': self.config['api_key'],
                deviceid_key: self.config['device_id'],
                'text': body.encode("utf-8")}

@@ -2678,14 +2684,16 @@ class PUSHOVER(Notifier):
                         {'label': 'Movie Link Source',
                          'value': self.config['movie_provider'],
                          'name': 'pushover_movie_provider',
-                          'description': 'Select the source for movie links on the info cards. Leave blank for default.',
+                          'description': 'Select the source for movie links on the info cards. Leave blank for default.<br> \
+                                          3rd party API lookup may need to be enabled under the notification settings tab.',
                          'input_type': 'select',
                          'select_options': PrettyMetadata().get_movie_providers()
                          },
                         {'label': 'TV Show Link Source',
                          'value': self.config['tv_provider'],
                          'name': 'pushover_tv_provider',
-                          'description': 'Select the source for tv show links on the info cards. Leave blank for default.',
+                          'description': 'Select the source for tv show links on the info cards. Leave blank for default.<br> \
+                                          3rd party API lookup may need to be enabled under the notification settings tab.',
                          'input_type': 'select',
                          'select_options': PrettyMetadata().get_tv_providers()
                          },
@@ -2775,12 +2783,12 @@ class SCRIPTS(Notifier):
            return False

        if error:
-            err = '\n  '.join([l for l in error.splitlines()])
+            err = '\n  '.join([helpers.sanitize(l) for l in error.splitlines()])
            logger.error(u"Tautulli Notifiers :: Script error: \n  %s" % err)
            return False

        if output:
-            out = '\n  '.join([l for l in output.splitlines()])
+            out = '\n  '.join([helpers.sanitize(l) for l in output.splitlines()])
            logger.debug(u"Tautulli Notifiers :: Script returned: \n  %s" % out)

        if not self.script_killed:
@@ -3038,14 +3046,16 @@ class SLACK(Notifier):
                         {'label': 'Movie Link Source',
                          'value': self.config['movie_provider'],
                          'name': 'slack_movie_provider',
-                          'description': 'Select the source for movie links on the info cards. Leave blank for default.',
+                          'description': 'Select the source for movie links on the info cards. Leave blank for default.<br> \
+                                          3rd party API lookup may need to be enabled under the notification settings tab.',
                          'input_type': 'select',
                          'select_options': PrettyMetadata().get_movie_providers()
                          },
                         {'label': 'TV Show Link Source',
                          'value': self.config['tv_provider'],
                          'name': 'slack_tv_provider',
-                          'description': 'Select the source for tv show links on the info cards. Leave blank for default.',
+                          'description': 'Select the source for tv show links on the info cards. Leave blank for default.<br> \
+                                          3rd party API lookup may need to be enabled under the notification settings tab.',
                          'input_type': 'select',
                          'select_options': PrettyMetadata().get_tv_providers()
                          },
--- a/plexpy/plexivity_import.py
+++ b/plexpy/plexivity_import.py
@@ -23,7 +23,6 @@ import activity_processor
 import database
 import helpers
 import logger
-import plextv
 import users


@@ -284,7 +283,7 @@ def import_from_plexivity(database=None, table_name=None, import_ignore_interval

    # Get the latest friends list so we can pull user id's
    try:
-        plextv.refresh_users()
+        users.refresh_users()
    except:
        logger.debug(u"Tautulli Importer :: Unable to refresh the users list. Aborting import.")
        return None
--- a/plexpy/plextv.py
+++ b/plexpy/plextv.py
@@ -18,11 +18,9 @@

 import base64
 import json
-from xml.dom import minidom

 import plexpy
 import common
-import database
 import helpers
 import http_handler
 import logger
@@ -31,129 +29,99 @@ import pmsconnect
 import session


-def refresh_users():
-    logger.info(u"Tautulli PlexTV :: Requesting users list refresh...")
-    result = PlexTV().get_full_users_list()
+def get_server_resources(return_presence=False):
+    if not return_presence:
+        logger.info(u"Tautulli PlexTV :: Requesting resources for server...")

-    monitor_db = database.MonitorDatabase()
-    user_data = users.Users()
+    server = {'pms_name': plexpy.CONFIG.PMS_NAME,
+              'pms_version': plexpy.CONFIG.PMS_VERSION,
+              'pms_platform': plexpy.CONFIG.PMS_PLATFORM,
+              'pms_ip': plexpy.CONFIG.PMS_IP,
+              'pms_port': plexpy.CONFIG.PMS_PORT,
+              'pms_ssl': plexpy.CONFIG.PMS_SSL,
+              'pms_is_remote': plexpy.CONFIG.PMS_IS_REMOTE,
+              'pms_is_cloud': plexpy.CONFIG.PMS_IS_CLOUD,
+              'pms_url': plexpy.CONFIG.PMS_URL,
+              'pms_url_manual': plexpy.CONFIG.PMS_URL_MANUAL
+              }

-    if result:
-        for item in result:
-
-            shared_libraries = ''
-            user_tokens = user_data.get_tokens(user_id=item['user_id'])
-            if user_tokens and user_tokens['server_token']:
-                pms_connect = pmsconnect.PmsConnect(token=user_tokens['server_token'])
-                library_details = pms_connect.get_server_children()
-
-                if library_details:
-                    shared_libraries = ';'.join(d['section_id'] for d in library_details['libraries_list'])
-                else:
-                    shared_libraries = ''
-
-            control_value_dict = {"user_id": item['user_id']}
-            new_value_dict = {"username": item['username'],
-                              "thumb": item['thumb'],
-                              "email": item['email'],
-                              "is_home_user": item['is_home_user'],
-                              "is_allow_sync": item['is_allow_sync'],
-                              "is_restricted": item['is_restricted'],
-                              "shared_libraries": shared_libraries,
-                              "filter_all": item['filter_all'],
-                              "filter_movies": item['filter_movies'],
-                              "filter_tv": item['filter_tv'],
-                              "filter_music": item['filter_music'],
-                              "filter_photos": item['filter_photos']
-                              }
-
-            # Check if we've set a custom avatar if so don't overwrite it.
-            if item['user_id']:
-                avatar_urls = monitor_db.select('SELECT thumb, custom_avatar_url '
-                                                'FROM users WHERE user_id = ?',
-                                                [item['user_id']])
-                if avatar_urls:
-                    if not avatar_urls[0]['custom_avatar_url'] or \
-                            avatar_urls[0]['custom_avatar_url'] == avatar_urls[0]['thumb']:
-                        new_value_dict['custom_avatar_url'] = item['thumb']
-                else:
-                    new_value_dict['custom_avatar_url'] = item['thumb']
-
-            monitor_db.upsert('users', new_value_dict, control_value_dict)
-
-        logger.info(u"Tautulli PlexTV :: Users list refreshed.")
-        return True
+    if server['pms_url_manual'] and server['pms_ssl'] or server['pms_is_cloud']:
+        scheme = 'https'
    else:
-        logger.warn(u"Tautulli PlexTV :: Unable to refresh users list.")
-        return False
+        scheme = 'http'

-
-def get_real_pms_url():
-    logger.info(u"Tautulli PlexTV :: Requesting URLs for server...")
-
-    # Reset any current PMS_URL value
-    plexpy.CONFIG.__setattr__('PMS_URL', '')
-    plexpy.CONFIG.write()
-
-    fallback_url = 'http://{}:{}'.format(plexpy.CONFIG.PMS_IP, plexpy.CONFIG.PMS_PORT)
+    fallback_url = '{scheme}://{hostname}:{port}'.format(scheme=scheme,
+                                                         hostname=server['pms_ip'],
+                                                         port=server['pms_port'])

    plex_tv = PlexTV()
-    result = plex_tv.get_server_urls(include_https=plexpy.CONFIG.PMS_SSL)
-    plexpass = plex_tv.get_plexpass_status()
+    result = plex_tv.get_server_connections(pms_identifier=plexpy.CONFIG.PMS_IDENTIFIER,
+                                            pms_ip=server['pms_ip'],
+                                            pms_port=server['pms_port'],
+                                            include_https=server['pms_ssl'])

-    connections = []
    if result:
-        plexpy.CONFIG.__setattr__('PMS_VERSION', result['version'])
-        plexpy.CONFIG.__setattr__('PMS_PLATFORM', result['platform'])
-        plexpy.CONFIG.__setattr__('PMS_PLEXPASS', plexpass)
-        connections = result['connections']
+        connections = result.pop('connections', [])
+        server.update(result)
+        presence = server.pop('pms_presence', 0)
+    else:
+        connections = []
+        presence = 0
+
+    if return_presence:
+        return presence
+
+    plexpass = plex_tv.get_plexpass_status()
+    server['pms_plexpass'] = int(plexpass)

    # Only need to retrieve PMS_URL if using SSL
-    if not plexpy.CONFIG.PMS_URL_MANUAL and plexpy.CONFIG.PMS_SSL:
+    if not server['pms_url_manual'] and server['pms_ssl']:
        if connections:
-            if plexpy.CONFIG.PMS_IS_REMOTE:
+            if server['pms_is_remote']:
                # Get all remote connections
-                conns = [c for c in connections if c['local'] == '0' and 'plex.direct' in c['uri']]
+                conns = [c for c in connections if
+                         c['local'] == '0' and ('plex.direct' in c['uri'] or 'plex.service' in c['uri'])]
            else:
                # Get all local connections
-                conns = [c for c in connections if c['local'] == '1' and 'plex.direct' in c['uri']]
+                conns = [c for c in connections if
+                         c['local'] == '1' and ('plex.direct' in c['uri'] or 'plex.service' in c['uri'])]

            if conns:
                # Get connection with matching address, otherwise return first connection
-                conn = next((c for c in conns if c['address'] == plexpy.CONFIG.PMS_IP
-                             and c['port'] == str(plexpy.CONFIG.PMS_PORT)), conns[0])
-                plexpy.CONFIG.__setattr__('PMS_URL', conn['uri'])
-                plexpy.CONFIG.write()
+                conn = next((c for c in conns if c['address'] == server['pms_ip']
+                             and c['port'] == str(server['pms_port'])), conns[0])
+                server['pms_url'] = conn['uri']
                logger.info(u"Tautulli PlexTV :: Server URL retrieved.")

        # get_server_urls() failed or PMS_URL not found, fallback url doesn't use SSL
-        if not plexpy.CONFIG.PMS_URL:
-            plexpy.CONFIG.__setattr__('PMS_URL', fallback_url)
-            plexpy.CONFIG.write()
+        if not server['pms_url']:
+            server['pms_url'] = fallback_url
            logger.warn(u"Tautulli PlexTV :: Unable to retrieve server URLs. Using user-defined value without SSL.")

-    # Not using SSL, remote has no effect
+        # Not using SSL, remote has no effect
    else:
-        if plexpy.CONFIG.PMS_URL_MANUAL and plexpy.CONFIG.PMS_SSL:
-            fallback_url = fallback_url.replace('http://', 'https://')
-
-        plexpy.CONFIG.__setattr__('PMS_URL', fallback_url)
-        plexpy.CONFIG.write()
+        server['pms_url'] = fallback_url
        logger.info(u"Tautulli PlexTV :: Using user-defined URL.")

+    plexpy.CONFIG.process_kwargs(server)
+    plexpy.CONFIG.write()
+

 class PlexTV(object):
    """
    Plex.tv authentication
    """

-    def __init__(self, username='', password='', token=None):
-        self.protocol = 'HTTPS'
+    def __init__(self, username=None, password=None, token=None):
        self.username = username
        self.password = password
+        self.token = token
+
+        self.urls = 'https://plex.tv'
+        self.timeout = plexpy.CONFIG.PMS_TIMEOUT
        self.ssl_verify = plexpy.CONFIG.VERIFY_SSL_CERT

-        if not token:
+        if not self.token:
            # Check if we should use the admin token, or the guest server token
            if session.get_session_user_id():
                user_data = users.Users()
@@ -161,12 +129,14 @@ class PlexTV(object):
                self.token = user_tokens['server_token']
            else:
                self.token = plexpy.CONFIG.PMS_TOKEN
-        else:
-            self.token = token

-        self.request_handler = http_handler.HTTPHandler(host='plex.tv',
-                                                        port=443,
+        if not self.token:
+            logger.error(u"Tautulli PlexTV :: PlexTV called, but no token provided.")
+            return
+
+        self.request_handler = http_handler.HTTPHandler(urls=self.urls,
                                                        token=self.token,
+                                                        timeout=self.timeout,
                                                        ssl_verify=self.ssl_verify)

    def get_plex_auth(self, output_format='raw'):
@@ -183,7 +153,6 @@ class PlexTV(object):
                   }
        
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='POST',
                                                    headers=headers,
                                                    output_format=output_format,
@@ -265,7 +234,6 @@ class PlexTV(object):
    def get_plextv_friends(self, output_format=''):
        uri = '/api/users'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -274,7 +242,6 @@ class PlexTV(object):
    def get_plextv_user_details(self, output_format=''):
        uri = '/users/account'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -283,7 +250,6 @@ class PlexTV(object):
    def get_plextv_devices_list(self, output_format=''):
        uri = '/devices.xml'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -292,7 +258,6 @@ class PlexTV(object):
    def get_plextv_server_list(self, output_format=''):
        uri = '/pms/servers.xml'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -301,7 +266,6 @@ class PlexTV(object):
    def get_plextv_sync_lists(self, machine_id='', output_format=''):
        uri = '/servers/%s/sync_lists' % machine_id
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -313,7 +277,6 @@ class PlexTV(object):
        else:
            uri = '/api/resources'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -325,7 +288,6 @@ class PlexTV(object):
        else:
            uri = '/api/downloads/1.json'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -334,7 +296,6 @@ class PlexTV(object):
    def delete_plextv_device(self, device_id='', output_format=''):
        uri = '/devices/%s.xml' % device_id
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='DELETE',
                                                    output_format=output_format)

@@ -343,7 +304,6 @@ class PlexTV(object):
    def delete_plextv_device_sync_lists(self, client_id='', output_format=''):
        uri = '/devices/%s/sync_items' % client_id
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -352,186 +312,184 @@ class PlexTV(object):
    def delete_plextv_sync(self, client_id='', sync_id='', output_format=''):
        uri = '/devices/%s/sync_items/%s' % (client_id, sync_id)
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='DELETE',
                                                    output_format=output_format)

        return request

    def get_full_users_list(self):
-        friends_list = self.get_plextv_friends()
-        own_account = self.get_plextv_user_details()
+        friends_list = self.get_plextv_friends(output_format='xml')
+        own_account = self.get_plextv_user_details(output_format='xml')
        users_list = []

        try:
-            xml_parse = minidom.parseString(own_account)
+            xml_head = own_account.getElementsByTagName('user')
        except Exception as e:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_full_users_list own account: %s" % e)
-            return []
-        except:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_full_users_list own account.")
-            return []
+            logger.warn(u"Tautulli PlexTV :: Unable to parse own account XML for get_full_users_list: %s." % e)
+            return {}

-        xml_head = xml_parse.getElementsByTagName('user')
-        if not xml_head:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_full_users_list.")
-        else:
-            for a in xml_head:
-                own_details = {"user_id": helpers.get_xml_attr(a, 'id'),
-                               "username": helpers.get_xml_attr(a, 'username'),
-                               "thumb": helpers.get_xml_attr(a, 'thumb'),
-                               "email": helpers.get_xml_attr(a, 'email'),
-                               "is_home_user": helpers.get_xml_attr(a, 'home'),
-                               "is_allow_sync": None,
-                               "is_restricted": helpers.get_xml_attr(a, 'restricted'),
-                               "filter_all": helpers.get_xml_attr(a, 'filterAll'),
-                               "filter_movies": helpers.get_xml_attr(a, 'filterMovies'),
-                               "filter_tv": helpers.get_xml_attr(a, 'filterTelevision'),
-                               "filter_music": helpers.get_xml_attr(a, 'filterMusic'),
-                               "filter_photos": helpers.get_xml_attr(a, 'filterPhotos')
-                               }
+        for a in xml_head:
+            own_details = {"user_id": helpers.get_xml_attr(a, 'id'),
+                            "username": helpers.get_xml_attr(a, 'username'),
+                            "thumb": helpers.get_xml_attr(a, 'thumb'),
+                            "email": helpers.get_xml_attr(a, 'email'),
+                            "is_home_user": helpers.get_xml_attr(a, 'home'),
+                            "is_allow_sync": None,
+                            "is_restricted": helpers.get_xml_attr(a, 'restricted'),
+                            "filter_all": helpers.get_xml_attr(a, 'filterAll'),
+                            "filter_movies": helpers.get_xml_attr(a, 'filterMovies'),
+                            "filter_tv": helpers.get_xml_attr(a, 'filterTelevision'),
+                            "filter_music": helpers.get_xml_attr(a, 'filterMusic'),
+                            "filter_photos": helpers.get_xml_attr(a, 'filterPhotos')
+                            }

-                users_list.append(own_details)
+            users_list.append(own_details)

        try:
-            xml_parse = minidom.parseString(friends_list)
+            xml_head = friends_list.getElementsByTagName('User')
        except Exception as e:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_full_users_list friends list: %s" % e)
-            return []
-        except:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_full_users_list friends list.")
-            return []
+            logger.warn(u"Tautulli PlexTV :: Unable to parse friends list XML for get_full_users_list: %s." % e)
+            return {}

-        xml_head = xml_parse.getElementsByTagName('User')
-        if not xml_head:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_full_users_list.")
-        else:
-            for a in xml_head:
-                friend = {"user_id": helpers.get_xml_attr(a, 'id'),
-                          "username": helpers.get_xml_attr(a, 'title'),
-                          "thumb": helpers.get_xml_attr(a, 'thumb'),
-                          "email": helpers.get_xml_attr(a, 'email'),
-                          "is_home_user": helpers.get_xml_attr(a, 'home'),
-                          "is_allow_sync": helpers.get_xml_attr(a, 'allowSync'),
-                          "is_restricted": helpers.get_xml_attr(a, 'restricted'),
-                          "filter_all": helpers.get_xml_attr(a, 'filterAll'),
-                          "filter_movies": helpers.get_xml_attr(a, 'filterMovies'),
-                          "filter_tv": helpers.get_xml_attr(a, 'filterTelevision'),
-                          "filter_music": helpers.get_xml_attr(a, 'filterMusic'),
-                          "filter_photos": helpers.get_xml_attr(a, 'filterPhotos')
-                          }
+        for a in xml_head:
+            friend = {"user_id": helpers.get_xml_attr(a, 'id'),
+                        "username": helpers.get_xml_attr(a, 'title'),
+                        "thumb": helpers.get_xml_attr(a, 'thumb'),
+                        "email": helpers.get_xml_attr(a, 'email'),
+                        "is_home_user": helpers.get_xml_attr(a, 'home'),
+                        "is_allow_sync": helpers.get_xml_attr(a, 'allowSync'),
+                        "is_restricted": helpers.get_xml_attr(a, 'restricted'),
+                        "filter_all": helpers.get_xml_attr(a, 'filterAll'),
+                        "filter_movies": helpers.get_xml_attr(a, 'filterMovies'),
+                        "filter_tv": helpers.get_xml_attr(a, 'filterTelevision'),
+                        "filter_music": helpers.get_xml_attr(a, 'filterMusic'),
+                        "filter_photos": helpers.get_xml_attr(a, 'filterPhotos')
+                        }

-                users_list.append(friend)
+            users_list.append(friend)

        return users_list

-    def get_synced_items(self, machine_id=None, user_id=None):
-        sync_list = self.get_plextv_sync_lists(machine_id)
+    def get_synced_items(self, machine_id=None, client_id_filter=None, user_id_filter=None,
+                         rating_key_filter=None, sync_id_filter=None):
+
+        if machine_id is None:
+            machine_id = plexpy.CONFIG.PMS_IDENTIFIER
+
+        sync_list = self.get_plextv_sync_lists(machine_id, output_format='xml')
        user_data = users.Users()

        synced_items = []

        try:
-            xml_parse = minidom.parseString(sync_list)
+            xml_head = sync_list.getElementsByTagName('SyncList')
        except Exception as e:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_synced_items: %s" % e)
-            return []
-        except:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_synced_items.")
-            return []
+            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_synced_items: %s." % e)
+            return {}

-        xml_head = xml_parse.getElementsByTagName('SyncList')
+        for a in xml_head:
+            client_id = helpers.get_xml_attr(a, 'clientIdentifier')

-        if not xml_head:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_synced_items.")
-        else:
-            for a in xml_head:
-                sync_id = helpers.get_xml_attr(a, 'id')
-                client_id = helpers.get_xml_attr(a, 'clientIdentifier')
-                sync_device = a.getElementsByTagName('Device')
-                for device in sync_device:
-                    device_user_id = helpers.get_xml_attr(device, 'userID')
-                    try:
-                        device_username = user_data.get_details(user_id=device_user_id)['username']
-                        device_friendly_name = user_data.get_details(user_id=device_user_id)['friendly_name']
-                    except:
-                        device_username = ''
-                        device_friendly_name = ''
-                    device_name = helpers.get_xml_attr(device, 'name')
-                    device_product = helpers.get_xml_attr(device, 'product')
-                    device_product_version = helpers.get_xml_attr(device, 'productVersion')
-                    device_platform = helpers.get_xml_attr(device, 'platform')
-                    device_platform_version = helpers.get_xml_attr(device, 'platformVersion')
-                    device_type = helpers.get_xml_attr(device, 'device')
-                    device_model = helpers.get_xml_attr(device, 'model')
-                    device_last_seen = helpers.get_xml_attr(device, 'lastSeenAt')
+            # Filter by client_id
+            if client_id_filter and str(client_id_filter) != client_id:
+                continue

-                # Filter by user_id
-                if user_id and user_id != device_user_id:
-                    continue
+            sync_list_id = helpers.get_xml_attr(a, 'id')
+            sync_device = a.getElementsByTagName('Device')

-                for synced in a.getElementsByTagName('SyncItems'):
-                    sync_item = synced.getElementsByTagName('SyncItem')
-                    for item in sync_item:
-                        sync_id = helpers.get_xml_attr(item, 'id')
-                        sync_version = helpers.get_xml_attr(item, 'version')
-                        sync_root_title = helpers.get_xml_attr(item, 'rootTitle')
-                        sync_title = helpers.get_xml_attr(item, 'title')
-                        sync_metadata_type = helpers.get_xml_attr(item, 'metadataType')
-                        sync_content_type = helpers.get_xml_attr(item, 'contentType')
+            for device in sync_device:
+                device_user_id = helpers.get_xml_attr(device, 'userID')
+                try:
+                    device_username = user_data.get_details(user_id=device_user_id)['username']
+                    device_friendly_name = user_data.get_details(user_id=device_user_id)['friendly_name']
+                except:
+                    device_username = ''
+                    device_friendly_name = ''
+                device_name = helpers.get_xml_attr(device, 'name')
+                device_product = helpers.get_xml_attr(device, 'product')
+                device_product_version = helpers.get_xml_attr(device, 'productVersion')
+                device_platform = helpers.get_xml_attr(device, 'platform')
+                device_platform_version = helpers.get_xml_attr(device, 'platformVersion')
+                device_type = helpers.get_xml_attr(device, 'device')
+                device_model = helpers.get_xml_attr(device, 'model')
+                device_last_seen = helpers.get_xml_attr(device, 'lastSeenAt')

-                        for status in item.getElementsByTagName('Status'):
-                            status_failure_code = helpers.get_xml_attr(status, 'failureCode')
-                            status_failure = helpers.get_xml_attr(status, 'failure')
-                            status_state = helpers.get_xml_attr(status, 'state')
-                            status_item_count = helpers.get_xml_attr(status, 'itemsCount')
-                            status_item_complete_count = helpers.get_xml_attr(status, 'itemsCompleteCount')
-                            status_item_downloaded_count = helpers.get_xml_attr(status, 'itemsDownloadedCount')
-                            status_item_ready_count = helpers.get_xml_attr(status, 'itemsReadyCount')
-                            status_item_successful_count = helpers.get_xml_attr(status, 'itemsSuccessfulCount')
-                            status_total_size = helpers.get_xml_attr(status, 'totalSize')
-                            status_item_download_percent_complete = helpers.get_percent(
-                                status_item_downloaded_count, status_item_count)
+            # Filter by user_id
+            if user_id_filter and str(user_id_filter) != device_user_id:
+                continue

-                        for settings in item.getElementsByTagName('MediaSettings'):
-                            settings_audio_boost = helpers.get_xml_attr(settings, 'audioBoost')
-                            settings_music_bitrate = helpers.get_xml_attr(settings, 'musicBitrate')
-                            settings_photo_quality = helpers.get_xml_attr(settings, 'photoQuality')
-                            settings_photo_resolution = helpers.get_xml_attr(settings, 'photoResolution')
-                            settings_video_quality = helpers.get_xml_attr(settings, 'videoQuality')
-                            settings_video_resolution = helpers.get_xml_attr(settings, 'videoResolution')
+            for synced in a.getElementsByTagName('SyncItems'):
+                sync_item = synced.getElementsByTagName('SyncItem')
+                for item in sync_item:

-                        for location in item.getElementsByTagName('Location'):
-                            clean_uri = helpers.get_xml_attr(location, 'uri').split('%2F')
+                    for location in item.getElementsByTagName('Location'):
+                        clean_uri = helpers.get_xml_attr(location, 'uri').split('%2F')

-                        rating_key = next((clean_uri[(idx + 1) % len(clean_uri)] 
-                                           for idx, item in enumerate(clean_uri) if item == 'metadata'), None)
+                    rating_key = next((clean_uri[(idx + 1) % len(clean_uri)]
+                                       for idx, item in enumerate(clean_uri) if item == 'metadata'), None)

-                        sync_details = {"device_name": helpers.sanitize(device_name),
-                                        "platform": helpers.sanitize(device_platform),
-                                        "username": helpers.sanitize(device_username),
-                                        "friendly_name": helpers.sanitize(device_friendly_name),
-                                        "user_id": device_user_id,
-                                        "root_title": helpers.sanitize(sync_root_title),
-                                        "title": helpers.sanitize(sync_title),
-                                        "metadata_type": sync_metadata_type,
-                                        "content_type": sync_content_type,
-                                        "rating_key": rating_key,
-                                        "state": status_state,
-                                        "item_count": status_item_count,
-                                        "item_complete_count": status_item_complete_count,
-                                        "item_downloaded_count": status_item_downloaded_count,
-                                        "item_downloaded_percent_complete": status_item_download_percent_complete,
-                                        "music_bitrate": settings_music_bitrate,
-                                        "photo_quality": settings_photo_quality,
-                                        "video_quality": settings_video_quality,
-                                        "total_size": status_total_size,
-                                        "failure": status_failure,
-                                        "client_id": client_id,
-                                        "sync_id": sync_id
-                                        }
+                    # Filter by rating_key
+                    if rating_key_filter and str(rating_key_filter) != rating_key:
+                        continue

-                        synced_items.append(sync_details)
+                    sync_id = helpers.get_xml_attr(item, 'id')
+
+                    # Filter by sync_id
+                    if sync_id_filter and str(sync_id_filter) != sync_id:
+                        continue
+
+                    sync_version = helpers.get_xml_attr(item, 'version')
+                    sync_root_title = helpers.get_xml_attr(item, 'rootTitle')
+                    sync_title = helpers.get_xml_attr(item, 'title')
+                    sync_metadata_type = helpers.get_xml_attr(item, 'metadataType')
+                    sync_content_type = helpers.get_xml_attr(item, 'contentType')
+
+                    for status in item.getElementsByTagName('Status'):
+                        status_failure_code = helpers.get_xml_attr(status, 'failureCode')
+                        status_failure = helpers.get_xml_attr(status, 'failure')
+                        status_state = helpers.get_xml_attr(status, 'state')
+                        status_item_count = helpers.get_xml_attr(status, 'itemsCount')
+                        status_item_complete_count = helpers.get_xml_attr(status, 'itemsCompleteCount')
+                        status_item_downloaded_count = helpers.get_xml_attr(status, 'itemsDownloadedCount')
+                        status_item_ready_count = helpers.get_xml_attr(status, 'itemsReadyCount')
+                        status_item_successful_count = helpers.get_xml_attr(status, 'itemsSuccessfulCount')
+                        status_total_size = helpers.get_xml_attr(status, 'totalSize')
+                        status_item_download_percent_complete = helpers.get_percent(
+                            status_item_downloaded_count, status_item_count)
+
+                    for settings in item.getElementsByTagName('MediaSettings'):
+                        settings_audio_boost = helpers.get_xml_attr(settings, 'audioBoost')
+                        settings_music_bitrate = helpers.get_xml_attr(settings, 'musicBitrate')
+                        settings_photo_quality = helpers.get_xml_attr(settings, 'photoQuality')
+                        settings_photo_resolution = helpers.get_xml_attr(settings, 'photoResolution')
+                        settings_video_quality = helpers.get_xml_attr(settings, 'videoQuality')
+                        settings_video_resolution = helpers.get_xml_attr(settings, 'videoResolution')
+
+                    sync_details = {"device_name": helpers.sanitize(device_name),
+                                    "platform": helpers.sanitize(device_platform),
+                                    "user_id": device_user_id,
+                                    "user": helpers.sanitize(device_friendly_name),
+                                    "username": helpers.sanitize(device_username),
+                                    "root_title": helpers.sanitize(sync_root_title),
+                                    "sync_title": helpers.sanitize(sync_title),
+                                    "metadata_type": sync_metadata_type,
+                                    "content_type": sync_content_type,
+                                    "rating_key": rating_key,
+                                    "state": status_state,
+                                    "item_count": status_item_count,
+                                    "item_complete_count": status_item_complete_count,
+                                    "item_downloaded_count": status_item_downloaded_count,
+                                    "item_downloaded_percent_complete": status_item_download_percent_complete,
+                                    "music_bitrate": settings_music_bitrate,
+                                    "photo_quality": settings_photo_quality,
+                                    "video_quality": settings_video_quality,
+                                    "total_size": status_total_size,
+                                    "failure": status_failure,
+                                    "client_id": client_id,
+                                    "sync_id": sync_id
+                                    }
+
+                    synced_items.append(sync_details)

        return session.filter_session_info(synced_items, filter_key='user_id')

@@ -539,27 +497,16 @@ class PlexTV(object):
        logger.info(u"Tautulli PlexTV :: Deleting sync item '%s'." % sync_id)
        self.delete_plextv_sync(client_id=client_id, sync_id=sync_id)

-    def get_server_urls(self, include_https=True):
+    def get_server_connections(self, pms_identifier='', pms_ip='', pms_port=32400, include_https=True):

-        if plexpy.CONFIG.PMS_IDENTIFIER:
-            server_id = plexpy.CONFIG.PMS_IDENTIFIER
-        else:
-            logger.error(u"Tautulli PlexTV :: Unable to retrieve server identity.")
+        if not pms_identifier:
+            logger.error(u"Tautulli PlexTV :: Unable to retrieve server connections: no pms_identifier provided.")
            return {}

-        plextv_resources = self.get_plextv_resources(include_https=include_https)
-
+        plextv_resources = self.get_plextv_resources(include_https=include_https,
+                                                     output_format='xml')
        try:
-            xml_parse = minidom.parseString(plextv_resources)
-        except Exception as e:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_server_urls: %s" % e)
-            return {}
-        except:
-            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_server_urls.")
-            return {}
-
-        try:
-            xml_head = xml_parse.getElementsByTagName('Device')
+            xml_head = plextv_resources.getElementsByTagName('Device')
        except Exception as e:
            logger.warn(u"Tautulli PlexTV :: Unable to parse XML for get_server_urls: %s." % e)
            return {}
@@ -569,16 +516,20 @@ class PlexTV(object):
            conn = []
            connections = device.getElementsByTagName('Connection')

-            server = {"platform": helpers.get_xml_attr(device, 'platform'),
-                      "version": helpers.get_xml_attr(device, 'productVersion')
+            server = {'pms_identifier': helpers.get_xml_attr(device, 'clientIdentifier'),
+                      'pms_name': helpers.get_xml_attr(device, 'name'),
+                      'pms_version': helpers.get_xml_attr(device, 'productVersion'),
+                      'pms_platform': helpers.get_xml_attr(device, 'platform'),
+                      'pms_presence': helpers.get_xml_attr(device, 'presence'),
+                      'pms_is_cloud': 1 if helpers.get_xml_attr(device, 'platform') == 'Cloud' else 0
                      }

            for c in connections:
-                server_details = {"protocol": helpers.get_xml_attr(c, 'protocol'),
-                                  "address": helpers.get_xml_attr(c, 'address'),
-                                  "port": helpers.get_xml_attr(c, 'port'),
-                                  "uri": helpers.get_xml_attr(c, 'uri'),
-                                  "local": helpers.get_xml_attr(c, 'local')
+                server_details = {'protocol': helpers.get_xml_attr(c, 'protocol'),
+                                  'address': helpers.get_xml_attr(c, 'address'),
+                                  'port': helpers.get_xml_attr(c, 'port'),
+                                  'uri': helpers.get_xml_attr(c, 'uri'),
+                                  'local': helpers.get_xml_attr(c, 'local')
                                  }
                conn.append(server_details)

@@ -589,10 +540,10 @@ class PlexTV(object):

        # Try to match the device
        for a in xml_head:
-            if helpers.get_xml_attr(a, 'clientIdentifier') == server_id:
+            if helpers.get_xml_attr(a, 'clientIdentifier') == pms_identifier:
                server = get_connections(a)
                break
-                    
+
        # Else no device match found
        if not server:
            # Try to match the PMS_IP and PMS_PORT
@@ -601,15 +552,8 @@ class PlexTV(object):
                    connections = a.getElementsByTagName('Connection')

                    for connection in connections:
-                        if helpers.get_xml_attr(connection, 'address') == plexpy.CONFIG.PMS_IP and \
-                            int(helpers.get_xml_attr(connection, 'port')) == plexpy.CONFIG.PMS_PORT:
-    
-                            plexpy.CONFIG.PMS_IDENTIFIER = helpers.get_xml_attr(a, 'clientIdentifier')
-                            plexpy.CONFIG.write()
-    
-                            logger.info(u"Tautulli PlexTV :: PMS identifier changed from %s to %s."
-                                        % (server_id, plexpy.CONFIG.PMS_IDENTIFIER))
-    
+                        if helpers.get_xml_attr(connection, 'address') == pms_ip and \
+                                helpers.get_xml_attr(connection, 'port') == str(pms_port):
                            server = get_connections(a)
                            break

@@ -638,7 +582,7 @@ class PlexTV(object):

        return server_times

-    def discover(self, include_cloud=True):
+    def discover(self, include_cloud=True, all_servers=False):
        """ Query plex for all servers online. Returns the ones you own in a selectize format """
        servers = self.get_plextv_resources(include_https=True, output_format='xml')
        clean_servers = []
@@ -668,15 +612,16 @@ class PlexTV(object):
                        connections = d.getElementsByTagName('Connection')

                        for c in connections:
-                            # If this is a remote server don't show any local IPs.
-                            if helpers.get_xml_attr(d, 'publicAddressMatches') == '0' and \
-                                helpers.get_xml_attr(c, 'local') == '1':
-                                continue
+                            if not all_servers:
+                                # If this is a remote server don't show any local IPs.
+                                if helpers.get_xml_attr(d, 'publicAddressMatches') == '0' and \
+                                    helpers.get_xml_attr(c, 'local') == '1':
+                                    continue

-                            # If this is a local server don't show any remote IPs.
-                            if helpers.get_xml_attr(d, 'publicAddressMatches') == '1' and \
-                                helpers.get_xml_attr(c, 'local') == '0':
-                                continue
+                                # If this is a local server don't show any remote IPs.
+                                if helpers.get_xml_attr(d, 'publicAddressMatches') == '1' and \
+                                    helpers.get_xml_attr(c, 'local') == '0':
+                                    continue

                            server = {'httpsRequired': helpers.get_xml_attr(d, 'httpsRequired'),
                                      'clientIdentifier': helpers.get_xml_attr(d, 'clientIdentifier'),
@@ -759,8 +704,6 @@ class PlexTV(object):
            return True
        else:
            logger.debug(u"Tautulli PlexTV :: Plex Pass subscription not found.")
-            plexpy.CONFIG.__setattr__('PMS_PLEXPASS', 0)
-            plexpy.CONFIG.write()
            return False

    def get_devices_list(self):
--- a/plexpy/plexwatch_import.py
+++ b/plexpy/plexwatch_import.py
@@ -22,7 +22,6 @@ import activity_processor
 import database
 import helpers
 import logger
-import plextv
 import users


@@ -275,7 +274,7 @@ def import_from_plexwatch(database=None, table_name=None, import_ignore_interval

    # Get the latest friends list so we can pull user id's
    try:
-        plextv.refresh_users()
+        users.refresh_users()
    except:
        logger.debug(u"Tautulli Importer :: Unable to refresh the users list. Aborting import.")
        return None
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -13,17 +13,14 @@
 #  You should have received a copy of the GNU General Public License
 #  along with Tautulli.  If not, see <http://www.gnu.org/licenses/>.

-import threading
 import urllib
-from urlparse import urlparse

 import plexpy
 import common
-import database
 import helpers
 import http_handler
-import libraries
 import logger
+import plextv
 import session
 import users

@@ -48,83 +45,23 @@ def get_server_friendly_name():
    return server_name


-def refresh_libraries():
-    logger.info(u"Tautulli Pmsconnect :: Requesting libraries list refresh...")
-
-    server_id = plexpy.CONFIG.PMS_IDENTIFIER
-    if not server_id:
-        logger.error(u"Tautulli Pmsconnect :: No PMS identifier, cannot refresh libraries. Verify server in settings.")
-        return
-
-    library_sections = PmsConnect().get_library_details()
-
-    if library_sections:
-        monitor_db = database.MonitorDatabase()
-
-        library_keys = []
-        new_keys = []
-
-        for section in library_sections:
-            section_keys = {'server_id': server_id,
-                            'section_id': section['section_id']}
-            section_values = {'server_id': server_id,
-                              'section_id': section['section_id'],
-                              'section_name': section['section_name'],
-                              'section_type': section['section_type'],
-                              'thumb': section['thumb'],
-                              'art': section['art'],
-                              'count': section['count'],
-                              'parent_count': section.get('parent_count', None),
-                              'child_count': section.get('child_count', None),
-                              }
-
-            result = monitor_db.upsert('library_sections', key_dict=section_keys, value_dict=section_values)
-
-            library_keys.append(section['section_id'])
-
-            if result == 'insert':
-                new_keys.append(section['section_id'])
-
-        if plexpy.CONFIG.HOME_LIBRARY_CARDS == ['first_run_wizard']:
-            plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', library_keys)
-            plexpy.CONFIG.write()
-        else:
-            new_keys = plexpy.CONFIG.HOME_LIBRARY_CARDS + new_keys
-            plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', new_keys)
-            plexpy.CONFIG.write()
-
-        #if plexpy.CONFIG.UPDATE_SECTION_IDS == 1 or plexpy.CONFIG.UPDATE_SECTION_IDS == -1:
-        #    # Start library section_id update on it's own thread
-        #    threading.Thread(target=libraries.update_section_ids).start()
-
-        #if plexpy.CONFIG.UPDATE_LABELS == 1 or plexpy.CONFIG.UPDATE_LABELS == -1:
-        #    # Start library labels update on it's own thread
-        #    threading.Thread(target=libraries.update_labels).start()
-
-        logger.info(u"Tautulli Pmsconnect :: Libraries list refreshed.")
-        return True
-    else:
-        logger.warn(u"Tautulli Pmsconnect :: Unable to refresh libraries list.")
-        return False
-
-
 class PmsConnect(object):
    """
    Retrieve data from Plex Server
    """

-    def __init__(self, token=None):
-        if plexpy.CONFIG.PMS_URL:
-            url_parsed = urlparse(plexpy.CONFIG.PMS_URL)
-            hostname = url_parsed.hostname
-            port = url_parsed.port
-            self.protocol = url_parsed.scheme
-        else:
-            hostname = plexpy.CONFIG.PMS_IP
-            port = plexpy.CONFIG.PMS_PORT
-            self.protocol = 'http'
+    def __init__(self, url=None, token=None):
+        self.url = url
+        self.token = token

-        if not token:
+        if not self.url and plexpy.CONFIG.PMS_URL:
+            self.url = plexpy.CONFIG.PMS_URL
+        elif not self.url:
+            self.url = 'http://{hostname}:{port}'.format(hostname=plexpy.CONFIG.PMS_IP,
+                                                          port=plexpy.CONFIG.PMS_PORT)
+        self.timeout = plexpy.CONFIG.PMS_TIMEOUT
+
+        if not self.token:
            # Check if we should use the admin token, or the guest server token
            if session.get_session_user_id():
                user_data = users.Users()
@@ -132,12 +69,10 @@ class PmsConnect(object):
                self.token = user_tokens['server_token']
            else:
                self.token = plexpy.CONFIG.PMS_TOKEN
-        else:
-            self.token = token

-        self.request_handler = http_handler.HTTPHandler(host=hostname,
-                                                        port=port,
-                                                        token=self.token)
+        self.request_handler = http_handler.HTTPHandler(urls=self.url,
+                                                        token=self.token,
+                                                        timeout=self.timeout)

    def get_sessions(self, output_format=''):
        """
@@ -149,7 +84,6 @@ class PmsConnect(object):
        """
        uri = '/status/sessions'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -165,7 +99,6 @@ class PmsConnect(object):
        """
        uri = '/status/sessions/terminate?sessionId=%s&reason=%s' % (session_id, reason)
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -182,7 +115,6 @@ class PmsConnect(object):
        """
        uri = '/library/metadata/' + rating_key
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -199,7 +131,6 @@ class PmsConnect(object):
        """
        uri = '/library/metadata/' + rating_key + '/children'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -216,7 +147,6 @@ class PmsConnect(object):
        """
        uri = '/library/recentlyAdded?X-Plex-Container-Start=%s&X-Plex-Container-Size=%s' % (start, count)
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -233,7 +163,6 @@ class PmsConnect(object):
        """
        uri = '/library/sections/%s/recentlyAdded?X-Plex-Container-Start=%s&X-Plex-Container-Size=%s' % (section_id, start, count)
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -249,6 +178,22 @@ class PmsConnect(object):
        Output: array
        """
        uri = '/library/metadata/' + rating_key + '/children'
+        request = self.request_handler.make_request(uri=uri,
+                                                    request_type='GET',
+                                                    output_format=output_format)
+
+        return request
+
+    def get_children_list_related(self, rating_key='', output_format=''):
+        """
+        Return list of related children in requested collection item.
+
+        Parameters required:    rating_key { ratingKey of parent }
+        Optional parameters:    output_format { dict, json }
+
+        Output: array
+        """
+        uri = '/hubs/metadata/' + rating_key + '/related'
        request = self.request_handler.make_request(uri=uri,
                                                    proto=self.protocol,
                                                    request_type='GET',
@@ -267,7 +212,6 @@ class PmsConnect(object):
        """
        uri = '/library/metadata/' + rating_key + '/allLeaves'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -283,7 +227,6 @@ class PmsConnect(object):
        """
        uri = '/servers'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -299,7 +242,6 @@ class PmsConnect(object):
        """
        uri = '/:/prefs'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -315,7 +257,6 @@ class PmsConnect(object):
        """
        uri = '/identity'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -331,7 +272,6 @@ class PmsConnect(object):
        """
        uri = '/library/sections'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -350,7 +290,6 @@ class PmsConnect(object):

        uri = '/library/sections/' + section_id + '/' + list_type + '?X-Plex-Container-Start=0' + count + sort_type + label_key
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -366,7 +305,6 @@ class PmsConnect(object):
        """
        uri = '/library/sections/' + section_id + '/label'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -383,7 +321,6 @@ class PmsConnect(object):
        """
        uri = '/sync/items/' + sync_id
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -399,7 +336,6 @@ class PmsConnect(object):
        """
        uri = '/sync/transcodeQueue'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -413,9 +349,8 @@ class PmsConnect(object):

        Output: array
        """
-        uri = '/hubs/search?query=' + urllib.quote(query.encode('utf8')) + '&limit=' + limit
+        uri = '/hubs/search?query=' + urllib.quote(query.encode('utf8')) + '&limit=' + limit + '&includeCollections=1'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -431,7 +366,6 @@ class PmsConnect(object):
        """
        uri = '/myplex/account'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -447,7 +381,6 @@ class PmsConnect(object):
        """
        uri = '/myplex/refreshReachability'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='PUT')

        return request
@@ -462,7 +395,6 @@ class PmsConnect(object):
        """
        uri = '/updater/check?download=0'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='PUT',
                                                    output_format=output_format)

@@ -478,7 +410,6 @@ class PmsConnect(object):
        """
        uri = '/updater/status'
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -497,7 +428,6 @@ class PmsConnect(object):
        """
        uri = '/hubs/home/recentlyAdded?X-Plex-Container-Start=%s&X-Plex-Container-Size=%s&type=%s' % (start, count, type)
        request = self.request_handler.make_request(uri=uri,
-                                                    proto=self.protocol,
                                                    request_type='GET',
                                                    output_format=output_format)

@@ -548,6 +478,7 @@ class PmsConnect(object):
                                    'title': helpers.get_xml_attr(item, 'title'),
                                    'parent_title': helpers.get_xml_attr(item, 'parentTitle'),
                                    'grandparent_title': helpers.get_xml_attr(item, 'grandparentTitle'),
+                                    'sort_title': helpers.get_xml_attr(item, 'titleSort'),
                                    'media_index': helpers.get_xml_attr(item, 'index'),
                                    'parent_media_index': helpers.get_xml_attr(item, 'parentIndex'),
                                    'section_id': section_id if section_id else helpers.get_xml_attr(item, 'librarySectionID'),
@@ -571,6 +502,7 @@ class PmsConnect(object):
                                    'title': helpers.get_xml_attr(item, 'title'),
                                    'parent_title': helpers.get_xml_attr(item, 'parentTitle'),
                                    'grandparent_title': helpers.get_xml_attr(item, 'grandparentTitle'),
+                                    'sort_title': helpers.get_xml_attr(item, 'titleSort'),
                                    'media_index': helpers.get_xml_attr(item, 'index'),
                                    'parent_media_index': helpers.get_xml_attr(item, 'parentIndex'),
                                    'section_id': section_id if section_id else helpers.get_xml_attr(item, 'librarySectionID'),
@@ -588,7 +520,7 @@ class PmsConnect(object):

        return output

-    def get_metadata_details(self, rating_key=''):
+    def get_metadata_details(self, rating_key='', sync_id=''):
        """
        Return processed and validated metadata list for requested item.

@@ -596,12 +528,15 @@ class PmsConnect(object):

        Output: array
        """
-        metadata = self.get_metadata(str(rating_key), output_format='xml')
+        if rating_key:
+            metadata = self.get_metadata(str(rating_key), output_format='xml')
+        elif sync_id:
+            metadata = self.get_sync_item(str(sync_id), output_format='xml')

        try:
            xml_head = metadata.getElementsByTagName('MediaContainer')
        except Exception as e:
-            logger.warn(u"Tautulli Pmsconnect :: Unable to parse XML for get_metadata: %s." % e)
+            logger.warn(u"Tautulli Pmsconnect :: Unable to parse XML for get_metadata_details: %s." % e)
            return {}

        metadata = {}
@@ -668,6 +603,7 @@ class PmsConnect(object):
                        'title': helpers.get_xml_attr(metadata_main, 'title'),
                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
@@ -707,6 +643,7 @@ class PmsConnect(object):
                        'title': helpers.get_xml_attr(metadata_main, 'title'),
                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
@@ -748,6 +685,7 @@ class PmsConnect(object):
                        'title': helpers.get_xml_attr(metadata_main, 'title'),
                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'studio': show_details['studio'],
@@ -790,6 +728,7 @@ class PmsConnect(object):
                        'title': helpers.get_xml_attr(metadata_main, 'title'),
                        'parent_title': 'Season %s' % helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'studio': show_details['studio'],
@@ -830,6 +769,7 @@ class PmsConnect(object):
                        'title': helpers.get_xml_attr(metadata_main, 'title'),
                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
@@ -871,6 +811,7 @@ class PmsConnect(object):
                        'title': helpers.get_xml_attr(metadata_main, 'title'),
                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
@@ -913,6 +854,7 @@ class PmsConnect(object):
                        'title': helpers.get_xml_attr(metadata_main, 'title'),
                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
@@ -953,6 +895,7 @@ class PmsConnect(object):
                        'title': helpers.get_xml_attr(metadata_main, 'title'),
                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
@@ -994,6 +937,7 @@ class PmsConnect(object):
                        'title': helpers.get_xml_attr(metadata_main, 'title'),
                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
@@ -1024,6 +968,50 @@ class PmsConnect(object):
                                                        helpers.get_xml_attr(metadata_main, 'title'))
                        }

+        elif metadata_type == 'collection':
+            metadata = {'media_type': metadata_type,
+                        'sub_media_type': helpers.get_xml_attr(metadata_main, 'subtype'),
+                        'section_id': section_id,
+                        'library_name': library_name,
+                        'rating_key': helpers.get_xml_attr(metadata_main, 'ratingKey'),
+                        'parent_rating_key': helpers.get_xml_attr(metadata_main, 'parentRatingKey'),
+                        'grandparent_rating_key': helpers.get_xml_attr(metadata_main, 'grandparentRatingKey'),
+                        'title': helpers.get_xml_attr(metadata_main, 'title'),
+                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
+                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
+                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
+                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
+                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
+                        'content_rating': helpers.get_xml_attr(metadata_main, 'contentRating'),
+                        'summary': helpers.get_xml_attr(metadata_main, 'summary'),
+                        'tagline': helpers.get_xml_attr(metadata_main, 'tagline'),
+                        'rating': helpers.get_xml_attr(metadata_main, 'rating'),
+                        'audience_rating': helpers.get_xml_attr(metadata_main, 'audienceRating'),
+                        'user_rating': helpers.get_xml_attr(metadata_main, 'userRating'),
+                        'duration': helpers.get_xml_attr(metadata_main, 'duration'),
+                        'year': helpers.get_xml_attr(metadata_main, 'year'),
+                        'min_year': helpers.get_xml_attr(metadata_main, 'minYear'),
+                        'max_year': helpers.get_xml_attr(metadata_main, 'maxYear'),
+                        'thumb': helpers.get_xml_attr(metadata_main, 'thumb').split('?')[0],
+                        'parent_thumb': helpers.get_xml_attr(metadata_main, 'parentThumb'),
+                        'grandparent_thumb': helpers.get_xml_attr(metadata_main, 'grandparentThumb'),
+                        'art': helpers.get_xml_attr(metadata_main, 'art'),
+                        'banner': helpers.get_xml_attr(metadata_main, 'banner'),
+                        'originally_available_at': helpers.get_xml_attr(metadata_main, 'originallyAvailableAt'),
+                        'added_at': helpers.get_xml_attr(metadata_main, 'addedAt'),
+                        'updated_at': helpers.get_xml_attr(metadata_main, 'updatedAt'),
+                        'last_viewed_at': helpers.get_xml_attr(metadata_main, 'lastViewedAt'),
+                        'guid': helpers.get_xml_attr(metadata_main, 'guid'),
+                        'child_count': helpers.get_xml_attr(metadata_main, 'childCount'),
+                        'directors': directors,
+                        'writers': writers,
+                        'actors': actors,
+                        'genres': genres,
+                        'labels': labels,
+                        'full_title': helpers.get_xml_attr(metadata_main, 'title')
+                        }
+
        elif metadata_type == 'clip':
            metadata = {'media_type': metadata_type,
                        'section_id': section_id,
@@ -1034,6 +1022,7 @@ class PmsConnect(object):
                        'title': helpers.get_xml_attr(metadata_main, 'title'),
                        'parent_title': helpers.get_xml_attr(metadata_main, 'parentTitle'),
                        'grandparent_title': helpers.get_xml_attr(metadata_main, 'grandparentTitle'),
+                        'sort_title': helpers.get_xml_attr(metadata_main, 'titleSort'),
                        'media_index': helpers.get_xml_attr(metadata_main, 'index'),
                        'parent_media_index': helpers.get_xml_attr(metadata_main, 'parentIndex'),
                        'studio': helpers.get_xml_attr(metadata_main, 'studio'),
@@ -1310,6 +1299,7 @@ class PmsConnect(object):

        # Get the source media type
        media_type = helpers.get_xml_attr(session, 'type')
+        rating_key = helpers.get_xml_attr(session, 'ratingKey')

        # Get the user details
        user_info = session.getElementsByTagName('User')[0]
@@ -1336,7 +1326,7 @@ class PmsConnect(object):
                          'product_version': helpers.get_xml_attr(player_info, 'version'),
                          'profile': helpers.get_xml_attr(player_info, 'profile'),
                          'player': helpers.get_xml_attr(player_info, 'title') or helpers.get_xml_attr(player_info, 'product'),
-                          'machine_id': helpers.get_xml_attr(player_info, 'machineIdentifier').rstrip('_Video').rstrip('_Track'),
+                          'machine_id': helpers.get_xml_attr(player_info, 'machineIdentifier'),
                          'state': helpers.get_xml_attr(player_info, 'state'),
                          'local': helpers.get_xml_attr(player_info, 'local')
                          }
@@ -1417,16 +1407,29 @@ class PmsConnect(object):
            transcode_decision = 'direct play'
    
        # Determine if a synced version is being played
+        sync_id = None
        if media_type not in ('photo', 'clip') and not session.getElementsByTagName('Session') \
            and helpers.get_xml_attr(session, 'ratingKey').isdigit() and transcode_decision == 'direct play':
-            synced_version = 1
-        else:
-            synced_version = 0
+            plex_tv = plextv.PlexTV()
+            synced_items = plex_tv.get_synced_items(client_id_filter=player_details['machine_id'],
+                                                    rating_key_filter=rating_key)
+            if synced_items:
+                sync_id = synced_items[0]['sync_id']
+                synced_xml = self.get_sync_item(sync_id=sync_id, output_format='xml')
+                synced_xml_head = synced_xml.getElementsByTagName('MediaContainer')
+                if synced_xml_head[0].getElementsByTagName('Track'):
+                    synced_session_data = synced_xml_head[0].getElementsByTagName('Track')[0]
+                elif synced_xml_head[0].getElementsByTagName('Video'):
+                    synced_session_data = synced_xml_head[0].getElementsByTagName('Video')[0]

        # Figure out which version is being played
-        media_info_all = session.getElementsByTagName('Media')
+        if sync_id:
+            media_info_all = synced_session_data.getElementsByTagName('Media')
+        else:
+            media_info_all = session.getElementsByTagName('Media')
        stream_media_info = next((m for m in media_info_all if helpers.get_xml_attr(m, 'selected') == '1'), media_info_all[0])
-        stream_media_parts_info = stream_media_info.getElementsByTagName('Part')[0]
+        part_info_all = stream_media_info.getElementsByTagName('Part')
+        stream_media_parts_info = next((p for p in part_info_all if helpers.get_xml_attr(p, 'selected') == '1'), part_info_all[0])

        # Get the stream details
        video_stream_info = audio_stream_info = subtitle_stream_info = None
@@ -1483,6 +1486,7 @@ class PmsConnect(object):

        if subtitle_stream_info:
            subtitle_id = helpers.get_xml_attr(subtitle_stream_info, 'id')
+            subtitle_selected = helpers.get_xml_attr(subtitle_stream_info, 'selected')
            subtitle_details = {'stream_subtitle_codec': helpers.get_xml_attr(subtitle_stream_info, 'codec'),
                                'stream_subtitle_container': helpers.get_xml_attr(subtitle_stream_info, 'container'),
                                'stream_subtitle_format': helpers.get_xml_attr(subtitle_stream_info, 'format'),
@@ -1532,14 +1536,14 @@ class PmsConnect(object):
                          'stream_video_height': helpers.get_xml_attr(stream_media_info, 'height'),
                          'stream_video_width': helpers.get_xml_attr(stream_media_info, 'width'),
                          'stream_duration': helpers.get_xml_attr(stream_media_info, 'duration') or helpers.get_xml_attr(session, 'duration'),
-                          'stream_container_decision': helpers.get_xml_attr(stream_media_parts_info, 'decision').replace('directplay', 'direct play'),
+                          'stream_container_decision': 'direct play' if sync_id else helpers.get_xml_attr(stream_media_parts_info, 'decision').replace('directplay', 'direct play'),
                          'transcode_decision': transcode_decision,
                          'optimized_version': 1 if helpers.get_xml_attr(stream_media_info, 'proxyType') == '42' else 0,
-                          'optimized_version_profile': helpers.get_xml_attr(stream_media_info, 'title'),
-                          'synced_version': synced_version,
+                          'optimized_version_title': helpers.get_xml_attr(stream_media_info, 'title'),
+                          'synced_version': 1 if sync_id else 0,
                          'indexes': 1 if indexes == 'sd' else 0,
                          'bif_thumb': bif_thumb,
-                          'subtitles': 1 if subtitle_id else 0
+                          'subtitles': 1 if subtitle_id and subtitle_selected else 0
                          }

        # Get the source media info
@@ -1560,6 +1564,7 @@ class PmsConnect(object):
                                'title': helpers.get_xml_attr(session, 'title'),
                                'parent_title': helpers.get_xml_attr(session, 'parentTitle'),
                                'grandparent_title': helpers.get_xml_attr(session, 'grandparentTitle'),
+                                'sort_title': helpers.get_xml_attr(session, 'titleSort'),
                                'media_index': helpers.get_xml_attr(session, 'index'),
                                'parent_media_index': helpers.get_xml_attr(session, 'parentIndex'),
                                'studio': helpers.get_xml_attr(session, 'studio'),
@@ -1604,7 +1609,10 @@ class PmsConnect(object):
            media_id = helpers.get_xml_attr(stream_media_info, 'id')
            part_id = helpers.get_xml_attr(stream_media_parts_info, 'id')

-            metadata_details = self.get_metadata_details(rating_key=helpers.get_xml_attr(session, 'ratingKey'))
+            if sync_id:
+                metadata_details = self.get_metadata_details(sync_id=sync_id)
+            else:
+                metadata_details = self.get_metadata_details(rating_key=rating_key)

            # Get the media info, fallback to first item if match id is not found
            source_medias = metadata_details.pop('media_info', [])
@@ -1669,7 +1677,22 @@ class PmsConnect(object):
                quality_profile = common.VIDEO_QUALITY_PROFILES[quailtiy_bitrate]
            except ValueError:
                quality_profile = 'Original'
-            
+
+            if sync_id:
+                try:
+                    synced_bitrate = min(b for b in common.VIDEO_QUALITY_PROFILES if source_bitrate <= b)
+                    synced_version_profile = common.VIDEO_QUALITY_PROFILES[synced_bitrate]
+                except ValueError:
+                    synced_version_profile = 'Original'
+            else:
+                synced_version_profile = ''
+
+            if stream_details['optimized_version']:
+                optimized_version_profile = '{} Mbps {}'.format(round(source_bitrate / 1000.0, 1),
+                    plexpy.common.VIDEO_RESOLUTION_OVERRIDES.get(source_media_details['video_resolution'], source_media_details['video_resolution']))
+            else:
+                optimized_version_profile = ''
+
        elif media_type == 'track' and 'stream_bitrate' in stream_details:
            stream_bitrate = helpers.cast_to_int(stream_details['stream_bitrate'])
            source_bitrate = helpers.cast_to_int(source_media_details.get('bitrate'))
@@ -1680,11 +1703,26 @@ class PmsConnect(object):
            except ValueError:
                quality_profile = 'Original'

+            if sync_id:
+                try:
+                    synced_bitrate = min(b for b in common.AUDIO_QUALITY_PROFILES if source_bitrate <= b)
+                    synced_version_profile = common.AUDIO_QUALITY_PROFILES[synced_bitrate]
+                except ValueError:
+                    synced_version_profile = 'Original'
+            else:
+                synced_version_profile = ''
+
+            optimized_version_profile = ''
+
        elif media_type == 'photo':
            quality_profile = 'Original'
+            synced_version_profile = ''
+            optimized_version_profile = ''

        else:
            quality_profile = 'Unknown'
+            synced_version_profile = ''
+            optimized_version_profile = ''

        # Entire session output (single dict for backwards compatibility)
        session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'),
@@ -1692,6 +1730,8 @@ class PmsConnect(object):
                          'view_offset': view_offset,
                          'progress_percent': str(helpers.get_percent(view_offset, stream_details['stream_duration'])),
                          'quality_profile': quality_profile,
+                          'synced_version_profile': synced_version_profile,
+                          'optimized_version_profile': optimized_version_profile,
                          'user': user_details['username'],  # Keep for backwards compatibility
                          'channel_stream': channel_stream
                          }
@@ -1727,7 +1767,6 @@ class PmsConnect(object):
        else:
            return False

-
    def get_item_children(self, rating_key=''):
        """
        Return processed and validated children list.
@@ -1768,8 +1807,11 @@ class PmsConnect(object):
                for result in result_data:
                    children_output = {'section_id': section_id,
                                       'rating_key': helpers.get_xml_attr(result, 'ratingKey'),
+                                       'parent_rating_key': helpers.get_xml_attr(result, 'parentRatingKey'),
                                       'media_index': helpers.get_xml_attr(result, 'index'),
                                       'title': helpers.get_xml_attr(result, 'title'),
+                                       'parent_title': helpers.get_xml_attr(result, 'parentTitle'),
+                                       'year': helpers.get_xml_attr(result, 'year'),
                                       'thumb': helpers.get_xml_attr(result, 'thumb'),
                                       'parent_thumb': helpers.get_xml_attr(a, 'thumb'),
                                       'duration': helpers.get_xml_attr(result, 'duration')
@@ -1784,6 +1826,72 @@ class PmsConnect(object):

        return output

+    def get_item_children_related(self, rating_key=''):
+        """
+        Return processed and validated children list.
+
+        Output: array
+        """
+        children_data = self.get_children_list_related(rating_key, output_format='xml')
+
+        try:
+            xml_head = children_data.getElementsByTagName('MediaContainer')
+        except Exception as e:
+            logger.warn(u"Tautulli Pmsconnect :: Unable to parse XML for get_item_children_related: %s." % e)
+            return []
+
+        children_results_list = {'movie': [],
+                                 'show': [],
+                                 'season': [],
+                                 'episode': [],
+                                 'artist': [],
+                                 'album': [],
+                                 'track': [],
+                                 }
+
+        for a in xml_head:
+            section_id = helpers.get_xml_attr(a, 'librarySectionID')
+            hubs = a.getElementsByTagName('Hub')
+
+            for h in hubs:
+                size = helpers.get_xml_attr(h, 'size')
+                media_type = helpers.get_xml_attr(h, 'type')
+                title = helpers.get_xml_attr(h, 'title')
+                hub_identifier = helpers.get_xml_attr(h, 'hubIdentifier')
+
+                if size == '0' or not hub_identifier.startswith('collection.related') or \
+                        media_type not in children_results_list.keys():
+                    continue
+
+                result_data = []
+
+                if h.getElementsByTagName('Video'):
+                    result_data = h.getElementsByTagName('Video')
+                if h.getElementsByTagName('Directory'):
+                    result_data = h.getElementsByTagName('Directory')
+                if h.getElementsByTagName('Track'):
+                    result_data = h.getElementsByTagName('Track')
+
+                for result in result_data:
+                    children_output = {'section_id': section_id,
+                                       'rating_key': helpers.get_xml_attr(result, 'ratingKey'),
+                                       'parent_rating_key': helpers.get_xml_attr(result, 'parentRatingKey'),
+                                       'media_index': helpers.get_xml_attr(result, 'index'),
+                                       'title': helpers.get_xml_attr(result, 'title'),
+                                       'parent_title': helpers.get_xml_attr(result, 'parentTitle'),
+                                       'year': helpers.get_xml_attr(result, 'year'),
+                                       'thumb': helpers.get_xml_attr(result, 'thumb'),
+                                       'parent_thumb': helpers.get_xml_attr(a, 'thumb'),
+                                       'duration': helpers.get_xml_attr(result, 'duration')
+                                      }
+                    children_results_list[media_type].append(children_output)
+
+            output = {'results_count': sum(len(s) for s in children_results_list.items()),
+                      'results_list': children_results_list,
+                      }
+
+            return output
+
    def get_servers_info(self):
        """
        Return the list of local servers.
@@ -1986,16 +2094,17 @@ class PmsConnect(object):
                             'media_type': helpers.get_xml_attr(item, 'type'),
                             'rating_key': helpers.get_xml_attr(item, 'ratingKey'),
                             'parent_rating_key': helpers.get_xml_attr(item, 'parentRatingKey'),
-                             'grandparent_rating_key': helpers.get_xml_attr(a, 'grandparentRatingKey'),
+                             'grandparent_rating_key': helpers.get_xml_attr(item, 'grandparentRatingKey'),
                             'title': helpers.get_xml_attr(item, 'title'),
-                             'parent_title': helpers.get_xml_attr(a, 'parentTitle'),
-                             'grandparent_title': helpers.get_xml_attr(a, 'grandparentTitle'),
+                             'parent_title': helpers.get_xml_attr(item, 'parentTitle'),
+                             'grandparent_title': helpers.get_xml_attr(item, 'grandparentTitle'),
+                             'sort_title': helpers.get_xml_attr(item, 'titleSort'),
                             'media_index': helpers.get_xml_attr(item, 'index'),
-                             'parent_media_index': helpers.get_xml_attr(a, 'parentIndex'),
+                             'parent_media_index': helpers.get_xml_attr(item, 'parentIndex'),
                             'year': helpers.get_xml_attr(item, 'year'),
                             'thumb': helpers.get_xml_attr(item, 'thumb'),
-                             'parent_thumb': helpers.get_xml_attr(a, 'thumb'),
-                             'grandparent_thumb': helpers.get_xml_attr(a, 'grandparentThumb'),
+                             'parent_thumb': helpers.get_xml_attr(item, 'thumb'),
+                             'grandparent_thumb': helpers.get_xml_attr(item, 'grandparentThumb'),
                             'added_at': helpers.get_xml_attr(item, 'addedAt')
                             }

@@ -2136,7 +2245,6 @@ class PmsConnect(object):

            uri = '/photo/:/transcode?%s' % urllib.urlencode(params)
            result = self.request_handler.make_request(uri=uri,
-                                                       proto=self.protocol,
                                                       request_type='GET',
                                                       return_type=True)

@@ -2168,7 +2276,8 @@ class PmsConnect(object):
                               'episode': [],
                               'artist': [],
                               'album': [],
-                               'track': []
+                               'track': [],
+                               'collection': []
                               }

        for a in xml_head:
--- a/plexpy/users.py
+++ b/plexpy/users.py
@@ -23,9 +23,67 @@ import datatables
 import helpers
 import logger
 import plextv
+import pmsconnect
 import session


+def refresh_users():
+    logger.info(u"Tautulli Users :: Requesting users list refresh...")
+    result = plextv.PlexTV().get_full_users_list()
+
+    monitor_db = database.MonitorDatabase()
+    user_data = Users()
+
+    if result:
+        for item in result:
+
+            shared_libraries = ''
+            user_tokens = user_data.get_tokens(user_id=item['user_id'])
+            if user_tokens and user_tokens['server_token']:
+                pms_connect = pmsconnect.PmsConnect(token=user_tokens['server_token'])
+                library_details = pms_connect.get_server_children()
+
+                if library_details:
+                    shared_libraries = ';'.join(d['section_id'] for d in library_details['libraries_list'])
+                else:
+                    shared_libraries = ''
+
+            control_value_dict = {"user_id": item['user_id']}
+            new_value_dict = {"username": item['username'],
+                              "thumb": item['thumb'],
+                              "email": item['email'],
+                              "is_home_user": item['is_home_user'],
+                              "is_allow_sync": item['is_allow_sync'],
+                              "is_restricted": item['is_restricted'],
+                              "shared_libraries": shared_libraries,
+                              "filter_all": item['filter_all'],
+                              "filter_movies": item['filter_movies'],
+                              "filter_tv": item['filter_tv'],
+                              "filter_music": item['filter_music'],
+                              "filter_photos": item['filter_photos']
+                              }
+
+            # Check if we've set a custom avatar if so don't overwrite it.
+            if item['user_id']:
+                avatar_urls = monitor_db.select('SELECT thumb, custom_avatar_url '
+                                                'FROM users WHERE user_id = ?',
+                                                [item['user_id']])
+                if avatar_urls:
+                    if not avatar_urls[0]['custom_avatar_url'] or \
+                            avatar_urls[0]['custom_avatar_url'] == avatar_urls[0]['thumb']:
+                        new_value_dict['custom_avatar_url'] = item['thumb']
+                else:
+                    new_value_dict['custom_avatar_url'] = item['thumb']
+
+            monitor_db.upsert('users', new_value_dict, control_value_dict)
+
+        logger.info(u"Tautulli Users :: Users list refreshed.")
+        return True
+    else:
+        logger.warn(u"Tautulli Users :: Unable to refresh users list.")
+        return False
+
+
 class Users(object):

    def __init__(self):
@@ -360,7 +418,7 @@ class Users(object):
            logger.warn(u"Tautulli Users :: Unable to retrieve user %s from database. Requesting user list refresh."
                        % user_id if user_id else user)
            # Let's first refresh the user list to make sure the user isn't newly added and not in the db yet
-            plextv.refresh_users()
+            refresh_users()

            user_details = get_user_details(user_id=user_id, user=user)

--- a/plexpy/version.py
+++ b/plexpy/version.py
@@ -1,2 +1,2 @@
 PLEXPY_BRANCH = "beta"
-PLEXPY_RELEASE_VERSION = "v2.0.1-beta"
+PLEXPY_RELEASE_VERSION = "v2.0.5-beta"
--- a/plexpy/versioncheck.py
+++ b/plexpy/versioncheck.py
@@ -175,10 +175,20 @@ def checkGithub(auto_update=False):
    if plexpy.COMMITS_BEHIND > 0:
        logger.info('New version is available. You are %s commits behind' % plexpy.COMMITS_BEHIND)

-        url = 'https://api.github.com/repos/%s/plexpy/releases/latest' % plexpy.CONFIG.GIT_USER
-        release = request.request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == dict)
+        url = 'https://api.github.com/repos/%s/plexpy/releases' % plexpy.CONFIG.GIT_USER
+        releases = request.request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == list)
+
+        if plexpy.CONFIG.GIT_BRANCH == 'master':
+            release = next((r for r in releases if not r['prerelease']), releases[0])
+        elif plexpy.CONFIG.GIT_BRANCH == 'beta':
+            release = next((r for r in releases if r['prerelease'] and '-beta' in r['tag_name']), releases[0])
+        elif plexpy.CONFIG.GIT_BRANCH == 'nightly':
+            release = next((r for r in releases if r['prerelease'] and '-nightly' in r['tag_name']), releases[0])
+        else:
+            release = releases[0]
+
        plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpyupdate', 'plexpy_download_info': release,
-                                    'plexpy_update_commit': plexpy.LATEST_VERSION, 'plexpy_update_behind': plexpy.COMMITS_BEHIND})
+                                 'plexpy_update_commit': plexpy.LATEST_VERSION, 'plexpy_update_behind': plexpy.COMMITS_BEHIND})

        if auto_update:
            logger.info('Running automatic update.')
--- a/plexpy/web_socket.py
+++ b/plexpy/web_socket.py
@@ -42,6 +42,7 @@ def start_thread():

 def on_disconnect():
    activity_processor.ActivityProcessor().set_temp_stopped()
+    plexpy.initialize_scheduler()


 def reconnect():
@@ -148,9 +149,8 @@ def run():
            logger.info(u"Tautulli WebSocket :: Unable to get an internal response from the server, Plex server is down.")
            plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_intdown'})
            plexpy.PLEX_SERVER_UP = False
-            on_disconnect()

-        plexpy.initialize_scheduler()
+        on_disconnect()

    logger.debug(u"Tautulli WebSocket :: Leaving thread.")

--- a/plexpy/webauth.py
+++ b/plexpy/webauth.py
@@ -27,9 +27,8 @@ from hashing_passwords import check_hash

 import plexpy
 import logger
-import plextv
 from plexpy.database import MonitorDatabase
-from plexpy.users import Users
+from plexpy.users import Users, refresh_users
 from plexpy.plextv import PlexTV


@@ -72,7 +71,7 @@ def user_login(username=None, password=None):

                if result:
                    # Refresh the users list to make sure we have all the correct permissions.
-                    plextv.refresh_users()
+                    refresh_users()
                    # Successful login
                    return True
                else:
@@ -244,7 +243,6 @@ class AuthController(object):

            expiry = datetime.now() + (timedelta(days=30) if remember_me == '1' else timedelta(minutes=60))

-            cherrypy.session.regenerate()
            cherrypy.request.login = username
            cherrypy.session[SESSION_KEY] = {'user_id': user_id,
                                             'user': username,
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -16,10 +16,8 @@
 import hashlib
 import json
 import os
-import random
 import shutil
 import threading
-import uuid

 import cherrypy
 from cherrypy.lib.static import serve_file, serve_download
@@ -98,9 +96,6 @@ class WebInterface(object):
    @requireAuth(member_of("admin"))
    def welcome(self, **kwargs):
        config = {
-            "launch_browser": checked(plexpy.CONFIG.LAUNCH_BROWSER),
-            "refresh_users_on_startup": checked(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP),
-            "refresh_libraries_on_startup": checked(plexpy.CONFIG.REFRESH_LIBRARIES_ON_STARTUP),
            "pms_identifier": plexpy.CONFIG.PMS_IDENTIFIER,
            "pms_ip": plexpy.CONFIG.PMS_IP,
            "pms_is_remote": checked(plexpy.CONFIG.PMS_IS_REMOTE),
@@ -108,16 +103,7 @@ class WebInterface(object):
            "pms_token": plexpy.CONFIG.PMS_TOKEN,
            "pms_ssl": checked(plexpy.CONFIG.PMS_SSL),
            "pms_uuid": plexpy.CONFIG.PMS_UUID,
-            "movie_notify_enable": checked(plexpy.CONFIG.MOVIE_NOTIFY_ENABLE),
-            "tv_notify_enable": checked(plexpy.CONFIG.TV_NOTIFY_ENABLE),
-            "music_notify_enable": checked(plexpy.CONFIG.MUSIC_NOTIFY_ENABLE),
-            "movie_logging_enable": checked(plexpy.CONFIG.MOVIE_LOGGING_ENABLE),
-            "tv_logging_enable": checked(plexpy.CONFIG.TV_LOGGING_ENABLE),
-            "music_logging_enable": checked(plexpy.CONFIG.MUSIC_LOGGING_ENABLE),
-            "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL,
-            "check_github": checked(plexpy.CONFIG.CHECK_GITHUB),
-            "log_blacklist": checked(plexpy.CONFIG.LOG_BLACKLIST),
-            "cache_images": checked(plexpy.CONFIG.CACHE_IMAGES)
+            "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL
        }

        # The setup wizard just refreshes the page on submit so we must redirect to home if config set.
@@ -131,7 +117,7 @@ class WebInterface(object):
    @cherrypy.tools.json_out()
    @requireAuth(member_of("admin"))
    @addtoapi("get_server_list")
-    def discover(self, token=None, include_cloud=True, **kwargs):
+    def discover(self, token=None, include_cloud=True, all_servers=False, **kwargs):
        """ Get all your servers that are published to Plex.tv.

            ```
@@ -162,12 +148,14 @@ class WebInterface(object):
            plexpy.CONFIG.write()

        include_cloud = not (include_cloud == 'false')
+        all_servers = all_servers == 'true'

        plex_tv = plextv.PlexTV()
-        servers = plex_tv.discover(include_cloud=include_cloud)
+        servers_list = plex_tv.discover(include_cloud=include_cloud,
+                                        all_servers=all_servers)

-        if servers:
-            return servers
+        if servers_list:
+            return servers_list


    ##### Home #####
@@ -182,7 +170,7 @@ class WebInterface(object):
            "home_stats_count": plexpy.CONFIG.HOME_STATS_COUNT,
            "home_stats_recently_added_count": plexpy.CONFIG.HOME_STATS_RECENTLY_ADDED_COUNT,
            "pms_name": plexpy.CONFIG.PMS_NAME,
-            "pms_use_bif": plexpy.CONFIG.PMS_USE_BIF,
+            "pms_is_cloud": plexpy.CONFIG.PMS_IS_CLOUD,
            "update_show_changelog": plexpy.CONFIG.UPDATE_SHOW_CHANGELOG
        }
        return serve_template(templatename="index.html", title="Home", config=config)
@@ -226,18 +214,8 @@ class WebInterface(object):
    @requireAuth()
    def get_current_activity(self, **kwargs):

-        try:
-            pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN)
-            result = pms_connect.get_current_activity()
-
-            data_factory = datafactory.DataFactory()
-            for session in result['sessions']:
-                if not session['ip_address']:
-                    ip_address = data_factory.get_session_ip(session['session_key'])
-                    session['ip_address'] = ip_address
-
-        except:
-            return serve_template(templatename="current_activity.html", data=None)
+        pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN)
+        result = pms_connect.get_current_activity()

        if result:
            return serve_template(templatename="current_activity.html", data=result)
@@ -247,45 +225,16 @@ class WebInterface(object):

    @cherrypy.expose
    @requireAuth()
-    def get_current_activity_instance(self, **kwargs):
+    def get_current_activity_instance(self, session_key=None, **kwargs):

-        return serve_template(templatename="current_activity_instance.html", session=kwargs)
-
-    @cherrypy.expose
-    @requireAuth()
-    def get_current_activity_header(self, **kwargs):
-
-        try:
-            pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN)
-            result = pms_connect.get_current_activity()
-        except:
-            return serve_template(templatename="current_activity_header.html", data=None)
+        pms_connect = pmsconnect.PmsConnect(token=plexpy.CONFIG.PMS_TOKEN)
+        result = pms_connect.get_current_activity()

        if result:
-            data = {'stream_count': result['stream_count'],
-                    'direct_play': 0,
-                    'direct_stream': 0,
-                    'transcode': 0}
-            for s in result['sessions']:
-                if s['media_type'] == 'track':
-                    if s['audio_decision'] == 'transcode':
-                        data['transcode'] += 1
-                    elif s['audio_decision'] == 'copy':
-                        data['direct_stream'] += 1
-                    else:
-                        data['direct_play'] += 1
-                else:
-                    if s['video_decision'] == 'transcode' or s['audio_decision'] == 'transcode':
-                        data['transcode'] += 1
-                    elif s['video_decision'] == 'copy' or s['audio_decision'] == 'copy':
-                        data['direct_stream'] += 1
-                    else:
-                        data['direct_play'] += 1
-
-            return serve_template(templatename="current_activity_header.html", data=data)
+            session = next((s for s in result['sessions'] if s['session_key'] == session_key), None)
+            return serve_template(templatename="current_activity_instance.html", session=session)
        else:
-            logger.warn(u"Unable to retrieve data for get_current_activity_header.")
-            return serve_template(templatename="current_activity_header.html", data=None)
+            return serve_template(templatename="current_activity_instance.html", session=None)

    @cherrypy.expose
    @cherrypy.tools.json_out()
@@ -314,6 +263,12 @@ class WebInterface(object):
        else:
            return {'result': 'error', 'message': 'Failed to terminate session.'}

+    @cherrypy.expose
+    @cherrypy.tools.json_out()
+    @requireAuth(member_of("admin"))
+    def return_sessions_url(self, **kwargs):
+        return plexpy.CONFIG.PMS_URL + '/status/sessions?X-Plex-Token=' + plexpy.CONFIG.PMS_TOKEN
+
    @cherrypy.expose
    @requireAuth()
    def home_stats(self, time_range=30, stats_type=0, stats_count=10, **kwargs):
@@ -389,11 +344,7 @@ class WebInterface(object):
    @cherrypy.expose
    @requireAuth()
    def libraries(self, **kwargs):
-        config = {
-            "update_section_ids": plexpy.CONFIG.UPDATE_SECTION_IDS
-        }
-
-        return serve_template(templatename="libraries.html", title="Libraries", config=config)
+        return serve_template(templatename="libraries.html", title="Libraries")

    @cherrypy.expose
    @cherrypy.tools.json_out()
@@ -508,7 +459,7 @@ class WebInterface(object):
    @requireAuth(member_of("admin"))
    def refresh_libraries_list(self, **kwargs):
        """ Refresh the libraries list on it's own thread. """
-        threading.Thread(target=pmsconnect.refresh_libraries).start()
+        threading.Thread(target=libraries.refresh_libraries).start()
        logger.info(u"Manual libraries list refresh requested.")
        return True

@@ -721,9 +672,13 @@ class WebInterface(object):
        # Check if datatables json_data was received.
        # If not, then build the minimal amount of json data for a query
        if not kwargs.get('json_data'):
+            # Alias 'title' to 'sort_title'
+            if kwargs.get('order_column') == 'title':
+                kwargs['order_column'] == 'sort_title'
+                
            # TODO: Find some one way to automatically get the columns
            dt_columns = [("added_at", True, False),
-                          ("title", True, True),
+                          ("sort_title", True, True),
                          ("container", True, True),
                          ("bitrate", True, True),
                          ("video_codec", True, True),
@@ -734,7 +689,7 @@ class WebInterface(object):
                          ("file_size", True, False),
                          ("last_played", True, False),
                          ("play_count", True, False)]
-            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "title")
+            kwargs['json_data'] = build_datatables_json(kwargs, dt_columns, "sort_title")

        if refresh == 'true':
            refresh = True
@@ -995,19 +950,6 @@ class WebInterface(object):
        else:
            return {'message': 'no data received'}

-    @cherrypy.expose
-    @requireAuth(member_of("admin"))
-    def update_section_ids(self, **kwargs):
-
-        logger.debug(u"Manual database section_id update called.")
-
-        result = libraries.update_section_ids()
-
-        if result:
-            return "Updated all section_id's in database."
-        else:
-            return "Unable to update section_id's in database. See logs for details."
-
    @cherrypy.expose
    @cherrypy.tools.json_out()
    @requireAuth(member_of("admin"))
@@ -1139,7 +1081,7 @@ class WebInterface(object):
    @requireAuth(member_of("admin"))
    def refresh_users_list(self, **kwargs):
        """ Refresh the users list on it's own thread. """
-        threading.Thread(target=plextv.refresh_users).start()
+        threading.Thread(target=users.refresh_users).start()
        logger.info(u"Manual users list refresh requested.")
        return True

@@ -2264,7 +2206,7 @@ class WebInterface(object):
            machine_id = plexpy.CONFIG.PMS_IDENTIFIER

        plex_tv = plextv.PlexTV()
-        result = plex_tv.get_synced_items(machine_id=machine_id, user_id=user_id)
+        result = plex_tv.get_synced_items(machine_id=machine_id, user_id_filter=user_id)

        if result:
            output = {"data": result}
@@ -2595,6 +2537,7 @@ class WebInterface(object):
            "http_port": plexpy.CONFIG.HTTP_PORT,
            "http_password": http_password,
            "http_root": plexpy.CONFIG.HTTP_ROOT,
+            "http_proxy": checked(plexpy.CONFIG.HTTP_PROXY),
            "launch_browser": checked(plexpy.CONFIG.LAUNCH_BROWSER),
            "enable_https": checked(plexpy.CONFIG.ENABLE_HTTPS),
            "https_create_cert": checked(plexpy.CONFIG.HTTPS_CREATE_CERT),
@@ -2623,8 +2566,9 @@ class WebInterface(object):
            "pms_port": plexpy.CONFIG.PMS_PORT,
            "pms_token": plexpy.CONFIG.PMS_TOKEN,
            "pms_ssl": checked(plexpy.CONFIG.PMS_SSL),
+            "pms_is_remote": checked(plexpy.CONFIG.PMS_IS_REMOTE),
+            "pms_is_cloud": plexpy.CONFIG.PMS_IS_CLOUD,
            "pms_url_manual": checked(plexpy.CONFIG.PMS_URL_MANUAL),
-            "pms_use_bif": checked(plexpy.CONFIG.PMS_USE_BIF),
            "pms_uuid": plexpy.CONFIG.PMS_UUID,
            "pms_web_url": plexpy.CONFIG.PMS_WEB_URL,
            "date_format": plexpy.CONFIG.DATE_FORMAT,
@@ -2641,7 +2585,6 @@ class WebInterface(object):
            "refresh_users_interval": plexpy.CONFIG.REFRESH_USERS_INTERVAL,
            "refresh_users_on_startup": checked(plexpy.CONFIG.REFRESH_USERS_ON_STARTUP),
            "logging_ignore_interval": plexpy.CONFIG.LOGGING_IGNORE_INTERVAL,
-            "pms_is_remote": checked(plexpy.CONFIG.PMS_IS_REMOTE),
            "notify_consecutive": checked(plexpy.CONFIG.NOTIFY_CONSECUTIVE),
            "notify_upload_posters": checked(plexpy.CONFIG.NOTIFY_UPLOAD_POSTERS),
            "notify_recently_added_upgrade": checked(plexpy.CONFIG.NOTIFY_RECENTLY_ADDED_UPGRADE),
@@ -2682,12 +2625,12 @@ class WebInterface(object):
        checked_configs = [
            "launch_browser", "enable_https", "https_create_cert", "api_enabled", "freeze_db", "check_github",
            "grouping_global_history", "grouping_user_history", "grouping_charts", "group_history_tables",
-            "pms_use_bif", "pms_ssl", "pms_is_remote", "pms_url_manual", "home_stats_type", "week_start_monday",
+            "pms_ssl", "pms_is_remote", "pms_url_manual", "week_start_monday",
            "refresh_libraries_on_startup", "refresh_users_on_startup",
            "notify_consecutive", "notify_upload_posters", "notify_recently_added_upgrade",
            "notify_group_recently_added_grandparent", "notify_group_recently_added_parent",
            "monitor_pms_updates", "monitor_remote_access", "get_file_sizes", "log_blacklist", "http_hash_password",
-            "allow_guest_access", "cache_images", "http_basic_auth", "notify_concurrent_by_ip",
+            "allow_guest_access", "cache_images", "http_proxy", "http_basic_auth", "notify_concurrent_by_ip",
            "history_table_activity", "plexpy_auto_update",
            "themoviedb_lookup", "tvmaze_lookup"
        ]
@@ -2798,8 +2741,7 @@ class WebInterface(object):

        # Get new server URLs for SSL communications and get new server friendly name
        if server_changed:
-            plextv.get_real_pms_url()
-            pmsconnect.get_server_friendly_name()
+            plextv.get_server_resources()
            web_socket.reconnect()

        # If first run, start websocket
@@ -2816,11 +2758,11 @@ class WebInterface(object):

        # Refresh users table if our server IP changes.
        if refresh_libraries:
-            threading.Thread(target=pmsconnect.refresh_libraries).start()
+            threading.Thread(target=libraries.refresh_libraries).start()

        # Refresh users table if our server IP changes.
        if refresh_users:
-            threading.Thread(target=plextv.refresh_users).start()
+            threading.Thread(target=users.refresh_users).start()

        return {'result': 'success', 'message': 'Settings saved.'}

@@ -3490,16 +3432,15 @@ class WebInterface(object):
            # Fallback to checking /identity endpoint is server is unpublished
            # Cannot set SSL settings on the PMS if unpublished so 'http' is okay
            if not identifier:
-                request_handler = http_handler.HTTPHandler(host=hostname,
-                                                           port=port,
-                                                           token=None)
+                scheme = 'https' if ssl else 'http'
+                url = '{scheme}://{hostname}:{port}'.format(scheme=scheme, hostname=hostname, port=port)
                uri = '/identity'
+
+                request_handler = http_handler.HTTPHandler(urls=url,
+                                                           ssl_verify=False)
                request = request_handler.make_request(uri=uri,
-                                                       proto='http',
                                                       request_type='GET',
-                                                       output_format='xml',
-                                                       no_token=True,
-                                                       timeout=10)
+                                                       output_format='xml')
                if request:
                    xml_head = request.getElementsByTagName('MediaContainer')[0]
                    identifier = xml_head.getAttribute('machineIdentifier')
@@ -3539,7 +3480,7 @@ class WebInterface(object):
    def generate_api_key(self, device=None, **kwargs):
        apikey = ''
        while not apikey or apikey == plexpy.CONFIG.API_KEY or mobile_app.get_mobile_device_by_token(device_token=apikey):
-            apikey = uuid.uuid4().hex
+            apikey = plexpy.generate_uuid()

        logger.info(u"New API key generated.")
        logger._BLACKLIST_WORDS.add(apikey)
@@ -3653,7 +3594,7 @@ class WebInterface(object):
    def get_item_children(self, rating_key='', **kwargs):

        pms_connect = pmsconnect.PmsConnect()
-        result = pms_connect.get_item_children(rating_key)
+        result = pms_connect.get_item_children(rating_key=rating_key)

        if result:
            return serve_template(templatename="info_children_list.html", data=result, title="Children List")
@@ -3661,6 +3602,18 @@ class WebInterface(object):
            logger.warn(u"Unable to retrieve data for get_item_children.")
            return serve_template(templatename="info_children_list.html", data=None, title="Children List")

+    @cherrypy.expose
+    @requireAuth()
+    def get_item_children_related(self, rating_key='', title='', **kwargs):
+
+        pms_connect = pmsconnect.PmsConnect()
+        result = pms_connect.get_item_children_related(rating_key=rating_key)
+
+        if result:
+            return serve_template(templatename="info_collection_list.html", data=result, title=title)
+        else:
+            return serve_template(templatename="info_collection_list.html", data=None, title=title)
+
    @cherrypy.expose
    @cherrypy.tools.json_out()
    @requireAuth()
@@ -4481,19 +4434,14 @@ class WebInterface(object):
            result = pms_connect.get_current_activity()

            if result:
-                data_factory = datafactory.DataFactory()
-                for session in result['sessions']:
-                    if not session['ip_address']:
-                        ip_address = data_factory.get_session_ip(session['session_key'])
-                        session['ip_address'] = ip_address
-
                if session_key:
                    return next((s for s in result['sessions'] if s['session_key'] == session_key), {})


                counts = {'stream_count_direct_play': 0,
-                        'stream_count_direct_stream': 0,
-                        'stream_count_transcode': 0}
+                          'stream_count_direct_stream': 0,
+                          'stream_count_transcode': 0,
+                          'total_bandwidth': 0}

                for s in result['sessions']:
                    if s['transcode_decision'] == 'transcode':
@@ -4503,6 +4451,8 @@ class WebInterface(object):
                    else:
                        counts['stream_count_direct_play'] += 1

+                    counts['total_bandwidth'] += helpers.cast_to_int(s['bandwidth'])
+
                result.update(counts)

                return result
@@ -4635,7 +4585,7 @@ class WebInterface(object):
            ```
        """
        plex_tv = plextv.PlexTV()
-        result = plex_tv.get_synced_items(machine_id=machine_id, user_id=user_id)
+        result = plex_tv.get_synced_items(machine_id=machine_id, user_id_filter=user_id)

        if result:
            return result
--- a/plexpy/webstart.py
+++ b/plexpy/webstart.py
@@ -69,14 +69,14 @@ def initialize(options):
    if options['http_password']:
        logger.info(u"Tautulli WebStart :: Web server authentication is enabled, username is '%s'", options['http_username'])
        if options['http_basic_auth']:
-            auth_enabled = session_enabled = False
+            session_enabled = auth_enabled = False
            basic_auth_enabled = True
        else:
-            options_dict['tools.sessions.on'] = auth_enabled = session_enabled = True
+            options_dict['tools.sessions.on'] = session_enabled = auth_enabled = True
            basic_auth_enabled = False
            cherrypy.tools.auth = cherrypy.Tool('before_handler', webauth.check_auth)
    else:
-        auth_enabled = session_enabled = basic_auth_enabled = False
+        session_enabled = auth_enabled = basic_auth_enabled = False

    if options['http_root'].strip('/'):
        plexpy.HTTP_ROOT = options['http_root'] = '/' + options['http_root'].strip('/') + '/'
@@ -93,9 +93,12 @@ def initialize(options):
            'tools.gzip.mime_types': ['text/html', 'text/plain', 'text/css',
                                      'text/javascript', 'application/json',
                                      'application/javascript'],
-            'tools.auth.on': auth_enabled,
            'tools.sessions.on': session_enabled,
+            'tools.session.name': 'tautulli_session_id-' + plexpy.CONFIG.PMS_UUID,
+            'tools.sessions.storage_type': 'file',
+            'tools.sessions.storage_path': plexpy.CONFIG.CACHE_DIR,
            'tools.sessions.timeout': 30 * 24 * 60,  # 30 days
+            'tools.auth.on': auth_enabled,
            'tools.auth_basic.on': basic_auth_enabled,
            'tools.auth_basic.realm': 'Tautulli web server',
            'tools.auth_basic.checkpassword': cherrypy.lib.auth_basic.checkpassword_dict({
@@ -112,8 +115,8 @@ def initialize(options):
            'tools.caching.delay': 0,
            'tools.expires.on': True,
            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.auth.on': False,
-            'tools.sessions.on': False
+            'tools.sessions.on': False,
+            'tools.auth.on': False
        },
        '/images': {
            'tools.staticdir.on': True,
@@ -123,8 +126,8 @@ def initialize(options):
            'tools.caching.delay': 0,
            'tools.expires.on': True,
            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.auth.on': False,
-            'tools.sessions.on': False
+            'tools.sessions.on': False,
+            'tools.auth.on': False
        },
        '/css': {
            'tools.staticdir.on': True,
@@ -134,8 +137,8 @@ def initialize(options):
            'tools.caching.delay': 0,
            'tools.expires.on': True,
            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.auth.on': False,
-            'tools.sessions.on': False
+            'tools.sessions.on': False,
+            'tools.auth.on': False
        },
        '/fonts': {
            'tools.staticdir.on': True,
@@ -145,8 +148,8 @@ def initialize(options):
            'tools.caching.delay': 0,
            'tools.expires.on': True,
            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.auth.on': False,
-            'tools.sessions.on': False
+            'tools.sessions.on': False,
+            'tools.auth.on': False
        },
        '/js': {
            'tools.staticdir.on': True,
@@ -156,30 +159,8 @@ def initialize(options):
            'tools.caching.delay': 0,
            'tools.expires.on': True,
            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.auth.on': False,
-            'tools.sessions.on': False
-        },
-        '/json': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': "interfaces/default/json",
-            'tools.caching.on': True,
-            'tools.caching.force': True,
-            'tools.caching.delay': 0,
-            'tools.expires.on': True,
-            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.auth.on': False,
-            'tools.sessions.on': False
-        },
-        '/xml': {
-            'tools.staticdir.on': True,
-            'tools.staticdir.dir': "interfaces/default/xml",
-            'tools.caching.on': True,
-            'tools.caching.force': True,
-            'tools.caching.delay': 0,
-            'tools.expires.on': True,
-            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.auth.on': False,
-            'tools.sessions.on': False
+            'tools.sessions.on': False,
+            'tools.auth.on': False
        },
        '/cache': {
            'tools.staticdir.on': True,
@@ -189,8 +170,8 @@ def initialize(options):
            'tools.caching.delay': 0,
            'tools.expires.on': True,
            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.auth.on': False,
-            'tools.sessions.on': False
+            'tools.sessions.on': False,
+            'tools.auth.on': False
        },
        #'/pms_image_proxy': {
        #    'tools.staticdir.on': True,
@@ -205,14 +186,14 @@ def initialize(options):
        #},
        '/favicon.ico': {
            'tools.staticfile.on': True,
-            'tools.staticfile.filename': os.path.abspath(os.path.join(plexpy.PROG_DIR, 'data/interfaces/default/images/favicon.ico')),
+            'tools.staticfile.filename': os.path.abspath(os.path.join(plexpy.PROG_DIR, 'data/interfaces/default/images/favicon/favicon.ico')),
            'tools.caching.on': True,
            'tools.caching.force': True,
            'tools.caching.delay': 0,
            'tools.expires.on': True,
            'tools.expires.secs': 60 * 60 * 24 * 30,  # 30 days
-            'tools.auth.on': False,
-            'tools.sessions.on': False
+            'tools.sessions.on': False,
+            'tools.auth.on': False
        }
    }
Author	SHA1	Message	Date
JonnyWong16	9d01335395	v2.0.5-beta	2017-12-31 17:52:53 -08:00
JonnyWong16	63814584e9	Add sortcut to /status/sessions	2017-12-31 17:37:07 -08:00
JonnyWong16	bf7e432c0c	Add total bandwidth to activity header	2017-12-31 17:13:38 -08:00
JonnyWong16	5a14c229a1	Fix IPv6 overflow on current activity cards	2017-12-31 17:12:49 -08:00
JonnyWong16	79581fb83e	Sanitize script output in logger	2017-12-31 14:41:32 -08:00
JonnyWong16	90c587e6e1	Unique session id name to not conflict with multiple installs	2017-12-31 14:33:21 -08:00
JonnyWong16	b2b728a3cc	Save cherrypy sessions to disk instead of ram	2017-12-31 14:29:57 -08:00
JonnyWong16	645ef86c75	Fix Join notifications not sending	2017-12-31 14:29:57 -08:00
JonnyWong16	450fda18f1	Merge pull request #1181 from felixbuenemann/fix-cherrypy-ssl-connection-type-deprecation Fix OpenSSL SSL.ConnectionType deprecation warning	2017-12-31 12:37:22 -07:00
Felix Bünemann	f6162a8df8	Fix OpenSSL SSL.ConnectionType deprecation warning This patches the vendored cherrypy lib to work around a deprecation warning in pyOpenSSL 17.1.0 and later by checking and using the SSL.Connection class if available and falling back to ConnectionType.	2017-12-31 14:30:15 +01:00
JonnyWong16	a8c5f48b60	Merge branch 'nightly' of https://github.com/JonnyWong16/plexpy into nightly	2017-12-30 23:22:02 -08:00
JonnyWong16	edc0b96167	Some sync data updates	2017-12-30 23:21:31 -08:00
JonnyWong16	9b4b3e0ecb	Add stopped state to history table activity	2017-12-30 17:27:59 -08:00
JonnyWong16	7bd2c00636	Fix presence in get_server_resources	2017-12-30 17:27:50 -08:00
JonnyWong16	15faccfa2f	Update server connection code	2017-12-30 17:27:39 -08:00
JonnyWong16	11e10e7d0e	Update resources links	2017-12-30 16:13:55 -08:00
JonnyWong16	8ef48fc548	Update svg logo with shadows	2017-12-30 14:14:47 -08:00
JonnyWong16	29632b0805	Validate git releases as a list	2017-12-29 16:49:55 -08:00
JonnyWong16	e908c45cf2	v2.0.4-beta	2017-12-29 16:35:24 -08:00
JonnyWong16	c37e934f42	Check concurrent streams from the server instead of database	2017-12-29 16:29:20 -08:00
JonnyWong16	41f91956b8	Make sure current activity is loaded before refreshing	2017-12-29 16:26:50 -08:00
JonnyWong16	8b2bd5ce79	Add collections info pages	2017-12-29 15:52:08 -08:00
JonnyWong16	28e4151157	Remember tab when going back on library and user pages	2017-12-29 11:34:41 -08:00
JonnyWong16	66d45293e6	Add test Plex Web URL button	2017-12-29 10:47:31 -08:00
JonnyWong16	243eeeff67	v2.0.3-beta	2017-12-25 09:58:24 -08:00
JonnyWong16	18520e24d1	Report correct release version on beta	2017-12-25 09:48:33 -08:00
JonnyWong16	87743171b7	Fix write session history optimized_version_title column name	2017-12-25 09:07:02 -08:00
JonnyWong16	452f0747c8	Add missing stream info modal css	2017-12-25 09:02:33 -08:00
JonnyWong16	a20747044c	Fix sync ID	2017-12-25 09:00:42 -08:00
JonnyWong16	e60241ca73	v2.0.2-beta	2017-12-24 13:53:49 -08:00
JonnyWong16	c69e68a4a8	Alias media info title to sort title	2017-12-24 11:29:12 -08:00
JonnyWong16	561d994328	Fix config version updgrade	2017-12-24 07:52:11 -08:00
JonnyWong16	33acf9402d	Improved synced and optimized version info	2017-12-23 11:52:28 -08:00
JonnyWong16	0a42cb4135	Update stream info modal	2017-12-22 22:04:40 -08:00
JonnyWong16	19695c220b	Fix some missing subtitle database columns	2017-12-22 19:55:21 -08:00
JonnyWong16	1fbc0165e6	Fix source video/audio/subtitle parameters in notifications	2017-12-22 14:22:37 -08:00
JonnyWong16	4dd05e217a	Add back HTTP Proxy setting	2017-12-22 13:01:25 -08:00
JonnyWong16	b77a409414	Add sort title to metadata, sort media info tables by sort title	2017-12-22 12:40:58 -08:00
JonnyWong16	b2157df026	Default blank session value when writing session history	2017-12-22 11:47:28 -08:00
JonnyWong16	0b8d5954f9	Fix librariaes page	2017-12-22 10:30:45 -08:00
JonnyWong16	0d60c7b728	Remove unused logos	2017-12-21 15:30:24 -08:00
JonnyWong16	de58136314	Do not send recently added notification if item updated more than 24 hours ago	2017-12-21 15:22:18 -08:00
JonnyWong16	4e718056b6	Remove bif thumbnail setting	2017-12-21 11:23:27 -08:00
JonnyWong16	480913362e	Fix default setup wizard settings	2017-12-21 11:23:11 -08:00
JonnyWong16	ad2f61132a	Change logos to svgs	2017-12-21 10:49:14 -08:00
JonnyWong16	0e2df4ba14	Add note to enable 3rd party APIs for link lookup	2017-12-21 10:47:32 -08:00
JonnyWong16	c342273742	Retrieve session by session key	2017-12-19 22:20:24 -08:00
JonnyWong16	0cb147cd8f	Cleanup safari-pinned-tab svg	2017-12-19 21:49:09 -08:00
JonnyWong16	11b2a17fb3	Fix white in logo text	2017-12-19 21:36:11 -08:00
JonnyWong16	23486ff235	Update favicons	2017-12-19 21:29:07 -08:00
JonnyWong16	a9e24bc0c5	Remove update section ids	2017-12-19 20:36:24 -08:00
JonnyWong16	3c22496ea2	Fix some platform mappings	2017-12-19 20:28:40 -08:00
JonnyWong16	b8164ca556	Validate condition logic on save	2017-12-19 17:32:37 -08:00
JonnyWong16	19565b3d0a	Add message to verify server for error communicating	2017-12-19 17:27:20 -08:00
JonnyWong16	50ce17ac72	Fix missing users table cache parameter	2017-12-19 16:40:45 -08:00
JonnyWong16	e51a425389	API enabled by default	2017-12-19 11:47:59 -08:00
JonnyWong16	3df7642193	Missing save button in settings	2017-12-19 11:21:07 -08:00
				`@@ -0,0 +1 @@`
				!function(t){function i(t){var i=jQuery(this);settings=jQuery.extend({},e,t.data);var a=i.data("triclick_clicks")\|\|0,c=i.data("triclick_start")\|\|0;0===a&&(c=t.timeStamp),0!=c&&t.timeStamp>c+settings.threshold&&(a=0,c=t.timeStamp),a+=1,3===a&&(a=0,c=0,t.type="tripleclick",void 0===jQuery.event.handle?jQuery.event.dispatch.apply(this,arguments):jQuery.event.handle.apply(this,arguments)),i.data("triclick_clicks",a),i.data("triclick_start",c)}var e={threshold:1e3};t.event.special.tripleclick={setup:function(e,a){t(this).bind("touchstart click.triple",e,i)},teardown:function(e){t(this).unbind("touchstart click.triple",i)}}}(jQuery);