diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 0000000..619cd6a
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,20 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 21
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - bug
+  - documentation
+  - enhancement
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: inactive
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
diff --git a/.gitignore b/.gitignore
index 11551c0..4665dd0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,11 +15,11 @@ config_future.ini
 dev/
 data/
 cache/
+plugins_ext/
 *.ts
 lib/tvheadend/development/
 lib/web/htdocs/temp/*
 !lib/web/htdocs/temp/__init__.py
-plugins_ext/provider*
 build/*/cabernet*.exe
 ffmpeg/
 misc/
diff --git a/Dockerfile_tvh_crypt.alpine b/Dockerfile_tvh_crypt.alpine
index 2b5ac20..31bacad 100644
--- a/Dockerfile_tvh_crypt.alpine
+++ b/Dockerfile_tvh_crypt.alpine
@@ -2,13 +2,15 @@ FROM python:3.8-alpine
 #RUN apk add --no-cache --update bash tzdata ffmpeg py3-cryptography py-requests && \
 RUN apk add --no-cache --update bash tzdata ffmpeg curl && \
     apk add --no-cache --virtual builddeps gcc musl-dev python3-dev libffi-dev openssl-dev cargo && \
-    pip3 install requests && \
-    pip install cryptography --no-binary=cryptography && \
+    pip3 install httpx[http2] && \
+    pip3 install streamlink && \
+    pip3 install cryptography --no-binary=cryptography && \
     apk del builddeps
 
+COPY requirements.txt /app/requirements.txt
+
 COPY *.py /app/
 COPY lib/ /app/lib/
 COPY plugins /app/plugins
-COPY plugins_ext /app/plugins_ext
 RUN touch /app/is_container
 ENTRYPOINT ["python3", "/app/tvh_main.py"]
diff --git a/Dockerfile_tvh_crypt.slim-buster b/Dockerfile_tvh_crypt.slim-buster
index e7b9069..16eb75b 100644
--- a/Dockerfile_tvh_crypt.slim-buster
+++ b/Dockerfile_tvh_crypt.slim-buster
@@ -28,6 +28,5 @@ RUN apt-get update \
 COPY *.py /app/
 COPY lib/ /app/lib/
 COPY plugins /app/plugins
-COPY plugins_ext /app/plugins_ext
 RUN touch /app/is_container
 ENTRYPOINT ["python3", "/app/tvh_main.py"]
diff --git a/LICENSE b/LICENSE
index 1e82844..e28453c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 ROCKY4546 (https://github.com/rocky4546)
+Copyright (c) 2023 ROCKY4546 (https://github.com/rocky4546)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index 87a0bca..5b0a8ef 100644
--- a/README.md
+++ b/README.md
@@ -1,41 +1,76 @@
+## NOTICE: 
+By default this app doesn't provide any video sources, only the plugins access the providers streams for personal use.
 
 ## Installation
 ### 1. Requirements
-- Python 3.7+
+- Python 3.8+
 - python cryptography module
-- ffmpeg
+- python httpx[http2] module
+- (optional) streamlink module
+- ffmpeg and ffprobe
 
 ### 2. Installation
 - Download source
 - Unzip source in the installation folder
-- Create a data folder inside the installation folder and create a config.ini file inside the data folder
-- Edit the config.ini and add the following lines
+- Launch the app by running the command "python3 tvh_main.py". This should create a data folder and a config.ini inside that folder
+- Bring up browser and go to http://ip address:6077/
+- From Plugins, install PlutoTV plugin
+- Stop the app
+- Edit the data/config.ini and add the following lines (Update: This is suppose to automatically happen in 0.9.14)
 <pre>
 [plutotv_default]
 label = PlutoTV Instance
 </pre>
 - Launch the app by running the command "python3 tvh_main.py"
-- Bring up browser and go to http://ipaddress:6077/
+- Bring up browser and go to http://ip address:6077/
 - Go to settings and make changes you want.
     - Logging: Change log level from warning to info if needed
-    - Under Providers > PlutoTV enable
-        - URL Filtering
-        - PTS/DTS Resync
+- Enable the PlutoTV instance in the Settings page
+- Restart the app (from the Scheduler/Applications) to have the plugin fully activate
 - From XML/JSON Links try some of the links
 
-### 3. Docker
+### 3. Services
+- MS Windows
+    - Services for MS Windows is auto-created using the installer provided for each release.
+- Unix/Linux
+    - Services for CoreELEC and Debian/Ubuntu are found here. Follow the instructions found in the files.
+    - https://github.com/cabernetwork/cabernet/tree/master/lib/tvheadend/service
+
+### 4. Docker
 See http://ghcr.io/cabernetwork/cabernet:latest
+- Use or Review ports and remote mount points at docker-compose.yml
+- Note: it requires unzipping the cabernet source into ./docker/cabernet/config/app to run
+- Recommended Docker file: Dockerfile_tvh_crypt.alpine
+- Bring up browser and go to http://ip address:6077/
+- From Plugins, install PlutoTV plugin
+- Stop the app
+- Edit the data/config.ini and add the following lines
+<pre>
+[plutotv_default]
+label = PlutoTV Instance
+</pre>
+- Restart the app (from the Scheduler/Applications) to have the plugin fully activate
+- From XML/JSON Links try some of the links
 
-### 4. Notes
+### 5. Default Ports
+- 6007 Web UI
+- 5004 Stream port
+- 1900 SSDP (if enabled)
+- 65001 HDHomeRun (if enabled)
+
+### 6. Notes
 - URL used can include plugin and instance levels to filter down to a specific set of data
-    - http://ipaddress:6077/channels.m3u
-    - http://ipaddress:6077/pLuToTv/channels.m3u
-    - http://ipaddress:6077/PlutoTV/Default/channels.m3u
-- config.ini group tag requirements
+    - http://ip address:6077/channels.m3u
+    - http://ip address:6077/pLuToTv/channels.m3u
+    - http://ip address:6077/PlutoTV/Default/channels.m3u
+- config.ini group tag requirements when creating an instance
     - All lower case
-    - Underscore separates the plugin name from the instance name
-    - Use a single word if possible for the instance name or use underlines between words
-    - Do not change the instance name.  It is used throughout the system and is difficult to change.
+    - Underscore is a key character in section tags and separates the plugin name from the instance name
+    - Use a single word if possible for the instance name
+    - Do not change the instance name unless you go into data management and remove the instance first.
     - [plutotv_mychannels]
 
+### 7. Forum
+https://tvheadend.org/boards/5/topics/43052
+
 Enjoy
diff --git a/build/WINDOWS/Plugins/ZipDLL/ZipDLL.cpp b/build/WINDOWS/Plugins/ZipDLL/ZipDLL.cpp
deleted file mode 100644
index 23bdfe6..0000000
--- a/build/WINDOWS/Plugins/ZipDLL/ZipDLL.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// ZipDLL.cpp : Definiert den Einsprungpunkt f�r die DLL-Anwendung.
-//
-
-#include "ZipArchive\ZipArchive.h"
-#include "exdll.h"
-#include <commctrl.h>
-
-BOOL APIENTRY DllMain( HANDLE hModule, 
-                       DWORD  ul_reason_for_call, 
-                       LPVOID lpReserved
-					 )
-{
-    return TRUE;
-}
-
-HWND g_hwndDlg, g_hwndList;
-
-void LogMessage(const char *pStr);
-void SetStatus(const char *pStr);
-
-extern "C" void __declspec(dllexport) extractall(HWND hwndParent, int string_size, 
-                                      char *variables, stack_t **stacktop)
-{
-	EXDLL_INIT();
-	
-	g_hwndDlg = g_hwndList = 0;
-	
-	// do your stuff here
-	g_hwndDlg=FindWindowEx(hwndParent,NULL,"#32770",NULL);
-	if (g_hwndDlg)
-		g_hwndList=FindWindowEx(g_hwndDlg,NULL,"SysListView32",NULL);	
-	
-	//Extract file to destination
-	char destination[MAX_PATH+1];
-	char source[MAX_PATH+1];
-	char buffer[4096];
-
-	char szExtracting[MAX_PATH * 2 + 100] =			"Extracting contents of %s to %s";
-	char szExtractingPrintCount[200] =				"  Extracting %d files and directories";
-	char szExtractFile[MAX_PATH + 50] =				"  Extract : %s";
-	char szErrorCouldNotExtract[MAX_PATH + 100] =	"  Error: Could not extract %s";
-	char szCouldNotExtract[MAX_PATH + 100] =		"Could not extract %s";
-	char szErrorCouldNotGetFileAttributes[100] =	"Error: Could not get file attributes.";
-	char szCouldNotGetFileAttributes[100] =			"Could not get file attributes.";
-	char szError[1000] =							"  Error: %s";
-
-	popstring(source);
-
-	if (!lstrcmpi(source, "/TRANSLATE")) {
-		//Use localized strings
-		popstring(szExtracting);
-		popstring(szExtractingPrintCount);
-		popstring(szExtractFile);
-		popstring(szErrorCouldNotExtract);
-		popstring(szCouldNotExtract);
-		popstring(szErrorCouldNotGetFileAttributes);
-		popstring(szCouldNotGetFileAttributes);
-		popstring(szError);
-		popstring(source);
-	}
-		
-	popstring(destination);
-
-	sprintf(buffer, szExtracting, source, destination);
-	LogMessage(buffer);
-	try
-	{
-		// Open archive
-		CZipArchive archive;
-		archive.Open(source, CZipArchive::zipOpenReadOnly);
-		
-		// Get number of entries in archive
-		int nCount=archive.GetCount();
-		sprintf(buffer, szExtractingPrintCount, nCount);
-		LogMessage(buffer);
-
-		//Process each file in archive
-		for (int i=0;i<nCount;i++)
-		{
-			//Get file attributes
-			CZipFileHeader fi;
-			if (archive.GetFileInfo(fi, i))
-			{
-				//Extract file
-				sprintf(buffer, szExtractFile, (LPCTSTR)fi.GetFileName());
-				SetStatus(buffer);
-				
-				if (!archive.ExtractFile(i, destination))
-				{
-					sprintf(buffer, szErrorCouldNotExtract, (LPCTSTR)fi.GetFileName());
-					LogMessage(buffer);
-					sprintf(buffer, szCouldNotExtract, (LPCTSTR)fi.GetFileName());
-					pushstring(buffer);
-					return;
-				}
-			}
-			else
-			{
-				LogMessage(szErrorCouldNotGetFileAttributes);
-				pushstring(szCouldNotGetFileAttributes);
-				return;
-			}
-		}
-		archive.Close();
-	}
-	catch(CZipException e)
-	{
-		const char *desc=e.GetErrorDescription();
-		pushstring(desc);
-		sprintf(buffer, szError, (LPCTSTR)desc);
-		LogMessage(buffer);
-		return;
-	}
-	pushstring("success");
-}
-
-
-extern "C" void __declspec(dllexport) extractfile(HWND hwndParent, int string_size, 
-                                      char *variables, stack_t **stacktop)
-{
-	EXDLL_INIT();
-	
-	g_hwndDlg = g_hwndList = 0;
-	
-	// do your stuff here
-	g_hwndDlg=FindWindowEx(hwndParent, NULL, "#32770", NULL);
-	if (g_hwndDlg)
-		g_hwndList=FindWindowEx(g_hwndDlg, NULL, "SysListView32", NULL);
-	
-	//Extract file to destination
-	char file[MAX_PATH+1];
-	char destination[MAX_PATH+1];
-	char source[MAX_PATH+1];
-	char buffer[4096];
-					
-	char szExtracting[MAX_PATH * 3 + 100] =			"Extracting the file %s from %s to %s";
-	char szErrorFileDoesNotExist[100] =				"Error: Specified file does not exist in archive.";
-	char szFileDoesNotExist[100] =					"Specified file does not exist in archive.";
-	char szErrorCouldNotExtract[MAX_PATH + 100] =	"  Error: Could not extract %s";
-	char szCouldNotExtract[MAX_PATH + 100] =		"Could not extract %s";
-	char szErrorCouldNotGetFileAttributes[100] =	"Error: Could not get file attributes.";
-	char szCouldNotGetFileAttributes[100] =			"Could not get file attributes.";
-	char szError[1000] =							"  Error: %s";
-
-	popstring(source);
-
-	if (!lstrcmpi(source, "/TRANSLATE")) {
-		//Use localized strings
-		popstring(szExtracting);
-		popstring(szErrorFileDoesNotExist);
-		popstring(szFileDoesNotExist);
-		popstring(szErrorCouldNotExtract);
-		popstring(szCouldNotExtract);
-		popstring(szErrorCouldNotGetFileAttributes);
-		popstring(szCouldNotGetFileAttributes);
-		popstring(szError);
-		popstring(source);
-	}
-	
-	popstring(destination);
-	popstring(file);
-	
-	sprintf(buffer, szExtracting, file, source, destination);
-	SetStatus(buffer);
-	try
-	{
-		//Open archive
-		CZipArchive archive;
-		archive.Open(source, CZipArchive::zipOpenReadOnly);
-
-		//Find file in archive
-		int index=archive.FindFile(file);
-		if (index==-1)
-		{
-			LogMessage(szErrorFileDoesNotExist);
-			pushstring(szFileDoesNotExist);
-			return;
-		}
-  
-		//Get file attributes
-		CZipFileHeader fi;
-		if (archive.GetFileInfo(fi, index))
-		{
-			//Extract file		
-			if (!archive.ExtractFile(index, destination))
-			{
-				sprintf(buffer, szErrorCouldNotExtract, (LPCTSTR)fi.GetFileName());
-				LogMessage(buffer);
-				sprintf(buffer, szCouldNotExtract, (LPCTSTR)fi.GetFileName());
-				pushstring(buffer);
-				return;
-			}
-		}
-		else
-		{
-			LogMessage(szErrorCouldNotGetFileAttributes);
-			pushstring(szCouldNotGetFileAttributes);
-			return;
-		}
-
-		archive.Close();
-	}
-	catch(CZipException e)
-	{
-		const char *desc=e.GetErrorDescription();
-		pushstring(desc);
-		sprintf(buffer, szError, desc);
-		LogMessage(buffer);
-		return;
-	}
-	pushstring("success");
-}
-
-void SetStatus(const char *pStr)
-{
-	if (g_hwndDlg)
-	{
-		HWND hwndCtrl=GetDlgItem(g_hwndDlg, 1006);
-		if (hwndCtrl)
-			SetWindowText(hwndCtrl, pStr);
-	}
-	LogMessage(pStr);
-	return;
-}
-
-void LogMessage(const char *pStr)
-{
-	if (!g_hwndList)
-		return;
-
-	LVITEM item={0};
-	int nItemCount=SendMessage(g_hwndList, LVM_GETITEMCOUNT, 0, 0);
-	item.mask=LVIF_TEXT;
-	item.pszText=(char *)pStr;
-	item.cchTextMax=strlen(pStr);
-	item.iItem=nItemCount;
-	ListView_InsertItem(g_hwndList, &item);
-    ListView_EnsureVisible(g_hwndList, item.iItem, 0);
-    return;
-}
\ No newline at end of file
diff --git a/build/WINDOWS/Plugins/ZipDLL/ZipDLL.dll b/build/WINDOWS/Plugins/ZipDLL/ZipDLL.dll
deleted file mode 100644
index 5925d59..0000000
Binary files a/build/WINDOWS/Plugins/ZipDLL/ZipDLL.dll and /dev/null differ
diff --git a/build/WINDOWS/Plugins/ZipDLL/ZipDLL.dsp b/build/WINDOWS/Plugins/ZipDLL/ZipDLL.dsp
deleted file mode 100644
index 44b37ad..0000000
--- a/build/WINDOWS/Plugins/ZipDLL/ZipDLL.dsp
+++ /dev/null
@@ -1,83 +0,0 @@
-# Microsoft Developer Studio Project File - Name="ZipDLL" - Package Owner=<4>
-# Microsoft Developer Studio Generated Build File, Format Version 6.00
-# ** NICHT BEARBEITEN **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
-CFG=ZipDLL - Win32 Release
-!MESSAGE Dies ist kein g�ltiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
-!MESSAGE verwenden Sie den Befehl "Makefile exportieren" und f�hren Sie den Befehl
-!MESSAGE 
-!MESSAGE NMAKE /f "ZipDLL.mak".
-!MESSAGE 
-!MESSAGE Sie k�nnen beim Ausf�hren von NMAKE eine Konfiguration angeben
-!MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
-!MESSAGE 
-!MESSAGE NMAKE /f "ZipDLL.mak" CFG="ZipDLL - Win32 Release"
-!MESSAGE 
-!MESSAGE F�r die Konfiguration stehen zur Auswahl:
-!MESSAGE 
-!MESSAGE "ZipDLL - Win32 Release" (basierend auf  "Win32 (x86) Dynamic-Link Library")
-!MESSAGE 
-
-# Begin Project
-# PROP AllowPerConfigDependencies 0
-# PROP Scc_ProjName ""
-# PROP Scc_LocalPath ""
-CPP=cl.exe
-MTL=midl.exe
-RSC=rc.exe
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Ignore_Export_Lib 1
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZIPDLL_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "ZIPDLL_EXPORTS" /FD /c
-# SUBTRACT CPP /YX /Yc /Yu
-# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
-# ADD BASE RSC /l 0x407 /d "NDEBUG"
-# ADD RSC /l 0x407 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib ZipArchive\Release\ZipArchive_STL.lib /nologo /dll /machine:I386 /out:"ZipDLL.dll" /opt:ref /opt:nowin98
-# SUBTRACT LINK32 /pdb:none /nodefaultlib
-# Begin Target
-
-# Name "ZipDLL - Win32 Release"
-# Begin Group "Quellcodedateien"
-
-# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-# Begin Source File
-
-SOURCE=.\ZipDLL.cpp
-# End Source File
-# End Group
-# Begin Group "Header-Dateien"
-
-# PROP Default_Filter "h;hpp;hxx;hm;inl"
-# Begin Source File
-
-SOURCE=.\exdll.h
-# End Source File
-# End Group
-# Begin Group "Ressourcendateien"
-
-# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
-# End Group
-# Begin Source File
-
-SOURCE=.\ReadMe.txt
-# End Source File
-# End Target
-# End Project
diff --git a/build/WINDOWS/Plugins/ZipDLL/ZipDLL.dsw b/build/WINDOWS/Plugins/ZipDLL/ZipDLL.dsw
deleted file mode 100644
index 2c37cb4..0000000
--- a/build/WINDOWS/Plugins/ZipDLL/ZipDLL.dsw
+++ /dev/null
@@ -1,44 +0,0 @@
-Microsoft Developer Studio Workspace File, Format Version 6.00
-# WARNUNG: DIESE ARBEITSBEREICHSDATEI DARF NICHT BEARBEITET ODER GEL�SCHT WERDEN!
-
-###############################################################################
-
-Project: "ZipArchive"=.\ZipArchive\ZipArchive_STL.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-}}}
-
-###############################################################################
-
-Project: "ZipDLL"=.\ZipDLL.dsp - Package Owner=<4>
-
-Package=<5>
-{{{
-}}}
-
-Package=<4>
-{{{
-    Begin Project Dependency
-    Project_Dep_Name ZipArchive
-    End Project Dependency
-}}}
-
-###############################################################################
-
-Global:
-
-Package=<5>
-{{{
-}}}
-
-Package=<3>
-{{{
-}}}
-
-###############################################################################
-
diff --git a/build/WINDOWS/Plugins/ZipDLL/exdll.h b/build/WINDOWS/Plugins/ZipDLL/exdll.h
deleted file mode 100644
index 6b04c56..0000000
--- a/build/WINDOWS/Plugins/ZipDLL/exdll.h
+++ /dev/null
@@ -1,97 +0,0 @@
-#ifndef _EXDLL_H_
-#define _EXDLL_H_
-
-// only include this file from one place in your DLL.
-// (it is all static, if you use it in two places it will fail)
-
-#define EXDLL_INIT()           {  \
-        g_stringsize=string_size; \
-        g_stacktop=stacktop;      \
-        g_variables=variables; }
-
-// For page showing plug-ins
-#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
-#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd)
-#define NOTIFY_BYE_BYE 'x'
-
-typedef struct _stack_t {
-  struct _stack_t *next;
-  char text[1]; // this should be the length of string_size
-} stack_t;
-
-
-static unsigned int g_stringsize;
-static stack_t **g_stacktop;
-static char *g_variables;
-
-static int popstring(char *str); // 0 on success, 1 on empty stack
-static void pushstring(const char *str);
-
-enum
-{
-INST_0,         // $0
-INST_1,         // $1
-INST_2,         // $2
-INST_3,         // $3
-INST_4,         // $4
-INST_5,         // $5
-INST_6,         // $6
-INST_7,         // $7
-INST_8,         // $8
-INST_9,         // $9
-INST_R0,        // $R0
-INST_R1,        // $R1
-INST_R2,        // $R2
-INST_R3,        // $R3
-INST_R4,        // $R4
-INST_R5,        // $R5
-INST_R6,        // $R6
-INST_R7,        // $R7
-INST_R8,        // $R8
-INST_R9,        // $R9
-INST_CMDLINE,   // $CMDLINE
-INST_INSTDIR,   // $INSTDIR
-INST_OUTDIR,    // $OUTDIR
-INST_EXEDIR,    // $EXEDIR
-INST_LANG,      // $LANGUAGE
-__INST_LAST
-};
-
-
-// utility functions (not required but often useful)
-static int popstring(char *str)
-{
-  stack_t *th;
-  if (!g_stacktop || !*g_stacktop) return 1;
-  th=(*g_stacktop);
-  lstrcpy(str,th->text);
-  *g_stacktop = th->next;
-  GlobalFree((HGLOBAL)th);
-  return 0;
-}
-
-static void pushstring(const char *str)
-{
-  stack_t *th;
-  if (!g_stacktop) return;
-  th=(stack_t*)GlobalAlloc(GPTR,sizeof(stack_t)+g_stringsize);
-  lstrcpyn(th->text,str,g_stringsize);
-  th->next=*g_stacktop;
-  *g_stacktop=th;
-}
-
-static char *getuservariable(int varnum)
-{
-  if (varnum < 0 || varnum >= __INST_LAST) return NULL;
-  return g_variables+varnum*g_stringsize;
-}
-
-static void setuservariable(int varnum, char *var)
-{
-	if (var != NULL && varnum >= 0 && varnum < __INST_LAST) 
-		lstrcpy(g_variables + varnum*g_stringsize, var);
-}
-
-
-
-#endif//_EXDLL_H_
\ No newline at end of file
diff --git a/build/WINDOWS/Plugins/ZipDLL/license.txt b/build/WINDOWS/Plugins/ZipDLL/license.txt
deleted file mode 100644
index a396e01..0000000
--- a/build/WINDOWS/Plugins/ZipDLL/license.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-This NSIS plugin is licensed under the GPL, please read the file ZipArchive\glp.txt
-for details.
-  
-This program 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 2
-of the License, or (at your option) any later version.
-
-This library 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 this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-
-ZipDLL uses the ZipArchive library from http://www.artpol-software.com/index_zip.html
-Please read the file ZipArchive\license.txt for details
-
-Alternative license for use with proprietary software:
-------------------------------------------------------
-
-Since ZipArchive is licensed under the GPL, it may only be used with programs with a
-GPL compatible license, the same applies to this DLL.
-You can, however obtain a commercial license (free of charge for freeware and most 
-shareware programs) for ZipArchive. Please read ZipArchive\license.txt for details.
-Permission is granted to use ZipDLL together with prorietary software when you've
-obtained a license for ZipArchive.
\ No newline at end of file
diff --git a/build/WINDOWS/Plugins/ZipDLL/readme.txt b/build/WINDOWS/Plugins/ZipDLL/readme.txt
deleted file mode 100644
index 6bbb508..0000000
--- a/build/WINDOWS/Plugins/ZipDLL/readme.txt
+++ /dev/null
@@ -1,122 +0,0 @@
-                              ZipDLL v1.2.2a
-                              --------------
-                            Copyright 2002-2004 
-                               by Tim Kosse
-                              tim.kosse@gmx.de
-
-What is this?
--------------
-
-  ZipDLL is a extension DLL for NSIS. It can unzip files from
-  zip files. It is especially useful in combination with NSISdl so 
-  that you don't have to download large files uncompressed.
-
-Usage
------
-
-  To extract files from a zip file, use the following macro:
-
-  !insertmacro ZIPDLL_EXTRACT SOURCE DESTINATION FILE
-
-  Parameters:  Zip file, destination directory, file to extract
-  Description: Extract the specified file in the archive to the 
-               destination directory.
-               If file is &lt;ALL&gt;, all files in the archive
-               will be extracted.
-
-  Example:
-    !insertmacro MUI_ZIPDLL_EXTRACTALL "c:\test.zip" "c:\output"
-
-  
-  Exported Functions:
-  - extractall
-    Parameters: Zip file, destination directory
-    Description: Extracts all files in the archive to the destination
-                 directory.
-
-  - extractfile
-    Parameters: Zip file, destination directory, file to extract
-    Description: Extracts the specified file in the archive to the destination
-                 directory.
-
-  Example:
-    ZipDLL::extractall "c:\test.zip" "c:\output"
-
-Supported languages
--------------------
-
-ZipDLL.nsh contains the following additional languages:
-- Arabic
-- Brazilian
-- Chinese Simplified
-- Chinese Traditional
-- Croatian
-- Danish
-- French
-- German
-- Hungarian
-- Korean
-- Lithuanian
-- Polish
-- Russian
-- Spanish
-
-To add your language, simply modify ZipDLL.nsh, should be really easy. 
-Please send the modified ZipDLL.nsh to tim.kosse@gmx.de so that other people can 
-benfit from it, too.
-
-Legal Stuff
------------
-
-  This NSIS plugin is licensed under the GPL, please read the file ZipArchive\glp.txt
-  for details.
-  
-  ZipDLL uses the ZipArchive library from http://www.artpol-software.com/index_zip.html
-  Please read the file ZipArchive\license.txt for details
-
-  Alternative license for use with proprietary software:
-  ------------------------------------------------------
-
-  Since ZipArchive is licensed under the GPL, it may only be used with programs with a
-  GPL compatible license, the same applies to this DLL.
-  You can, however obtain a commercial license (free of charge for freeware and most 
-  shareware programs) for ZipArchive. Please read ZipArchive\license.txt for details.
-  Permission is granted to use ZipDLL together with prorietary software when you've
-  obtained a license for ZipArchive.
-
-Version History
----------------
-
-1.2.2a
-------
-
-- added Croatian and Hungarian language
-
-1.2.2
------
-
-- Added a lot of languages
-- Some improvements for ZipDll.nsh made by deguix
-
-1.2.1
------
-
-- Made compatible with NSIS 2b3
-
-1.2
----
-
-- Added macros for automatic language selection
-- Translation possible, works like /translate switch for NsisDL plugin
-
-1.1
----
-
-- made compatible with latest NSIS (parameters on stack swapped)
-- cleaned up code
-
-1.0
----
-
-- initial release
-   
\ No newline at end of file
diff --git a/build/WINDOWS/Plugins/ZipDLL/zipdll.nsh b/build/WINDOWS/Plugins/ZipDLL/zipdll.nsh
deleted file mode 100644
index bf50ee7..0000000
--- a/build/WINDOWS/Plugins/ZipDLL/zipdll.nsh
+++ /dev/null
@@ -1,417 +0,0 @@
-;ZipDLL include file for NSIS
-;Written by Tim Kosse (mailto:tim.kosse@gmx.de)
-;some improvements by deguix
-
-;Supported languages with their translators in alphabetical order:
-
-;Arabic translation by asdfuae
-;Brazilian Portuguese translation by "deguix"
-;Chinese, Simplified translation by Kii Ali <kiiali@cpatch.org>
-;Chinese, Traditional traslation by "matini" and Kii Ali <kiiali@cpatch.org>
-;Croatian translation by "iostriz"
-;Danish translation by Claus Futtrup
-;French translation by "veekee"
-;German translation by Tim Kosse
-;Hungarian translation by Toth Laszlo
-;Korean translation by Seongab Kim
-;Lithuanian translation by Vytautas Krivickas
-;Polish translation by Krzysztof Galuszka
-;Russion translation by Sergey
-;Spanish translation by "dark_boy"
-
-!ifndef ZIPDLL_USED
-
-!define ZIPDLL_USED
-
-!macro ZIPDLL_EXTRACT SOURCE DESTINATION FILE
-
-  !define "FILE_${FILE}"
-
-  !ifndef FILE_<ALL>
-    Push "${FILE}"
-  !endif
-
-  IfFileExists "${DESTINATION}" +2
-    CreateDirectory "${DESTINATION}"
-
-  Push "${DESTINATION}"
-
-  IfFileExists "${SOURCE}" +2
-    SetErrors
-
-  Push "${SOURCE}"
-
-  ;The strings that will be translated are (ready to copy,
-  ;remove leading semicolons in your language block):
-
-  !ifdef LANG_ENGLISH
-
-    ;English is default language of ZipDLL, no need to push the untranslated strings
-
-    ;StrCmp $LANGUAGE ${LANG_ENGLISH} 0 +1
-
-      ;Push "  Error: %s"
-      ;Push "Could not get file attributes."
-      ;Push "Error: Could not get file attributes."
-      ;Push "Could not extract %s"
-      ;Push "  Error: Could not extract %s"
-
-      ;!ifdef FILE_<ALL>
-        ;Push "  Extract: %s"
-        ;Push "  Extracting %d files and directories"
-        ;Push "Extracting contents of %s to %s"
-      ;!else
-        ;Push "Specified file does not exist in archive."
-        ;Push "Error: Specified file does not exist in archive."
-        ;Push "Extracting the file %s from %s to %s"
-      ;!endif
-
-      ;Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_HUNGARIAN
-
-    StrCmp $LANGUAGE ${LANG_HUNGARIAN} 0 +10
-
-      Push "  Hiba: %s"
-      Push "Nem olvashat� a f�jl attrib�tumai."
-      Push "Hiba: Nem olvashat� a f�jl attrib�tumai."
-      Push "Nem siker�lt kicsomagolni a(z) %s"
-      Push "  Hiba: Nem siker�lt kicsomagolni a(z) %s"
-
-      !ifdef FILE_<ALL>
-        Push "  Kicsomagol�s: %s"
-        Push "  %d f�jl �s mappa kicsomagol�sa"
-        Push "%s tartalom kicsomagol�sa a %s helyre"
-      !else
-        Push "A megadott f�jl nem tal�lhat� az arh�vumban."
-        Push "Hiba: A megadott f�jl nem tal�lhat� az arh�vumban."
-        Push "%s f�jl kcsomagol�sa a(z) %s f�jlb�l a %s helyre"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_FRENCH
-
-    StrCmp $LANGUAGE ${LANG_FRENCH} 0 +10
-
-      Push "  Erreur : %s"
-      Push "Impossible de r�cup�rer les informations sur le fichier."
-      Push "Erreur : Impossible de r�cup�rer les informations sur le fichier."
-      Push "Impossible de d�compresser %s."
-      Push "  Erreur : Impossible de d�compresser %s."
-
-      !ifdef FILE_<ALL>
-        Push "  D�compression : %s"
-        Push "  D�compression de %d fichiers et r�pertoires"
-        Push "D�compression des donn�es de %s vers %s"
-      !else
-        Push "Le fichier sp�cifi� n'existe pas dans l'archive"
-        Push "Erreur : Le fichier sp�cifi� n'existe pas dans l'archive"
-        Push "D�compression du fichier %s depuis %s vers %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_GERMAN
-
-    StrCmp $LANGUAGE ${LANG_GERMAN} 0 +10
-
-      Push "  Fehler: %s"
-      Push "Dateiattribute konnten nicht ermittelt werden."
-      Push "Fehler: Dateiattribute konnten nicht ermittelt werden."
-      Push "%s konnte nicht dekomprimiert werden."
-      Push "  Fehler: %s konnte nicht dekomprimiert werden."
-
-      !ifdef FILE_<ALL>
-        Push "  Dekomprimiere: %s"
-        Push "  Dekomprimiere %d Dateien und Verzeichnisse"
-        Push "Dekomprimiere Inhalt von %s nach %s"
-      !else
-        Push "Die angegebene Datei existiert nicht im Archiv"
-        Push "Fehler: Die angegebene Datei existiert nicht im Archiv"
-        Push "Dekomprimiere Datei %s von %s nach %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_SPANISH
-
-    StrCmp $LANGUAGE ${LANG_SPANISH} 0 +10
-
-      Push "  Error: %s"
-      Push "No se obtuvieron atributos del archivo"
-      Push "Error: No se obtuvieron atributos del archivo"
-      Push "No se pudo extraer %s"
-      Push "  Error: No se pudo extraer %s"
-
-      !ifdef FILE_<ALL>
-        Push "  Extraer: %s"
-        Push "  Extrayendo %d archivos y directorios"
-        Push "Extraer archivos de %s a %s"
-      !else
-        Push "Archivo especificado no existe en el ZIP"
-        Push "Error: El archivo especificado no existe en el ZIP"
-        Push "Extrayendo el archivo %s de %s a %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_PORTUGUESEBR
-
-    StrCmp $LANGUAGE ${LANG_PORTUGUESEBR} 0 +10
-
-      Push "  Erro: %s"
-      Push "N�o se pode ler os atributos do arquivo"
-      Push "Error: N�o se pode ler os atributos do arquivo"
-      Push "N�o se pode extrair %s"
-      Push "  Erro: N�o se pode extrair %s"
-
-      !ifdef FILE_<ALL>
-        Push "  Extraindo: %s"
-        Push "  Extraindo %d arquivos e diret�rios"
-        Push "Extraindo arquivos de %s a %s"
-      !else
-        Push "O arquivo especificado n�o existe no ZIP"
-        Push "Erro: O arquivo especificado n�o existe no ZIP"
-        Push "Extraindo o arquivo %s de %s a %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_TRADCHINESE
-
-  StrCmp $LANGUAGE ${LANG_TRADCHINESE} 0 +11
-
-    Push "  ���~: %s"
-    Push "�L�k���o�ɮ��ݩʡC"
-    Push "���~: �L�k���o�ɮ��ݩʡC"
-    Push "�L�k�����Y %s"
-    Push "  ���~�G�L�k�����Y %s"
-    
-    !ifdef FILE_<ALL>
-      Push "  �����Y�G%s"
-      Push "  ���b�����Y %d �ɮ׻P�ؿ�"
-      Push "���b�����Y %s �����e�� %s"
-    !else
-      Push "���w���ɮרä��s�b�����Y�]�C"
-      Push "���~�G���w���ɮרä��s�b�����Y�]�C"
-      Push "���b�����Y�ɮ� %s �A�q %s �� %s"
-    !endif
-    
-    Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_SIMPCHINESE
-
-  StrCmp $LANGUAGE ${LANG_SIMPCHINESE} 0 +11
-
-    Push "  ����: %s"
-    Push "�޷�ȡ���ļ����ԡ�"
-    Push "����: �޷�ȡ���ļ����ԡ�"
-    Push "�޷���ѹ�� %s"
-    Push "  �����޷���ѹ�� %s"
-    
-    !ifdef FILE_<ALL>
-      Push "  ��ѹ����%s"
-      Push "  ���ڽ�ѹ�� %d �ļ���Ŀ¼"
-      Push "���ڽ�ѹ�� %s �����ݵ� %s"
-    !else
-      Push "ָ�����ļ�����������ѹ������"
-      Push "����ָ�����ļ�����������ѹ������"
-      Push "���ڽ�ѹ���ļ� %s ���� %s �� %s"
-    !endif
-    
-    Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_LITHUANIAN
-
-    StrCmp $LANGUAGE ${LANG_LITHUANIAN} 0 +10
-
-      Push "  Klaida: %s"
-      Push "Negaleta gauti bylos nuorodu."
-      Push "Klaida: Negaleta gauti bylos nuorodu."
-      Push "Negaleta i�traukti %s"
-      Push "  Klaida: Negaleta i�traukti %s"
-
-      !ifdef FILE_<ALL>
-        Push "  I�traukiam : %s"
-        Push "  I�traukiame %d bylas ir katalogus"
-        Push "I�traukiame viska is %s i %s"
-      !else
-        Push "Parinkta byla nesurasta �iame archyve."
-        Push "Klaida: Parinkta byla nesurasta �iame archyve."
-        Push "I�traukiame byla %s i� %s i %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef "LANG_POLISH"
-
-    strcmp $LANGUAGE ${LANG_POLISH} 0 +10
-
-      Push "  B��d: %s"
-      Push "Nie mo�e pobra� atrybutu pliku."
-      Push "B��d: Nie mo�e pobra� atrybutu pliku."
-      Push "Nie mo�e rozpakowa� %s."
-      Push "  B��d: Nie mo�e rozpakowa� %s."
-
-      !ifdef FILE_<ALL>
-        Push "  Rozpakuj: %s"
-        Push "  Rozpakowywanie %d plik�w i katalog�w"
-        Push "Rozpakowywanie zawarto�ci %s do %s"
-      !else
-        Push "Plik nie istnieje w archiwum"
-        Push "B��d: Plik nie istnieje w archiwum"
-        Push "Rozpakowywanie pliku %s z %s do %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef "LANG_KOREAN"
-    strcmp $LANGUAGE ${LANG_KOREAN} 0 +10
-      Push "  ���� : %s"
-      Push "ȭ�� �Ӽ��� ���� �� �����ϴ�."
-      Push "����: ȭ�� �Ӽ��� ���� �� �����ϴ�."
-      Push "%s��(��) Ǯ �� �����ϴ�."
-      Push "  ����: %s��(��) Ǯ �� �����ϴ�."
-
-      !ifdef FILE_<ALL>
-        Push "  Ǯ�� : %s"
-        Push "  %d���� ���ϰ� ������ Ǫ�� ��"
-        Push "%s�� ������ %s�� Ǫ�� ��"
-      !else
-        Push "������ ������ ���� ���� �ȿ� �����ϴ�."
-        Push "����: ������ ������ ���� ���� �ȿ� �����ϴ�."
-        Push "%s ������ %s���� %s�� Ǫ�� ��"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef "LANG_RUSSIAN"
-
-    strcmp $LANGUAGE ${LANG_RUSSIAN} 0 +10
-
-      Push "  ������: %s"
-      Push "�� ���� �������� �������� �����."
-      Push "������: �� ���� �������� �������� �����."
-      Push "�� ���� ������� %s"
-      Push "  ������: �� ���� ������� %s"
-
-      !ifdef LANG_<ALL>
-        Push "  �������� : %s"
-        Push "  ���������� %d ������ � �����"
-        Push "������ ����������� ������ �� %s � %s"
-      !else
-        Push "����������� ���� �� ��������� � ������."
-        Push "������: S����������� ���� �� ��������� � ������."
-        Push "���������� ����� %s �� %s � %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_ARABIC
-
-    StrCmp $LANGUAGE ${LANG_ARABIC} 0 +10
-
-      Push "  ����: %s"
-      Push "�� ���� ��� ����� �����."
-      Push "����: �� ���� ��� ����� �����."
-      Push "�� ���� ������� %s"
-      Push " ����: �� ���� ������� %s"
-  
-      !ifdef FILE_<ALL>
-        Push "  ������� : %s"
-        Push "  ������� ������ � ����� %d"
-        Push "������� ������� %s ��� %s"
-      !else
-        Push "����� ��� ����� �� �����."
-        Push "����: ����� ��� ����� �� �����."
-        Push "������� ����� %s �� %s ��� %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_DANISH
-
-    StrCmp $LANGUAGE ${LANG_DANISH} 0 +10
-
-      Push "  Fejl: %s"
-      Push "Kunne ikke l�se fil attributter."
-      Push "Fejl: Kunne ikke l�se fil attributter."
-      Push "Kunne ikke udpakke %s"
-      Push "  Fejl: Kunne ikke udpakke %s"
-
-      !ifdef FILE_<ALL>
-        Push "  Udpakker: %s"
-        Push "  Udpakker %d filer og mapper"
-        Push "Udpakker indhold fra %s til %s"
-      !else
-        Push "Specificeret fil eksisterer ikke i filarkivet"
-        Push "Fejl: Specificeret fil eksisterer ikke i filarkivet"
-        Push "Udpakker fil %s fra %s til %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif 
-
-  !ifdef LANG_CROATIAN
-
-    StrCmp $LANGUAGE ${LANG_CROATIAN} 0 +10
-
-      Push "  Gre�ka: %s"
-      Push "Ne mogu dohvatiti atribute datoteke."
-      Push "Gre�ka: Ne mogu dohvatiti atribute datoteke."
-      Push "Ne mogu ekstrahirati %s"
-      Push "  Gre�ka: Ne mogu ekstrahirati %s"
-
-      !ifdef FILE_<ALL>
-        Push "  Ekstrakcija: %s"
-        Push "  Ekstrakcija %d datoteka i mapa"
-        Push "Ekstrakcija sadr�aja %s u %s"
-      !else
-        Push "Tra�ena datoteka ne postoji u arhivi."
-        Push "Gre�ka: Tra�ena datoteka ne postoji u arhivi."
-        Push "Ekstrakcija datoteke %s iz %s u %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef FILE_<ALL>
-    ZipDLL::extractall
-  !else
-    ZipDLL::extractfile
-  !endif
-
-  !undef "FILE_${FILE}"
-
-!macroend
-
-!endif
diff --git a/build/WINDOWS/TvhLib.nsh b/build/WINDOWS/TvhLib.nsh
index 2b71402..afc0d5d 100644
--- a/build/WINDOWS/TvhLib.nsh
+++ b/build/WINDOWS/TvhLib.nsh
@@ -28,7 +28,9 @@ Function DataFolderPage
         Abort
     ${EndIf}
     CreateDirectory "$DataFolder"
-    ${NSD_CreateLabel} 0 0 100% 24u "Please specify the Cabernet data folder. Writeable by the user: System"
+    ${NSD_CreateLabel} 0 0 100% 24u "Please specify the Cabernet data folder. \
+        Writeable by the user: System$\r$\nIt is highly recommended to have \
+        this folder be easy to access."
     ${NSD_CreateGroupBox} 0 40u 100% 34u "Data Folder"
         ${NSD_CreateText} 3% 54u 77% 12u "$DataFolder"
         Pop $txtDataFolder
@@ -183,10 +185,12 @@ Function AddFiles
     File "${SOURCEPATH}\TVHEADEND.md"
     File "${SOURCEPATH}\requirements.txt"
     Rename "$INSTDIR\TVHEADEND.md" "$INSTDIR\README.txt"
-    SetOutPath "$INSTDIR"
-    File /r /x __pycache__ /x development "${SOURCEPATH}\lib"
-    SetOutPath "$INSTDIR"
-    File /r /x __pycache__ "${SOURCEPATH}\plugins"
+
+    SetOutPath "$INSTDIR\lib"
+    File /r /x __pycache__ /x development "${SOURCEPATH}\lib\*.*"
+    SetOutPath "$INSTDIR\plugins"
+    File /r /x __pycache__ "${SOURCEPATH}\plugins\*.*"
+
     SetOutPath "$INSTDIR\build\WINDOWS"
     File "${SOURCEPATH}\build\WINDOWS\UpdateConfig.pyw"
 FunctionEnd
diff --git a/build/WINDOWS/buildwin.nsi b/build/WINDOWS/buildwin.nsi
index ede0743..ab22280 100644
--- a/build/WINDOWS/buildwin.nsi
+++ b/build/WINDOWS/buildwin.nsi
@@ -6,7 +6,7 @@
 !define PRODUCT_NAME "cabernet"
 !define PRODUCT_VERSION ${VERSION}
 !define PRODUCT_PUBLISHER "rocky4546"
-!define PRODUCT_WEB_SITE "http://www.mycompany.com"
+!define PRODUCT_WEB_SITE "https://github.com/cabernetwork/cabernet"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\tvh_main.py"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -21,14 +21,12 @@
 
 ; MUI 1.67 compatible ------
 !addplugindir '.\Plugins\inetc\Plugins\x86-unicode'
-!addplugindir '.\Plugins\ZipDLL'
 
 !include "MUI.nsh"
 !include "MultiUser.nsh"
 !include "MUI2.nsh"
 !include nsDialogs.nsh
 !include "TvhLib.nsh"
-!include "ZipDLL.nsh"
 
 ; MUI Settings
 !define MUI_ABORTWARNING
@@ -152,7 +150,12 @@ Section "Install FFMPEG" SEC04
             Click OK to abort installation" /SD IDOK
         Abort
     dlok:
-    ZipDLL::extractall "$TEMP\ffmpeg.zip" "$TEMP\ffmpeg"
+    StrCpy $cmd 'powershell expand-archive \"$TEMP\ffmpeg.zip\" \"$TEMP\ffmpeg\"'
+    nsExec::ExecToStack '$cmd'
+    Pop $0 ;return value
+    Pop $1 ; status text
+    ;MessageBox MB_OK "FFMPEG Extract Status:$0 $1"
+
     StrCpy $subfolder "$TEMP\ffmpeg\ffmpeg*.*"
     Call GetSubfolder
     StrCmp $subfolder "" empty
@@ -164,6 +167,7 @@ Section "Install FFMPEG" SEC04
     DELETE "$TEMP\ffmpeg.zip"
     RMDIR /r "$TEMP\ffmpeg\*.*"
     RMDIR "$TEMP\ffmpeg"
+    SetOutPath "$INSTDIR"
 SectionEnd
 
 
@@ -220,9 +224,16 @@ FunctionEnd
 
 
 Function un.onInit
+    Var /GLOBAL remove_all
     !insertmacro MULTIUSER_UNINIT
-    MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+    MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name)?" IDYES +2
     Abort
+    MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Do you want to remove all data and plugins?" IDYES true2
+    StrCpy $remove_all "0"
+    Goto end2
+    true2:
+    StrCpy $remove_all "1"
+    end2:
 FunctionEnd
 
 
@@ -238,9 +249,24 @@ Section Uninstall
         Call un.installService
     ${EndIf}
 
-    #Delete "$INSTDIR\${PRODUCT_NAME}.url"
-    #Delete "$INSTDIR\uninst.exe"
-    RMDIR /r "$INSTDIR\*.*"
+    ${If} $remove_all == "1"
+        RMDIR /r "$INSTDIR\*.*"
+    ${Else}
+        #Delete Cabernet folders
+        RMDIR /r "$INSTDIR\build"
+        RMDIR /r "$INSTDIR\lib"
+        RMDIR /r "$INSTDIR\plugins"
+
+        #Delete Cabernet files
+        Delete "$INSTDIR\CHANGE*.*"
+        Delete "$INSTDIR\Dock*"
+        Delete "$INSTDIR\LIC*"
+        Delete "$INSTDIR\READ*.*"
+        Delete "$INSTDIR\req*.*"
+        Delete "$INSTDIR\tvh*.*"
+        Delete "$INSTDIR\uninst.exe"
+        Delete "$INSTDIR\${PRODUCT_NAME}.url"
+    ${EndIf}
 
     Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
     Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
@@ -248,7 +274,10 @@ Section Uninstall
     Delete "$SMPROGRAMS\$ICONS_GROUP\cabernet.lnk"
 
     RMDir "$SMPROGRAMS\$ICONS_GROUP"
-    RMDir "$INSTDIR"
+
+    ${If} $remove_all == "1"
+        RMDir "$INSTDIR"
+    ${EndIf}
 
     DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
     DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"
diff --git a/build/WINDOWS/zipdll.nsh b/build/WINDOWS/zipdll.nsh
deleted file mode 100644
index 6237df0..0000000
--- a/build/WINDOWS/zipdll.nsh
+++ /dev/null
@@ -1,132 +0,0 @@
-;ZipDLL include file for NSIS
-;Written by Tim Kosse (mailto:tim.kosse@gmx.de)
-;some improvements by deguix
-
-;Supported languages with their translators in alphabetical order:
-
-;Arabic translation by asdfuae
-;Brazilian Portuguese translation by "deguix"
-;Chinese, Simplified translation by Kii Ali <kiiali@cpatch.org>
-;Chinese, Traditional traslation by "matini" and Kii Ali <kiiali@cpatch.org>
-;Croatian translation by "iostriz"
-;Danish translation by Claus Futtrup
-;French translation by "veekee"
-;German translation by Tim Kosse
-;Hungarian translation by Toth Laszlo
-;Korean translation by Seongab Kim
-;Lithuanian translation by Vytautas Krivickas
-;Polish translation by Krzysztof Galuszka
-;Russion translation by Sergey
-;Spanish translation by "dark_boy"
-
-!ifndef ZIPDLL_USED
-
-!define ZIPDLL_USED
-
-!macro ZIPDLL_EXTRACT SOURCE DESTINATION FILE
-
-  !define "FILE_${FILE}"
-
-  !ifndef FILE_<ALL>
-    Push "${FILE}"
-  !endif
-
-  IfFileExists "${DESTINATION}" +2
-    CreateDirectory "${DESTINATION}"
-
-  Push "${DESTINATION}"
-
-  IfFileExists "${SOURCE}" +2
-    SetErrors
-
-  Push "${SOURCE}"
-
-  ;The strings that will be translated are (ready to copy,
-  ;remove leading semicolons in your language block):
-
-  !ifdef LANG_ENGLISH
-
-    ;English is default language of ZipDLL, no need to push the untranslated strings
-
-    ;StrCmp $LANGUAGE ${LANG_ENGLISH} 0 +1
-
-      ;Push "  Error: %s"
-      ;Push "Could not get file attributes."
-      ;Push "Error: Could not get file attributes."
-      ;Push "Could not extract %s"
-      ;Push "  Error: Could not extract %s"
-
-      ;!ifdef FILE_<ALL>
-        ;Push "  Extract: %s"
-        ;Push "  Extracting %d files and directories"
-        ;Push "Extracting contents of %s to %s"
-      ;!else
-        ;Push "Specified file does not exist in archive."
-        ;Push "Error: Specified file does not exist in archive."
-        ;Push "Extracting the file %s from %s to %s"
-      ;!endif
-
-      ;Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_GERMAN
-
-    StrCmp $LANGUAGE ${LANG_GERMAN} 0 +10
-
-      Push "  Fehler: %s"
-      Push "Dateiattribute konnten nicht ermittelt werden."
-      Push "Fehler: Dateiattribute konnten nicht ermittelt werden."
-      Push "%s konnte nicht dekomprimiert werden."
-      Push "  Fehler: %s konnte nicht dekomprimiert werden."
-
-      !ifdef FILE_<ALL>
-        Push "  Dekomprimiere: %s"
-        Push "  Dekomprimiere %d Dateien und Verzeichnisse"
-        Push "Dekomprimiere Inhalt von %s nach %s"
-      !else
-        Push "Die angegebene Datei existiert nicht im Archiv"
-        Push "Fehler: Die angegebene Datei existiert nicht im Archiv"
-        Push "Dekomprimiere Datei %s von %s nach %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-  !ifdef LANG_SPANISH
-
-    StrCmp $LANGUAGE ${LANG_SPANISH} 0 +10
-
-      Push "  Error: %s"
-      Push "No se obtuvieron atributos del archivo"
-      Push "Error: No se obtuvieron atributos del archivo"
-      Push "No se pudo extraer %s"
-      Push "  Error: No se pudo extraer %s"
-
-      !ifdef FILE_<ALL>
-        Push "  Extraer: %s"
-        Push "  Extrayendo %d archivos y directorios"
-        Push "Extraer archivos de %s a %s"
-      !else
-        Push "Archivo especificado no existe en el ZIP"
-        Push "Error: El archivo especificado no existe en el ZIP"
-        Push "Extrayendo el archivo %s de %s a %s"
-      !endif
-
-      Push "/TRANSLATE"
-
-  !endif
-
-
-  !ifdef FILE_<ALL>
-    ZipDLL::extractall
-  !else
-    ZipDLL::extractfile
-  !endif
-
-  !undef "FILE_${FILE}"
-
-!macroend
-
-!endif
diff --git a/docker-compose.yml b/docker-compose.yml
index 9ece127..c70a82c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,8 +1,22 @@
-locast2plex:
-    image: tgorg/locast2plex
-    ports:
-      - "6077:6077"
-      - "1900:1900/udp"
-    restart: unless-stopped
-    volumes:
-      - ./config.ini:/app/config/config.ini
+# NOTE: Cabernet tends to maintain versions on its own and will conflict with docker's
+# versioning system.
+# The recommendation is to have the entire cabernet source folder be in its own volume.
+# whether you mount /app or /app/cabernet, the whole cabernet folder should be a volume.
+# then run the python script tvh_main.py at the top level Caberent folder to start Cabernet.
+
+version: '2.4'
+services:
+    cabernet:
+        container_name: cabernet
+        image: ghcr.io/cabernetwork/cabernet:latest
+        environment:
+          - TZ="America/New_York"
+          - PUID=1000
+          - PGID=1000
+        ports:
+          - "5004:5004"    # Port used to stream
+          - "6077:6077"    # Web Interface Port
+        restart: unless-stopped
+        volumes:
+          - ./docker/cabernet/config/app:/app
+          - ./.cabernet/key.txt:/root/.cabernet/key.txt
diff --git a/lib/clients/channels/channels.py b/lib/clients/channels/channels.py
index 44ec53c..8a796a5 100644
--- a/lib/clients/channels/channels.py
+++ b/lib/clients/channels/channels.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -40,68 +40,67 @@ def playlist(_webserver):
 @getrequest.route('/channels.m3u')
 def channels_m3u(_webserver):
     _webserver.do_mime_response(200, 'audio/x-mpegurl', get_channels_m3u(
-        _webserver.config, _webserver.stream_url, 
-        _webserver.query_data['name'], 
+        _webserver.config, _webserver.stream_url,
+        _webserver.query_data['name'],
         _webserver.query_data['instance'],
         _webserver.plugins.plugins
-        ))
+    ))
 
 
 @getrequest.route('/lineup.xml')
 def lineup_xml(_webserver):
     _webserver.do_mime_response(200, 'application/xml', get_channels_xml(
         _webserver.config, _webserver.stream_url,
-        _webserver.query_data['name'], 
+        _webserver.query_data['name'],
         _webserver.query_data['instance'],
         _webserver.plugins.plugins
-        ))
+    ))
 
 
 @getrequest.route('/lineup.json')
 def lineup_json(_webserver):
     _webserver.do_mime_response(200, 'application/json', get_channels_json(
-        _webserver.config, _webserver.stream_url, 
-        _webserver.query_data['name'], 
+        _webserver.config, _webserver.stream_url,
+        _webserver.query_data['name'],
         _webserver.query_data['instance'],
         _webserver.plugins.plugins
-        ))
+    ))
 
 
 def get_channels_m3u(_config, _base_url, _namespace, _instance, _plugins):
-
     format_descriptor = '#EXTM3U'
     record_marker = '#EXTINF'
+    ch_obj = ChannelsURL(_config, _base_url)
 
     db = DBChannels(_config)
     ch_data = db.get_channels(_namespace, _instance)
     fakefile = StringIO()
     fakefile.write(
-            '%s\n' % format_descriptor
-        )
+        '%s\n' % format_descriptor
+    )
 
     sids_processed = []
     for sid, sid_data_list in ch_data.items():
         for sid_data in sid_data_list:
             if sid in sids_processed:
                 continue
-            sids_processed.append(sid)
-            if not sid_data['enabled']:
-                continue
-            if not _plugins[sid_data['namespace']].enabled:
+            if not sid_data['enabled'] \
+                    or not _plugins.get(sid_data['namespace']) \
+                    or not _plugins[sid_data['namespace']].enabled:
                 continue
             if not _plugins[sid_data['namespace']] \
-                .plugin_obj.instances[sid_data['instance']].enabled:
+                    .plugin_obj.instances[sid_data['instance']].enabled:
                 continue
             config_section = utils.instance_config_section(sid_data['namespace'], sid_data['instance'])
             if not _config[config_section]['enabled']:
                 continue
+            sids_processed.append(sid)
             stream = _config[config_section]['player-stream_type']
-            if stream == 'm3u8redirect':
+            if stream == 'm3u8redirect' and sid_data['json'].get('stream_url'):
                 uri = sid_data['json']['stream_url']
             else:
-                uri = '{}{}/{}/watch/{}'.format(
-                        'http://', _base_url, sid_data['namespace'], str(sid))
-                        
+                uri = ch_obj.set_uri(sid_data)
+
             # NOTE tvheadend supports '|' separated names in two attributes
             # either 'group-title' or 'tvh-tags'
             # if a ';' is used in group-title, tvheadend will use the 
@@ -119,21 +118,20 @@ def get_channels_m3u(_config, _base_url, _namespace, _instance, _plugins):
                 groups += '|' + sid_data['json']['group_sdtv']
 
             updated_chnum = utils.wrap_chnum(
-                str(sid_data['display_number']), sid_data['namespace'], 
+                str(sid_data['display_number']), sid_data['namespace'],
                 sid_data['instance'], _config)
-            ch_obj = ChannelsURL(_config)
             service_name = ch_obj.set_service_name(sid_data)
             fakefile.write(
                 '%s\n' % (
-                    record_marker + ':-1' + ' ' +
-                    'channelID=\'' + sid + '\' ' +
-                    'tvg-num=\'' + updated_chnum + '\' ' +
-                    'tvg-chno=\'' + updated_chnum + '\' ' +
-                    'tvg-name=\'' + sid_data['display_name'] + '\' ' +
-                    'tvg-id=\'' + sid + '\' ' +
-                    (('tvg-logo=\'' + sid_data['thumbnail'] + '\' ')
-                        if sid_data['thumbnail'] else '') +
-                    'group-title=\''+groups+'\',' + service_name
+                        record_marker + ':-1' + ' ' +
+                        'channelID=\'' + sid + '\' ' +
+                        'tvg-num=\'' + updated_chnum + '\' ' +
+                        'tvg-chno=\'' + updated_chnum + '\' ' +
+                        'tvg-name=\'' + sid_data['display_name'] + '\' ' +
+                        'tvg-id=\'' + sid + '\' ' +
+                        (('tvg-logo=\'' + sid_data['thumbnail'] + '\' ')
+                         if sid_data['thumbnail'] else '') +
+                        'group-title=\'' + groups + '\',' + service_name
                 )
             )
             fakefile.write(
@@ -145,9 +143,10 @@ def get_channels_m3u(_config, _base_url, _namespace, _instance, _plugins):
             )
     return fakefile.getvalue()
 
-    
+
 def get_channels_json(_config, _base_url, _namespace, _instance, _plugins):
     db = DBChannels(_config)
+    ch_obj = ChannelsURL(_config, _base_url)
     ch_data = db.get_channels(_namespace, _instance)
     return_json = ''
     sids_processed = []
@@ -158,36 +157,38 @@ def get_channels_json(_config, _base_url, _namespace, _instance, _plugins):
             sids_processed.append(sid)
             if not sid_data['enabled']:
                 continue
+            if not _plugins.get(sid_data['namespace']):
+                continue
             if not _plugins[sid_data['namespace']].enabled:
                 continue
             if not _plugins[sid_data['namespace']] \
-                .plugin_obj.instances[sid_data['instance']].enabled:
+                    .plugin_obj.instances[sid_data['instance']].enabled:
                 continue
             config_section = utils.instance_config_section(sid_data['namespace'], sid_data['instance'])
             if not _config[config_section]['enabled']:
                 continue
+            sids_processed.append(sid)
             stream = _config[config_section]['player-stream_type']
             if stream == 'm3u8redirect':
                 uri = sid_data['json']['stream_url']
             else:
-                uri = _base_url + '/' + sid_data['namespace'] + '/watch/' + sid
+                uri = ch_obj.set_uri(sid_data)
             updated_chnum = utils.wrap_chnum(
-                str(sid_data['display_number']), sid_data['namespace'], 
+                str(sid_data['display_number']), sid_data['namespace'],
                 sid_data['instance'], _config)
-            return_json = return_json + \
-                ch_templates['jsonLineup'].format(
-                    sid,
-                    sid_data['json']['callsign'],
-                    updated_chnum,
-                    sid_data['display_name'],
-                    uri,
-                    sid_data['json']['HD'])
+            return_json = return_json + ch_templates['jsonLineup'].format(
+                sid_data['json']['callsign'],
+                updated_chnum,
+                sid_data['display_name'],
+                uri,
+                sid_data['json']['HD'])
             return_json = return_json + ','
     return "[" + return_json[:-1] + "]"
 
 
 def get_channels_xml(_config, _base_url, _namespace, _instance, _plugins):
     db = DBChannels(_config)
+    ch_obj = ChannelsURL(_config, _base_url)
     ch_data = db.get_channels(_namespace, _instance)
     return_xml = ''
     sids_processed = []
@@ -195,39 +196,43 @@ def get_channels_xml(_config, _base_url, _namespace, _instance, _plugins):
         for sid_data in sid_data_list:
             if sid in sids_processed:
                 continue
-            sids_processed.append(sid)
             if not sid_data['enabled']:
                 continue
+            if not _plugins.get(sid_data['namespace']):
+                continue
             if not _plugins[sid_data['namespace']].enabled:
                 continue
             if not _plugins[sid_data['namespace']] \
-                .plugin_obj.instances[sid_data['instance']].enabled:
+                    .plugin_obj.instances[sid_data['instance']].enabled:
                 continue
+
             config_section = utils.instance_config_section(sid_data['namespace'], sid_data['instance'])
             if not _config[config_section]['enabled']:
                 continue
+            sids_processed.append(sid)
             stream = _config[config_section]['player-stream_type']
             if stream == 'm3u8redirect':
                 uri = sid_data['json']['stream_url']
+                uri = escape(uri)
             else:
-                uri = _base_url + '/' + sid_data['namespace'] + '/watch/' + sid
+                uri = escape(ch_obj.set_uri(sid_data))
             updated_chnum = utils.wrap_chnum(
-                str(sid_data['display_number']), sid_data['namespace'], 
+                str(sid_data['display_number']), sid_data['namespace'],
                 sid_data['instance'], _config)
-            return_xml = return_xml + \
-                ch_templates['xmlLineup'].format(
-                    updated_chnum,
-                    escape(sid_data['display_name']),
-                    uri,
-                    sid_data['json']['HD'])
+            return_xml = return_xml + ch_templates['xmlLineup'].format(
+                updated_chnum,
+                escape(sid_data['display_name']),
+                uri,
+                sid_data['json']['HD'])
     return "<Lineup>" + return_xml + "</Lineup>"
 
 
 class ChannelsURL:
 
-    def __init__(self, _config):
+    def __init__(self, _config, _base_url):
         self.logger = logging.getLogger(__name__)
         self.config = _config
+        self.base_url = _base_url
 
     def update_channels(self, _namespace, _query_data):
         db = DBChannels(self.config)
@@ -241,9 +246,10 @@ def update_channels(self, _namespace, _query_data):
             value = values[0]
             if name == 'enabled':
                 value = int(value)
-            
+
             db_value = None
-            for ch_db in ch_data[uid]: 
+            ch_db = None
+            for ch_db in ch_data[uid]:
                 if ch_db['instance'] == instance:
                     db_value = ch_db[name]
                     break
@@ -252,6 +258,12 @@ def update_channels(self, _namespace, _query_data):
                     lookup_name = self.translate_main2json(name)
                     if lookup_name is not None:
                         value = ch_db['json'][lookup_name]
+                if name == 'display_number':
+                    config_section = utils.instance_config_section(ch_db['namespace'], instance)
+                    start_ch = self.config[config_section].get('channel-start_ch_num')
+                    if start_ch > -1:
+                        results += ''.join(['<li>ERROR: Starting Ch Number setting is not default (-1) [', uid, '][', instance, '][', name, '] not changed', '</li>'])
+                        continue
                 results += ''.join(['<li>Updated [', uid, '][', instance, '][', name, '] to ', str(value), '</li>'])
                 ch_db[name] = value
                 if name == 'thumbnail':
@@ -277,10 +289,10 @@ def get_thumbnail_size(self, _thumbnail):
         if _thumbnail is None or _thumbnail == '':
             return thumbnail_size
         h = {'User-Agent': utils.DEFAULT_USER_AGENT,
-            'Accept': '*/*',
-            'Accept-Encoding': 'identity',
-            'Connection': 'Keep-Alive'
-            }
+             'Accept': '*/*',
+             'Accept-Encoding': 'identity',
+             'Connection': 'Keep-Alive'
+             }
         req = urllib.request.Request(_thumbnail, headers=h)
         with urllib.request.urlopen(req) as resp:
             img_blob = resp.read()
@@ -294,10 +306,22 @@ def set_service_name(self, _sid_data):
         Returns the service name used to sync with the EPG channel name
         """
         updated_chnum = utils.wrap_chnum(
-            str(_sid_data['display_number']), _sid_data['namespace'], 
+            str(_sid_data['display_number']), _sid_data['namespace'],
             _sid_data['instance'], self.config)
         if self.config['epg']['epg_channel_number']:
             return updated_chnum + \
                 ' ' + _sid_data['display_name']
         else:
             return _sid_data['display_name']
+
+    def set_uri(self, _sid_data):
+        if self.config['epg']['epg_use_channel_number']:
+            updated_chnum = utils.wrap_chnum(
+                str(_sid_data['display_number']), _sid_data['namespace'],
+                _sid_data['instance'], self.config)
+            uri = '{}{}/{}/auto/v{}'.format(
+                'http://', self.base_url, _sid_data['namespace'], updated_chnum)
+        else:
+            uri = '{}{}/{}/watch/{}'.format(
+                'http://', self.base_url, _sid_data['namespace'], str(_sid_data['uid']))
+        return uri
\ No newline at end of file
diff --git a/lib/clients/channels/channels_form_html.py b/lib/clients/channels/channels_form_html.py
index 2cc091c..291ccbf 100644
--- a/lib/clients/channels/channels_form_html.py
+++ b/lib/clients/channels/channels_form_html.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -16,17 +16,13 @@
 substantial portions of the Software.
 """
 
-import io
-import urllib
-
-import lib.image_size.get_image_size as get_image_size
 import lib.common.utils as utils
 from lib.common.decorators import getrequest
 from lib.common.decorators import postrequest
 from lib.clients.channels.channels import ChannelsURL
 
 
-@getrequest.route('/api/channels_form')
+@getrequest.route('/api/channelsform')
 def get_channels_form_html(_webserver, _namespace=None, _sort_col=None, _sort_dir=None, filter_dict=None):
     channels_form = ChannelsFormHTML(_webserver.channels_db, _webserver.config)
     if _namespace is None:
@@ -37,10 +33,8 @@ def get_channels_form_html(_webserver, _namespace=None, _sort_col=None, _sort_di
     _webserver.do_mime_response(200, 'text/html', form)
 
 
-@postrequest.route('/api/channels_form')
+@postrequest.route('/api/channelsform')
 def post_channels_html(_webserver):
-    # Take each key and make a [section][key] to store the value
-    channel_changes = {}
     namespace = _webserver.query_data['name'][0]
     sort_col = _webserver.query_data['sort_col'][0]
     sort_dir = _webserver.query_data['sort_dir'][0]
@@ -49,9 +43,9 @@ def post_channels_html(_webserver):
     del _webserver.query_data['sort_dir']
     del _webserver.query_data['sort_col']
     filter_dict = get_filter_data(_webserver.query_data)
-    
+
     if sort_col is None:
-        cu = ChannelsURL(_webserver.config)
+        cu = ChannelsURL(_webserver.config, _webserver.stream_url)
         results = cu.update_channels(namespace, _webserver.query_data)
         _webserver.do_mime_response(200, 'text/html', results)
     else:
@@ -69,6 +63,8 @@ def __init__(self, _channels_db, _config):
         self.num_enabled = 0
         self.sort_column = None
         self.sort_direction = None
+        self.ch_data = None
+        self.filter_dict = None
 
     def get(self, _namespace, _sort_col, _sort_dir, _filter_dict):
         self.sort_column = _sort_col
@@ -77,7 +73,7 @@ def get(self, _namespace, _sort_col, _sort_dir, _filter_dict):
         self.filter_dict = _filter_dict
         sort_data = self.get_db_sort_data(_sort_col, _sort_dir)
         self.ch_data = self.db.get_sorted_channels(self.namespace, None, sort_data[0], sort_data[1])
-        return ''.join([self.header,self.body])
+        return ''.join([self.header, self.body])
 
     def get_db_sort_data(self, _sort_col, _sort_dir):
         if _sort_dir == 'sortdesc':
@@ -116,29 +112,29 @@ def header(self):
             '<script src="/modules/table/table.js"></script>',
             '<link rel="stylesheet" type="text/css" href="/modules/channels/channelsform.css">',
             '</head><body>'
-            ])
+        ])
 
     @property
     def form_header(self):
         header_dir = {
-            'enabled':'sortnone',
-            'instance':'sortnone',
-            'num':'sortnone',
-            'name':'sortnone',
-            'group':'sortnone',
-            'thumbnail':'sortnone',
-            'metadata':'sortnone'
+            'enabled': 'sortnone',
+            'instance': 'sortnone',
+            'num': 'sortnone',
+            'name': 'sortnone',
+            'group': 'sortnone',
+            'thumbnail': 'sortnone',
+            'metadata': 'sortnone'
         }
         header_dir[self.sort_column] = self.sort_direction
-        
+
         return ''.join([
             '<input type="hidden" name="name" value="', self.namespace, '" >',
             '<input type="hidden" name="sort_col" >',
             '<input type="hidden" name="sort_dir" >',
             '<table><tr><td>Total Unique Channels = ', str(self.num_of_channels), '</td></tr>',
-            '<tr><td>Total Enabled Unique Channels = ', str(self.num_enabled), '</td>'
+            '<tr><td>Total Enabled Unique Channels = ', str(self.num_enabled), '</td>',
             '<td style="min-width:18ch; text-align: center">',
-            '<button STYLE="background-color: #E0E0E0;" ',
+            '<button class="button" STYLE="margin:1em" ',
             'type="submit"><b>Save changes</b></button>',
             '</td></tr></table>',
             '<table class="sortable" ><thead><tr>',
@@ -147,11 +143,13 @@ def form_header(self):
             '<label title="enabled=green, disabled=red, disabled dup=violet, duplicate=yellow indicator">',
             '<img class="sortit ', header_dir['enabled'], '">',
             '<img class="filterit"><span class=vertline><img></span></label></th>',
-            '<th style="min-width: 11ch;" class="header"><label title="Table is for a plugin. Each row has an instance for a channel">',
+            '<th style="min-width: 11ch;" class="header"><label title="Table is for a plugin. ',
+            'Each row has an instance for a channel">',
             'instance',
             '<img class="sortit ', header_dir['instance'], '">',
             '<img class="filterit"><span class=vertline><img></span></label></th>',
-            '<th style="min-width: 8ch;" class="header"><label title="Channel number.  DVR may require this to be a number">',
+            '<th style="min-width: 8ch;" class="header"><label title="Channel number.  ',
+            'DVR may require this to be a number">',
             'num',
             '<img class="sortit ', header_dir['num'], '">',
             '<img class="filterit"><span class=vertline><img></span></label></th>',
@@ -159,11 +157,13 @@ def form_header(self):
             'name',
             '<img class="sortit ', header_dir['name'], '">',
             '<img class="filterit"><span class=vertline><img></span></label></th>',
-            '<th style="min-width: 10ch;" class="header"><label title="Group or tag name. Expects only one value. Use blank for empty cells">',
+            '<th style="min-width: 10ch;" class="header"><label title="Group or tag name. Expects only one value. ',
+            'Use blank for empty cells">',
             'group',
             '<img class="sortit ', header_dir['group'], '">',
             '<img class="filterit"><span class=vertline><img></span></label></th>',
-            '<th class="header"><label title="Use http:// https:// or (Linux) file:/// (Windows) file:///C:/ Be careful when using spaces in the path. Use blank for empty cells">',
+            '<th class="header"><label title="Use http:// https:// or (Linux) file:/// (Windows) ',
+            'file:///C:/ Be careful when using spaces in the path. Use blank for empty cells">',
             'thumbnail',
             '<img class="sortit ', header_dir['thumbnail'], '">',
             '<img class="filterit"><span class=vertline><img></span></label></th>',
@@ -194,7 +194,7 @@ def form_header(self):
             '<center>instance</center>'
             '<ul>',
             '<li style="list-style-type:none;">',
-            self.get_filter_text_chkbox('instance'), ' Filter: ', self.get_filter_textbox('instance'), 
+            self.get_filter_text_chkbox('instance'), ' Filter: ', self.get_filter_textbox('instance'),
             '</li>',
             '</ul>',
             '</div>',
@@ -203,7 +203,7 @@ def form_header(self):
             '<center>num</center>'
             '<ul>',
             '<li style="list-style-type:none;">',
-            self.get_filter_text_chkbox('num'), ' Filter: ', self.get_filter_textbox('num'), 
+            self.get_filter_text_chkbox('num'), ' Filter: ', self.get_filter_textbox('num'),
             '</li>',
             '</ul>',
             '</div>',
@@ -211,7 +211,7 @@ def form_header(self):
             '<center>name</center>'
             '<ul>',
             '<li style="list-style-type:none;">',
-            self.get_filter_text_chkbox('name'), ' Filter: ', self.get_filter_textbox('name'), 
+            self.get_filter_text_chkbox('name'), ' Filter: ', self.get_filter_textbox('name'),
             '</li>',
             '</ul>',
             '</div>',
@@ -219,7 +219,7 @@ def form_header(self):
             '<center>group</center>'
             '<ul>',
             '<li style="list-style-type:none;">',
-            self.get_filter_text_chkbox('group'), ' Filter: ', self.get_filter_textbox('group'), 
+            self.get_filter_text_chkbox('group'), ' Filter: ', self.get_filter_textbox('group'),
             '</li>',
             '</ul>',
             '</div>',
@@ -227,7 +227,7 @@ def form_header(self):
             '<center>thumbnail</center>'
             '<ul>',
             '<li style="list-style-type:none;">',
-            self.get_filter_text_chkbox('thumbnail'), ' Filter: ', self.get_filter_textbox('thumbnail'), 
+            self.get_filter_text_chkbox('thumbnail'), ' Filter: ', self.get_filter_textbox('thumbnail'),
             '</li>',
             '</ul>',
             '</div>',
@@ -239,8 +239,7 @@ def form_header(self):
             '</li>',
             '</ul>',
             '</div>',
-            ])
-
+        ])
 
     def get_filter_enable_checkbox(self, _name):
         name = _name + "-mi"
@@ -251,7 +250,6 @@ def get_filter_enable_checkbox(self, _name):
         else:
             return '<input id="' + name + '" name="' + name + '" value="1" type=checkbox>'
 
-
     def get_filter_textbox(self, _name):
         name = _name + "-text"
         if self.filter_dict is not None and self.filter_dict[name] is not None:
@@ -262,18 +260,18 @@ def get_filter_textbox(self, _name):
     def get_filter_text_chkbox(self, _name):
         name = _name + "-checkbox"
         if self.filter_dict is None:
-            return '<input id="text-mi" name="' + name + '" value="1" type=checkbox>'        
+            return '<input id="text-mi" name="' + name + '" value="1" type=checkbox>'
         elif name in self.filter_dict:
             return '<input id="text-mi" name="' + name + '" value="1" type=checkbox checked>'
         else:
             return '<input id="text-mi" name="' + name + '" value="1" type=checkbox>'
-        
+
     @property
     def form(self):
         t = self.table
         forms_html = ''.join(['<form id="channelform" ',
-            'action="/api/channels_form" method="post">',
-            self.form_header, t, '</form>'])
+                              'action="/api/channelsform" method="post">',
+                              self.form_header, t, '</form>'])
         return forms_html
 
     @property
@@ -309,31 +307,34 @@ def table(self):
                     vod = 'Live'
             else:
                 vod = ''
-                
+
             max_image_size = self.lookup_config_size()
             if sid_data['thumbnail_size'] is not None:
                 image_size = sid_data['thumbnail_size']
                 thumbnail_url = utils.process_image_url(self.config, sid_data['thumbnail'])
-                if max_image_size is None:
-                    display_image = ''.join(['<img border=1 src="', thumbnail_url, '">'])
-                elif max_image_size == 0:
-                    display_image = ''
-                else:
-                    if image_size[0] < max_image_size:
-                        img_width = str(image_size[0])
+                if thumbnail_url:
+                    if max_image_size is None:
+                        display_image = ''.join(['<img border=1 src="', thumbnail_url, '">'])
+                    elif max_image_size == 0:
+                        display_image = ''
                     else:
-                        img_width = str(max_image_size)
-                    display_image = ''.join(['<img width="', img_width, '" border=1 src="', thumbnail_url, '">'])
+                        if image_size[0] < max_image_size:
+                            img_width = str(image_size[0])
+                        else:
+                            img_width = str(max_image_size)
+                        display_image = ''.join(['<img width="', img_width, '" border=1 src="', str(thumbnail_url), '">'])
+                else:
+                    display_image = ''
+                    image_size = 'UNK'
             else:
                 display_image = ''
                 image_size = 'UNK'
-                img_width = 0
 
             if sid_data['json']['groups_other'] is None:
                 groups_other = ''
             else:
                 groups_other = str(sid_data['json']['groups_other'])
-                
+
             if sid_data['json']['thumbnail_size'] is not None:
                 original_size = sid_data['json']['thumbnail_size']
             else:
@@ -348,13 +349,13 @@ def table(self):
                 '">',
                 '</td>',
                 '<td style="text-align: center">', instance, '</td>',
-                '<td style="text-align: center">', 
+                '<td style="text-align: center">',
                 self.get_input_text(sid_data, sid, instance, 'display_number'), '</td>',
-                '<td style="text-align: center">', 
+                '<td style="text-align: center">',
                 self.get_input_text(sid_data, sid, instance, 'display_name'), '</td>',
-                '<td style="text-align: center">', 
+                '<td style="text-align: center">',
                 self.get_input_text(sid_data, sid, instance, 'group_tag'), '</td>',
-                '<td><table width="100%"><tr><td style="border: none; background: none;">', 
+                '<td><table width="100%"><tr><td style="border: none; background: none;">',
                 self.get_input_text(sid_data, sid, instance, 'thumbnail'),
                 '</td></tr><tr><td style="border: none; background: none;">',
                 display_image,
@@ -362,57 +363,60 @@ def table(self):
                 'size=', str(image_size), '   original_size=', str(original_size),
                 '</td></tr></table></td>',
                 '<td style="text-align: center">', quality, ' ', vod, ' ',
-                sid_data['json']['callsign'], ' ', sid,'<br>',
+                sid_data['json']['callsign'], ' ', sid, '<br>',
                 groups_other,
                 '</td>',
                 '</tr>'
-                ])
+            ])
             table_html += row
         self.num_of_channels = len(sids_processed.keys())
-        self.num_enabled = sum(x == True for x in sids_processed.values())
+        self.num_enabled = sum(x for x in sids_processed.values())
         return ''.join([table_html, '</tbody></table>'])
 
     def get_input_text(self, _sid_data, _sid, _instance, _title):
         if _sid_data[_title] is not None:
-            size = len(_sid_data[_title]) 
-            if size > 30:
+            size = len(_sid_data[_title])
+            if size > 25:
                 rows = 1
                 if size > 70:
                     rows = 2
                 return ''.join(['<textarea name="',
-                    self.get_input_name(_sid, _instance, _title),
-                    '" rows=', str(rows), ' cols=22>', _sid_data[_title], 
-                    '</textarea>'])
+                                self.get_input_name(_sid, _instance, _title),
+                                '" rows=', str(rows), ' cols=22>', _sid_data[_title],
+                                '</textarea>'])
             else:
-                if size > 24:
+                if size > 20:
                     size = 20
                 elif size < 3:
                     size = 3
+                elif size < 13:
+                    size = size + 1
                 return ''.join(['<input type="text" name="',
-                    self.get_input_name(_sid, _instance, _title),
-                    '" value="', _sid_data[_title], 
-                    '" size="', str(int(size*.9)), '">'])
+                                self.get_input_name(_sid, _instance, _title),
+                                '" value="', _sid_data[_title],
+                                '" style="width:', str(int(size)), 'ch">'])
         else:
             return ''.join(['<input type="text" name="',
-                self.get_input_name(_sid, _instance, _title),
-                '" size="5">'])
-
+                            self.get_input_name(_sid, _instance, _title),
+                            '" size="5">'])
 
     def get_input_name(self, _sid, _instance, _title):
         _sid = _sid.replace('-', '%2d')
-        return  ''.join([_sid, '-', _instance, '-', _title])
+        return ''.join([_sid, '-', _instance, '-', _title])
 
     @property
     def body(self):
         return ''.join([
             '<section id="status"></section>',
             self.form,
-            '<footer><p>Clearing any field and saving will revert to the default value. Sorting a column will clear any filters applied. ',
-            ' Help is provided on the column titles.',
-            ' First column displays the status of the channel: either enabled, disabled or duplicate (enabled or disabled).',
-            ' The thumbnail field must have an entry; not using the thumbnail is a configuration parameter under Settings - Clients - EPG.',
+            '<footer><p>Clearing any field and saving will revert to the default value. Sorting ',
+            'a column will clear any filters applied. Help is provided on the column titles. ',
+            'First column displays the status of the channel: either enabled, disabled or duplicate',
+            ' (enabled or disabled). The thumbnail field must have an entry; not using the ',
+            'thumbnail is a configuration parameter under Settings - Clients - EPG.',
             ' Thumbnail filtering is only on the URL.',
-            ' The size of the thumbnail presented in the table is set using the configuration parameter under Settings - Internal - Channels.</p>',
+            ' The size of the thumbnail presented in the table is set using the configuration',
+            ' parameter under Settings - Internal - Channels.</p>',
             '</footer></body>'])
 
     def lookup_config_size(self):
@@ -435,10 +439,11 @@ def lookup_config_size(self):
             return None
 
 
-
 def get_filter_data(query_data):
-    filter_names_list = ['enabled-mi', 'duplicate-mi', 'disabled-mi', 'duplicate_disabled-mi',
-        'instance-checkbox', 'instance-text', 'num-text', 'num-checkbox', 'name-text', 'name-checkbox', 'group-text', 
+    filter_names_list = [
+        'enabled-mi', 'duplicate-mi', 'disabled-mi', 'duplicate_disabled-mi',
+        'instance-checkbox', 'instance-text', 'num-text', 'num-checkbox', 'name-text', 'name-checkbox',
+        'group-text',
         'group-checkbox', 'thumbnail-text', 'thumbnail-checkbox',
         'metadata-text', 'metadata-checkbox']
     filter_dict = {}
diff --git a/lib/clients/channels/channels_html.py b/lib/clients/channels/channels_html.py
index 4f7463b..2079ff8 100644
--- a/lib/clients/channels/channels_html.py
+++ b/lib/clients/channels/channels_html.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -16,8 +16,6 @@
 substantial portions of the Software.
 """
 
-import json
-
 from lib.common.decorators import getrequest
 
 
@@ -34,6 +32,7 @@ def __init__(self, _channels_db):
         self.db = _channels_db
         self.config = None
         self.active_tab_name = None
+        self.tab_names = None
 
     def get(self):
         self.tab_names = self.get_channels_tabs()
@@ -53,7 +52,7 @@ def header(self):
             '<link rel="stylesheet" type="text/css" href="/modules/table/table.css">',
             '<script src="/modules/tabs/tabs.js"></script>',
             '<script src="/modules/channels/channels.js"></script></head>'
-            ])
+        ])
 
     @property
     def title(self):
@@ -64,25 +63,25 @@ def title(self):
 
     @property
     def tabs(self):
-        active_tab = ' activeTab'
-        tabs_html = ''.join(['<ul class="tabs">',
-                '<li><a id="none" class="',
-                ' configTab activeTab', 
-                '" href="#" ',
-                '>',
-                '</a></li>'
-            ])
+        tabs_html = ''.join([
+            '<ul class="tabs">',
+            '<li><a id="none" class="',
+            ' configTab activeTab',
+            '" href="#" ',
+            '>',
+            '</a></li>'
+        ])
         for name in self.tab_names.keys():
-            tabs_html = ''.join([tabs_html,
+            tabs_html = ''.join([
+                tabs_html,
                 '<li><a id="tab', name, '" class="form',
                 name, ' configTab',
-                '" href="#" onclick=\'load_form_url("/api/channels_form?name=',
+                '" href="#" onclick=\'load_form_url("/api/channelsform?name=',
                 name, '")\'>',
                 '<i class="md-icon tabIcon">view_list',
                 '</i>',
                 name, '</a></li>'
             ])
-            active_tab = ''
             self.active_tab_name = name
         tabs_html = ''.join([tabs_html, '</ul>'])
         return tabs_html
@@ -93,7 +92,7 @@ def body(self):
             self.title,
             self.tabs,
             '<div id="tablecontent">Select Tab to Edit</div>'
-            ])
+        ])
 
     def get_channels_tabs(self):
         ch_list = self.db.get_channel_names()
@@ -101,4 +100,3 @@ def get_channels_tabs(self):
         for ch_names in ch_list:
             return_list[ch_names['namespace']] = None
         return return_list
-
diff --git a/lib/clients/channels/templates.py b/lib/clients/channels/templates.py
index 11e606e..0aaaaf8 100644
--- a/lib/clients/channels/templates.py
+++ b/lib/clients/channels/templates.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -20,11 +20,10 @@
 
     'jsonLineup':
         """{{
-            "ChannelId": "{}",
             "CallSign": "{}",
             "GuideNumber": "{}",
             "GuideName": "{}",
-            "URL": "http://{}",
+            "URL": "{}",
             "HD": {}
         }}""",
 
@@ -32,7 +31,7 @@
         """<Program>
             <GuideNumber>{}</GuideNumber>
             <GuideName>{}</GuideName>
-            <URL>http://{}</URL>
+            <URL>{}</URL>
             <HD>{}</HD>
         </Program>"""
 
diff --git a/lib/clients/epg2xml.py b/lib/clients/epg2xml.py
index 25da41c..187ecd3 100644
--- a/lib/clients/epg2xml.py
+++ b/lib/clients/epg2xml.py
@@ -2,7 +2,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -29,7 +29,6 @@
 from lib.common.decorators import getrequest
 from lib.db.db_channels import DBChannels
 from lib.db.db_epg import DBepg
-from lib.db.db_plugins import DBPlugins
 from lib.web.pages.templates import web_templates
 
 
@@ -39,7 +38,8 @@ def xmltv_xml(_webserver):
         epg = EPG(_webserver)
         epg.get_epg_xml(_webserver)
     except MemoryError as e:
-        self.do_mime_response(501, 'text/html', 
+        _webserver.do_mime_response(
+            501, 'text/html',
             web_templates['htmlError'].format('501 - MemoryError: {}'.format(e)))
 
 
@@ -56,27 +56,41 @@ def __init__(self, _webserver):
         self.instance = _webserver.query_data['instance']
         self.tv_tag = False
         self.today = datetime.datetime.utcnow().date()
+        self.prog_processed = []
 
     def get_next_epg_day(self):
         is_enabled = False
+        day_data = None
+        ns = None
+        inst = None
+        day = None
         while not is_enabled:
             day_data, ns, inst, day = self.epg_db.get_next_row()
             if day_data is None:
-                is_enabled = True
                 break
             if day < self.today:
                 continue
             config_section = utils.instance_config_section(ns, inst)
-            if not self.config[ns.lower()]['enabled']:
-                continue
-            if not self.config[config_section]['enabled']:
-                continue
-            if not self.config[config_section]['epg-enabled']:
+            
+            if not self.config.get(ns.lower()) \
+                    or not self.config[ns.lower()]['enabled'] \
+                    or not self.config.get(config_section) \
+                    or not self.config[config_section]['enabled'] \
+                    or not self.config[config_section].get('epg-enabled'):
                 continue
             is_enabled = True
         return day_data, ns, inst, day
 
     def get_epg_xml(self, _webserver):
+        xml_out = None
+        
+        if self.namespace is not None \
+                and not self.plugins.plugins.get(self.namespace):
+            _webserver.do_mime_response(
+                501, 'text/html',
+                web_templates['htmlError'].format('501 - Invalid Namespace: {}'.format(self.namespace)))
+            return
+
         try:
             _webserver.do_dict_response({
                 'code': 200,
@@ -89,19 +103,20 @@ def get_epg_xml(self, _webserver):
             xml_out = None
 
             self.epg_db.init_get_query(self.namespace, self.instance)
-            
+
             day_data, ns, inst, day = self.get_next_epg_day()
-            self.logger.debug('Processing EPG data {}:{} {}' \
-                .format(ns, inst, day))
+            self.logger.debug('Processing EPG data {}:{} {}'
+                              .format(ns, inst, day))
             self.prog_processed = []
             while day_data:
-                xml_out = self.gen_minimal_header_xml()
+                xml_out = EPG.gen_minimal_header_xml()
                 self.gen_program_xml(xml_out, day_data, channel_list, ns, inst)
                 self.write_xml(xml_out)
                 xml_out.clear()
                 day_data, ns, inst, day = self.get_next_epg_day()
-                self.logger.debug('Processing EPG data {}:{} {}' \
-                    .format(ns, inst, day))
+                self.logger.debug('Processing EPG data {}:{} {}'
+                                  .format(ns, inst, day))
+            day_data = None
             self.epg_db.close_query()
             self.webserver.wfile.write(b'</tv>\r\n')
             self.webserver.wfile.flush()
@@ -112,8 +127,8 @@ def get_epg_xml(self, _webserver):
             # Check we hit a broken pipe when trying to write back to the client
             if ex.errno in [errno.EPIPE, errno.ECONNABORTED, errno.ECONNRESET, errno.ECONNREFUSED]:
                 # Normal process.  Client request end of stream
-                self.logger.info('Connection dropped by client {}' \
-                    .format(ex))
+                self.logger.info('Connection dropped by client {}'
+                                 .format(ex))
                 xml_out.clear()
                 return
             else:
@@ -121,7 +136,7 @@ def get_epg_xml(self, _webserver):
                     'UNEXPECTED EXCEPTION=', ex))
                 raise
 
-        xml_out = None
+        xml_out = None   # clear to help garbage collection
 
     def write_xml(self, _xml, keep_xml_prolog=False):
         if self.config['epg']['epg_prettyprint']:
@@ -153,8 +168,8 @@ def write_xml(self, _xml, keep_xml_prolog=False):
                     epg_dom = re.sub(b'</tv>$', b'', epg_dom)
                 else:
                     epg_dom = re.sub(b'" />$', b'">', epg_dom)
-            self.webserver.wfile.write(epg_dom+b'\r\n')
-        epg_dom = None
+            self.webserver.wfile.write(epg_dom + b'\r\n')
+        epg_dom = None      # clear to help garbage collection
         return True
 
     def gen_channel_xml(self, _et_root, _channel_list):
@@ -167,33 +182,41 @@ def gen_channel_xml(self, _et_root, _channel_list):
                 if not ch_data['enabled']:
                     continue
                 config_section = utils.instance_config_section(ch_data['namespace'], ch_data['instance'])
-                if not self.config[ch_data['namespace'].lower()]['enabled']:
-                    continue
-                if not self.config[config_section]['enabled']:
-                    continue
-                if not self.config[config_section]['epg-enabled']:
+                if not self.config.get(ch_data['namespace'].lower()) \
+                        or not self.config[ch_data['namespace'].lower()]['enabled'] \
+                        or not self.config.get(config_section) \
+                        or not self.config[config_section]['enabled'] \
+                        or not self.config[config_section].get('epg-enabled'):
                     continue
 
                 updated_chnum = utils.wrap_chnum(
                     ch_data['display_number'], ch_data['namespace'],
                     ch_data['instance'], self.config)
-                c_out = EPG.sub_el(_et_root, 'channel', id=sid)
+                if self.config['epg'].get('epg_add_plugin_to_channel_id'):
+                    ch_ref = ch_data['namespace'] + '-'
+                else:
+                    ch_ref = ''
+                if self.config['epg'].get('epg_use_channel_number'):
+                    ch_ref += updated_chnum
+                else:
+                    ch_ref += sid
+                c_out = EPG.sub_el(_et_root, 'channel', id=ch_ref)
 
                 EPG.sub_el(c_out, 'display-name', _text='%s %s' %
-                    (updated_chnum, ch_data['display_name']))
+                                                        (updated_chnum, ch_data['display_name']))
                 EPG.sub_el(c_out, 'display-name', _text=ch_data['display_name'])
                 EPG.sub_el(c_out, 'display-name', _text=ch_data['json']['callsign'])
-                EPG.sub_el(c_out, 'display-name', _text='%s %s' % 
-                    (updated_chnum, ch_data['json']['callsign']))
+                EPG.sub_el(c_out, 'display-name', _text='%s %s' %
+                                                        (updated_chnum, ch_data['json']['callsign']))
 
                 if self.config['epg']['epg_channel_icon'] and ch_data['thumbnail'] is not None:
                     EPG.sub_el(c_out, 'icon', src=ch_data['thumbnail'])
                 break
         return _et_root
-    
+
     def gen_program_xml(self, _et_root, _prog_list, _channel_list, _ns, _inst):
         for prog_data in _prog_list:
-            proginfo = prog_data['start']+prog_data['channel']
+            proginfo = prog_data['start'] + prog_data['channel']
             if proginfo in self.prog_processed:
                 continue
             skip = False
@@ -219,10 +242,23 @@ def gen_program_xml(self, _et_root, _prog_list, _channel_list, _ns, _inst):
             if skip:
                 continue
             self.prog_processed.append(proginfo)
-            prog_out = EPG.sub_el(_et_root, 'programme', 
-                start=prog_data['start'], 
-                stop=prog_data['stop'], 
-                channel=prog_data['channel'])
+
+            if self.config['epg'].get('epg_add_plugin_to_channel_id'):
+                ch_ref = ch_data['namespace'] + '-'
+            else:
+                ch_ref = ''
+            if self.config['epg'].get('epg_use_channel_number'):
+                ch_data = _channel_list[prog_data['channel']][0]
+                updated_chnum = utils.wrap_chnum(
+                    ch_data['display_number'], ch_data['namespace'],
+                    ch_data['instance'], self.config)
+                ch_ref += updated_chnum
+            else:
+                ch_ref += prog_data['channel']
+            prog_out = EPG.sub_el(_et_root, 'programme',
+                                  start=prog_data['start'],
+                                  stop=prog_data['stop'],
+                                  channel=ch_ref)
             if prog_data['title']:
                 EPG.sub_el(prog_out, 'title', lang='en', _text=prog_data['title'])
             if prog_data['subtitle']:
@@ -253,10 +289,10 @@ def gen_program_xml(self, _et_root, _prog_list, _channel_list, _ns, _inst):
 
             if prog_data['air_date']:
                 EPG.sub_el(prog_out, 'date',
-                    _text=prog_data['air_date'])
+                           _text=prog_data['air_date'])
 
             EPG.sub_el(prog_out, 'length', units='minutes', _text=str(prog_data['length']))
-            
+
             if prog_data['genres']:
                 for f in prog_data['genres']:
                     if self.config['epg']['genre'] == 'normal':
@@ -266,7 +302,7 @@ def gen_program_xml(self, _et_root, _prog_list, _channel_list, _ns, _inst):
                             f = epg_category.TVHEADEND[f]
                     else:
                         self.logger.warning('Config value [epg][genre] is invalid: '
-                            + self.config['epg']['genre'])
+                                            + self.config['epg']['genre'])
                     EPG.sub_el(prog_out, 'category', lang='en', _text=f.strip())
 
             if prog_data['icon'] and self.config['epg']['epg_program_icon']:
@@ -287,15 +323,15 @@ def gen_program_xml(self, _et_root, _prog_list, _channel_list, _ns, _inst):
 
             if prog_data['se_common']:
                 EPG.sub_el(prog_out, 'episode-num', system='common',
-                    _text=prog_data['se_common'])
+                           _text=prog_data['se_common'])
                 EPG.sub_el(prog_out, 'episode-num', system='SxxExx',
-                    _text=prog_data['se_common'])
+                           _text=prog_data['se_common'])
             if prog_data['se_progid']:
                 EPG.sub_el(prog_out, 'episode-num', system='dd_progid',
-                    _text=prog_data['se_progid'])
+                           _text=prog_data['se_progid'])
             if prog_data['se_xmltv_ns']:
                 EPG.sub_el(prog_out, 'episode-num', system='xmltv_ns',
-                    _text=prog_data['se_xmltv_ns'])
+                           _text=prog_data['se_xmltv_ns'])
             if prog_data['is_new']:
                 EPG.sub_el(prog_out, 'new')
             else:
@@ -308,23 +344,22 @@ def gen_program_xml(self, _et_root, _prog_list, _channel_list, _ns, _inst):
     def gen_header_xml(self):
         if self.namespace is None:
             website = utils.CABERNET_URL
-            name = utils.CABERNET_NAMESPACE
+            name = utils.CABERNET_ID
         else:
             website = self.plugins.plugins[self.namespace].plugin_settings['website']
             name = self.plugins.plugins[self.namespace].plugin_settings['name']
-        
+
         xml_out = ElementTree.Element('tv')
         xml_out.set('source-info-url', website)
         xml_out.set('source-info-name', name)
-        xml_out.set('generator-info-name', utils.CABERNET_NAMESPACE)
+        xml_out.set('generator-info-name', utils.CABERNET_ID)
         xml_out.set('generator-info-url', utils.CABERNET_URL)
-        xml_out.set('generator-special-thanks', 'locast2plex')
         return xml_out
 
-    def gen_minimal_header_xml(self):
+    @staticmethod
+    def gen_minimal_header_xml():
         return ElementTree.Element('tv')
 
-
     @staticmethod
     def sub_el(_parent, _name, _text=None, **kwargs):
         el = ElementTree.SubElement(_parent, _name, **kwargs)
diff --git a/lib/clients/hdhr/__init__.py b/lib/clients/hdhr/__init__.py
index ab47cd9..2caff27 100644
--- a/lib/clients/hdhr/__init__.py
+++ b/lib/clients/hdhr/__init__.py
@@ -1 +1 @@
-import lib.clients.hdhr.hdhr_urls
\ No newline at end of file
+import lib.clients.hdhr.hdhr_urls
diff --git a/lib/clients/hdhr/hdhr_server.py b/lib/clients/hdhr/hdhr_server.py
index 776aa89..5aaaec2 100644
--- a/lib/clients/hdhr/hdhr_server.py
+++ b/lib/clients/hdhr/hdhr_server.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -31,7 +31,6 @@
 
 import lib.common.utils as utils
 
-
 HDHR_PORT = 65001
 HDHR_ADDR = '224.0.0.255'  # multicast to local addresses only
 # HDHR_ADDR = '239.255.255.250'
@@ -77,13 +76,13 @@ def hdhr_process(config, _tuner_queue):
         return
 
     try:
-        net = IPv4Network(config['hdhomerun']['udp_netmask'])
+        IPv4Network(config['hdhomerun']['udp_netmask'])
     except (ipaddress.AddressValueError, ValueError) as err:
         logger.error(
             'Illegal value in [hdhomerun][udp_netmask].  '
             'Format must be #.#.#.#/#. Exiting hdhr service. ERROR: {}'.format(err))
         return
-        
+
     hdhr = HDHRServer(config, _tuner_queue)
     # startup the multicast thread first which will exit when this function exits
     p_multi = Process(target=hdhr.run_multicast, args=(config["web"]["bind_ip"],))
@@ -97,6 +96,7 @@ def hdhr_process(config, _tuner_queue):
 
 
 def hdhr_validate_device_id(_device_id):
+    global logger
     hex_digits = set(string.hexdigits)
     if len(_device_id) != 8:
         logger.error('ERROR: HDHR Device ID must be 8 hexidecimal values')
@@ -121,6 +121,7 @@ def hdhr_validate_device_id(_device_id):
 
 # given a device id, will adjust the last 4 bits to make it valid and return the integer value
 def hdhr_get_valid_device_id(_device_id):
+    global logger
     hex_digits = set(string.hexdigits)
     if len(_device_id) != 8:
         logger.error('ERROR: HDHR Device ID must be 8 hexadecimal values')
@@ -179,7 +180,7 @@ def run_listener(self, _bind_ip=''):
         self.sock_listener.listen(3)
 
         self._t = Thread(target=self.process_queue,
-            args=(self.tuner_queue,))
+                         args=(self.tuner_queue,))
         self._t.daemon = True
         self._t.start()
 
@@ -410,7 +411,7 @@ def datagram_received(self, _data, _host_port):
                        self.config['web']['plex_accessible_ip'] + \
                        ':' + str(self.config['web']['web_admin_port'])
             base_url_msg = b'\x2a' + utils.set_str(base_url.encode(), False)
-            
+
             namespace = None
             for area, area_data in self.config.items():
                 if 'player-tuner_count' in area_data.keys():
diff --git a/lib/clients/hdhr/hdhr_urls.py b/lib/clients/hdhr/hdhr_urls.py
index 6e26799..8982ae3 100644
--- a/lib/clients/hdhr/hdhr_urls.py
+++ b/lib/clients/hdhr/hdhr_urls.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -16,54 +16,67 @@
 substantial portions of the Software.
 """
 
-from .templates import hdhr_templates
-from lib.common.decorators import getrequest
-from lib.common.decorators import postrequest
 import lib.common.utils as utils
+import lib.clients.hdhr.hdhr_server as hdhr_server
 
 from lib.web.pages.templates import web_templates
+from lib.common.decorators import getrequest
+from lib.common.decorators import postrequest
+from .templates import hdhr_templates
 
 
 @getrequest.route('/discover.json')
 def discover_json(_webserver):
     ns_inst_path = _webserver.get_ns_inst_path(_webserver.query_data)
-    if _webserver.query_data['name'] is None:
+    name = _webserver.query_data['name']
+    if name is None:
         name = ''
+        hdhr_id =  _webserver.config['hdhomerun']['hdhr_id']
     else:
-        name = _webserver.query_data['name']+' '
+        namespace = name
+        name = namespace + ' '
+        hdhr_id = _webserver.config[namespace.lower()].get('hdhr_id')
+        if not hdhr_id:
+            hdhr_id = _webserver.config['hdhomerun']['hdhr_id']
         
     namespace = None
     for area, area_data in _webserver.config.items():
         if 'player-tuner_count' in area_data.keys():
             namespace = area
-
     _webserver.do_mime_response(200,
-        'application/json',
-        hdhr_templates['jsonDiscover'].format(
-            name+_webserver.config['hdhomerun']['reporting_friendly_name'],
-            _webserver.config['hdhomerun']['reporting_model'],
-            _webserver.config['hdhomerun']['reporting_firmware_name'],
-            _webserver.config['main']['version'],
-            _webserver.config['hdhomerun']['hdhr_id'],
-            _webserver.config[namespace]['player-tuner_count'],
-            _webserver.web_admin_url, ns_inst_path))
+                                'application/json',
+                                hdhr_templates['jsonDiscover'].format(
+                                    name + _webserver.config['hdhomerun']['reporting_friendly_name'],
+                                    _webserver.config['hdhomerun']['reporting_model'],
+                                    _webserver.config['hdhomerun']['reporting_firmware_name'],
+                                    _webserver.config['main']['version'],
+                                    hdhr_id,
+                                    _webserver.config[namespace]['player-tuner_count'],
+                                    _webserver.web_admin_url, ns_inst_path))
 
 
 @getrequest.route('/device.xml')
 def device_xml(_webserver):
-    if _webserver.query_data['name'] is None:
+    name = _webserver.query_data['name']
+    if name is None:
         name = ''
+        hdhr_id =  _webserver.config['hdhomerun']['hdhr_id']
     else:
-        name = _webserver.query_data['name']+' '
+        namespace = name
+        name = namespace + ' '
+        hdhr_id = _webserver.config[namespace.lower()].get('hdhr_id')
+        if not hdhr_id:
+            hdhr_id = _webserver.config['hdhomerun']['hdhr_id']
+
     _webserver.do_mime_response(200,
-        'application/xml',
-        hdhr_templates['xmlDevice'].format(
-            name+_webserver.config['hdhomerun']['reporting_friendly_name'],
-            _webserver.config['hdhomerun']['reporting_model'],
-            _webserver.config['hdhomerun']['hdhr_id'],
-            _webserver.config['main']['uuid'],
-            utils.CABERNET_URL
-        ))
+                                'application/xml',
+                                hdhr_templates['xmlDevice'].format(
+                                    name + _webserver.config['hdhomerun']['reporting_friendly_name'],
+                                    _webserver.config['hdhomerun']['reporting_model'],
+                                    hdhr_id,
+                                    _webserver.config['main']['uuid'],
+                                    utils.CABERNET_URL
+                                ))
 
 
 @getrequest.route('/lineup_status.json')
@@ -76,7 +89,7 @@ def lineup_status_json(_webserver):
         _webserver.scan_state += 20
         if _webserver.scan_state > 100:
             _webserver.scan_state = 100
-        num_of_channels = len(_webserver.channels_db.get_channels(_webserver.query_data['name'], None))
+        num_of_channels = len(_webserver.channels_db.get_channels(_webserver.query_data['name'], None, True))
         return_json = hdhr_templates['jsonLineupStatusScanning'].format(
             _webserver.scan_state,
             int(num_of_channels * _webserver.scan_state / 100))
@@ -99,6 +112,7 @@ def lineup_post(_webserver):
         _webserver.update_scan_status(_webserver.query_data['name'], 'Idle')
     else:
         _webserver.logger.warning("Unknown scan command " + _webserver.query_data['scan'])
-        _webserver.do_mime_response(400, 'text/html',
+        _webserver.do_mime_response(
+            400, 'text/html',
             web_templates['htmlError'].format(
                 _webserver.query_data['scan'] + ' is not a valid scan command'))
diff --git a/lib/clients/hdhr/templates.py b/lib/clients/hdhr/templates.py
index 51a9b48..058ee76 100644
--- a/lib/clients/hdhr/templates.py
+++ b/lib/clients/hdhr/templates.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
diff --git a/lib/clients/ssdp/ssdp_server.py b/lib/clients/ssdp/ssdp_server.py
index d90cda0..99bcaa7 100644
--- a/lib/clients/ssdp/ssdp_server.py
+++ b/lib/clients/ssdp/ssdp_server.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -37,10 +37,10 @@
 def ssdp_process(config):
     ssdp = SSDPServer(config)
     ssdp.register('local',
-        'uuid:' + config["main"]["uuid"] + '::upnp:rootdevice',
-        'upnp:rootdevice',
-        'http://' + config["web"]["plex_accessible_ip"] + ':' +
-        str(config["web"]["web_admin_port"]) + '/device.xml')
+                  'uuid:' + config["main"]["uuid"] + '::upnp:rootdevice',
+                  'upnp:rootdevice',
+                  'http://' + config["web"]["plex_accessible_ip"] + ':' +
+                  str(config["web"]["web_admin_port"]) + '/device.xml')
 
     ssdp.run(config["web"]["bind_ip"])
 
@@ -58,16 +58,18 @@ def __init__(self, _config):
         self.logger = logging.getLogger(__name__)
 
     def run(self, _bind_ip=''):
-    
+
         if self.config['ssdp']['udp_netmask'] is None:
             self.logger.error('Config setting [ssdp][udp_netmask] required. Exiting ssdp service')
             return
         try:
-            net = IPv4Network(self.config['ssdp']['udp_netmask'])
+            IPv4Network(self.config['ssdp']['udp_netmask'])
         except (ipaddress.AddressValueError, ValueError) as err:
-            self.logger.error('Illegal value in [ssdp][udp_netmask].  Format must be #.#.#.#/#. Exiting hdhr service. ERROR: {}'.format(err))
+            self.logger.error(
+                'Illegal value in [ssdp][udp_netmask].  Format must be #.#.#.#/#. Exiting hdhr service. ERROR: {}'
+                .format(err))
             return
-    
+
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM, socket.IPPROTO_UDP)
         self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
         if hasattr(socket, "SO_REUSEPORT"):
@@ -146,7 +148,7 @@ def datagram_received(self, data, host_port):
             self.logger.debug('Unknown SSDP command %s %s' % (cmd[0], cmd[1]))
 
     def register(self, manifestation, usn, st, location, server=SERVER_ID,
-            cache_control='max-age=1800', silent=False, host=None):
+                 cache_control='max-age=1800', silent=False, host=None):
         """Register a service or device that this SSDP server will
         respond to."""
 
diff --git a/lib/clients/web_admin.py b/lib/clients/web_admin.py
index 19d9106..e6a23c9 100644
--- a/lib/clients/web_admin.py
+++ b/lib/clients/web_admin.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -34,7 +34,7 @@
 
 @filerequest.route('/html/', '/images/', '/modules/')
 def lib_web_htdocs(_webserver):
-    valid_check = re.match(r'^(/([A-Za-z0-9\._\-]+)/[A-Za-z0-9\._\-/]+)[?%&A-Za-z0-9\._\-/=]*$', _webserver.path)
+    valid_check = re.match(r'^(/([A-Za-z0-9._\-]+)/[A-Za-z0-9._\-/]+)[?%&A-Za-z0-9._\-/=]*$', _webserver.path)
     if not valid_check:
         return False
     file_path = valid_check.group(1)
@@ -47,13 +47,13 @@ def lib_web_htdocs(_webserver):
 
 @filerequest.route('/temp/')
 def data_web(_webserver):
-    valid_check = re.match(r'^(/([A-Za-z0-9\._\-]+)/[A-Za-z0-9\._\-/]+)[?%&A-Za-z0-9\._\-/=]*$', _webserver.path)
+    valid_check = re.match(r'^(/([A-Za-z0-9._\-]+)/[A-Za-z0-9._\-/]+)[?%&A-Za-z0-9._\-/=]*$', _webserver.path)
     if not valid_check:
         return False
     url_path = valid_check.group(1)
 
-    temp_path = pathlib.Path(_webserver.config['paths']['data_dir'],
-        'web')
+    temp_path = pathlib.Path(
+        _webserver.config['paths']['data_dir'], 'web')
     if not temp_path.exists():
         return False
     path_list = url_path.split('/')
@@ -64,7 +64,7 @@ def data_web(_webserver):
 @getrequest.route('/tunerstatus')
 def tunerstatus(_webserver):
     _webserver.send_response(302)
-    _webserver.send_header('Location',  '{}{}{}'.format('http://', _webserver.stream_url, '/tunerstatus'))
+    _webserver.send_header('Location', '{}{}{}'.format('http://', _webserver.stream_url, '/tunerstatus'))
     _webserver.end_headers()
 
 
@@ -75,9 +75,11 @@ class WebAdminHttpHandler(WebHTTPHandler):
     def __init__(self, *args):
         os.chdir(os.path.dirname(os.path.abspath(__file__)))
         self.script_dir = pathlib.Path(os.path.dirname(os.path.abspath(__file__)))
-        self.stream_url = self.config['web']['plex_accessible_ip'] + \
-            ':' + str(self.config['web']['plex_accessible_port'])
-        self.web_admin_url = self.config['web']['plex_accessible_ip'] + \
+        self.stream_url = \
+            self.config['web']['plex_accessible_ip'] + ':' + \
+            str(self.config['web']['plex_accessible_port'])
+        self.web_admin_url = \
+            self.config['web']['plex_accessible_ip'] + \
             ':' + str(self.config['web']['web_admin_port'])
         self.content_path = None
         self.query_data = None
@@ -85,16 +87,15 @@ def __init__(self, *args):
         try:
             super().__init__(*args)
         except ConnectionResetError as ex:
-            self.logger.warning('ConnectionResetError occurred, will try again {}'.format(str(ex)))
+            self.logger.notice('ConnectionResetError occurred on incoming URL request, will try again {}'.format(str(ex)))
             time.sleep(1)
             super().__init__(*args)
         except ValueError as ex:
             self.logger.warning('ValueError occurred, Possible Bad stream recieved.  {}'.format(str(ex)))
-        
 
     def do_GET(self):
         try:
-            valid_check = re.match(r'^(/([A-Za-z0-9\._\-]+)/[A-Za-z0-9\._\-/]+)[?%&A-Za-z0-9\._\-/=]*$', self.path)
+            valid_check = re.match(r'^(/([A-Za-z0-9._\-]+)/[A-Za-z0-9._\-/]+)[?%&A-Za-z0-9._\-/=]*$', self.path)
             self.content_path, self.query_data = self.get_query_data()
             self.plugins.config_obj.refresh_config_data()
             utils.start_mem_trace(self.config)
@@ -105,16 +106,16 @@ def do_GET(self):
                 pass
             else:
                 self.logger.notice('UNKNOWN HTTP Request {}'.format(self.content_path))
-                self.do_mime_response(501, 'text/html', 
-                    web_templates['htmlError'].format('501 - Not Implemented'))
+                self.do_mime_response(501, 'text/html',
+                                      web_templates['htmlError'].format('501 - Not Implemented'))
             snapshot = utils.end_mem_trace(self.config)
             utils.display_top(self.config, snapshot)
-            
+
             return
         except MemoryError as ex:
             self.logger.error('UNKNOWN MEMORY EXCEPTION: {}'.format(ex))
-            self.do_mime_response(501, 'text/html', 
-                web_templates['htmlError'].format('501 - {}'.format(ex)))
+            self.do_mime_response(501, 'text/html',
+                                  web_templates['htmlError'].format('501 - {}'.format(ex)))
             snapshot = utils.end_mem_trace(self.config)
             utils.display_top(self.config, snapshot)
         except IOError as ex:
@@ -128,17 +129,17 @@ def do_GET(self):
         except Exception as ex:
             self.logger.exception('{}{}'.format(
                 'UNEXPECTED EXCEPTION on GET=', ex))
-            self.do_mime_response(501, 'text/html', 
-                web_templates['htmlError'].format('501 - Server Error'))
+            self.do_mime_response(501, 'text/html',
+                                  web_templates['htmlError'].format('501 - Server Error'))
             snapshot = utils.end_mem_trace(self.config)
             utils.display_top(self.config, snapshot)
-        
+
     def do_POST(self):
         try:
             self.content_path = self.path
-            self.logger.debug('Receiving POST form {} {}'.format(self.content_path, self.query_data))
             # get POST data
             self.content_path, self.query_data = self.get_query_data()
+            self.logger.debug('Receiving POST form {}'.format(self.content_path))
             self.plugins.config_obj.refresh_config_data()
             self.config = self.plugins.config_obj.data
             if postrequest.call_url(self, self.content_path):
@@ -149,19 +150,17 @@ def do_POST(self):
         except Exception as ex:
             self.logger.exception('{}{}'.format(
                 'UNEXPECTED EXCEPTION on POST=', ex))
-            self.do_mime_response(501, 'text/html', 
-                web_templates['htmlError'].format('501 - Server Error'))
-
-
+            self.do_mime_response(501, 'text/html',
+                                  web_templates['htmlError'].format('501 - Server Error'))
 
     @classmethod
     def get_ns_inst_path(cls, _query_data):
         if _query_data['name']:
-            path = '/'+_query_data['name']
+            path = '/' + _query_data['name']
         else:
             path = ''
         if _query_data['instance']:
-            path += '/'+_query_data['instance']
+            path += '/' + _query_data['instance']
         return path
 
     def put_hdhr_queue(self, _namespace, _index, _channel, _status):
@@ -174,7 +173,7 @@ def update_scan_status(self, _namespace, _new_status):
             old_status = 'Idle'
         else:
             old_status = 'Scan'
-            
+
         if _namespace is None:
             for namespace, status_list in WebAdminHttpHandler.rmg_station_scans.items():
                 for i, status in enumerate(status_list):
@@ -197,13 +196,13 @@ def scan_state(self, new_value):
         WebAdminHttpHandler.hdhr_station_scan = new_value
 
     @classmethod
-    def init_class_var(cls, _plugins, _hdhr_queue, _terminate_queue, _sched_queue):
+    def init_class_var_sub(cls, _plugins, _hdhr_queue, _terminate_queue, _sched_queue):
         super(WebAdminHttpHandler, cls).init_class_var(_plugins, _hdhr_queue, _terminate_queue)
         WebHTTPHandler.sched_queue = _sched_queue
         getrequest.log_urls()
         postrequest.log_urls()
         filerequest.log_urls()
-        
+
 
 class WebAdminHttpServer(Thread):
 
@@ -212,6 +211,7 @@ def __init__(self, server_socket, _plugins):
         self.bind_ip = _plugins.config_obj.data['web']['bind_ip']
         self.bind_port = _plugins.config_obj.data['web']['web_admin_port']
         self.socket = server_socket
+        self.server_close = None
         self.start()
 
     def run(self):
@@ -227,6 +227,7 @@ def FactoryWebAdminHttpHandler():
     class CustomWebAdminHttpHandler(WebAdminHttpHandler):
         def __init__(self, *args, **kwargs):
             super(CustomWebAdminHttpHandler, self).__init__(*args, **kwargs)
+
     return CustomWebAdminHttpHandler
 
 
diff --git a/lib/clients/web_handler.py b/lib/clients/web_handler.py
index f9b4a08..5370605 100644
--- a/lib/clients/web_handler.py
+++ b/lib/clients/web_handler.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -20,14 +20,14 @@
 import importlib.resources
 import logging
 import mimetypes
-import os
 import pathlib
 import platform
+import re
 import socket
 import time
 import urllib
+import urllib.parse
 from http.server import BaseHTTPRequestHandler
-from multiprocessing import Queue
 
 import lib.common.utils as utils
 from lib.web.pages.templates import web_templates
@@ -110,6 +110,13 @@ def do_file_response(self, _code, _package, _reply_file):
                 if _package:
                     x = importlib.resources.read_binary(_package, _reply_file)
                 else:
+                    # add security to prevent hacker paths
+                    search_file = re.compile(r'^[A-Z]?[:]?([\\\/]([A-Za-z0-9_\-]+[\\\/])+[A-Za-z0-9\._\-]+$)')
+                    valid_check = re.match(search_file, str(_reply_file))
+                    if not valid_check:
+                        self.logger.info('Invalid filepath {}'.format(_reply_file))
+                        self.do_mime_response(404, 'text/html', web_templates['htmlError'].format('404 - Invalid File Path'))
+                        return
                     x_path = pathlib.Path(str(_reply_file))
                     with open(x_path, 'br') as reader:
                         x = reader.read()
@@ -131,12 +138,19 @@ def do_file_response(self, _code, _package, _reply_file):
                 self.logger.info('ConnectionAbortedError:{}'.format(e))
             except ModuleNotFoundError as e:
                 self.logger.info('ModuleNotFoundError:{}'.format(e))
-                self.do_mime_response(404, 'text/html', web_templates['htmlError'].format('404 - Area Not Found'))
+                self.do_mime_response(404, 'text/html', web_templates['htmlError'].format('404 - Module Not Found'))
+
+
+
 
     def do_response(self, _code, _mime, _reply_str=None):
-        self.send_response(_code)
-        self.send_header('Content-type', _mime)
-        self.end_headers()
+        try:
+            self.send_response(_code)
+            self.send_header('Content-type', _mime)
+            self.end_headers()
+        except BrokenPipeError as ex:
+            self.logger.notice('BrokenPipeError on do_response(), ignoring {}'.format(str(ex)))
+            pass
         if _reply_str:
             self.do_write(_reply_str.encode('utf-8'))
         
@@ -162,7 +176,13 @@ def do_write(self, _data):
             self.wfile.write(_data)
         except BrokenPipeError as ex:
             self.logger.debug('Client dropped connection while writing, ignoring. {}'.format(ex))
-    
+
+    @classmethod
+    def init_class_var_sub(cls, _plugins, _hdhr_queue, _terminate_queue, _sched_queue):
+        """
+        Interface class
+        """
+        pass
 
     @classmethod
     def init_class_var(cls, _plugins, _hdhr_queue, _terminate_queue):
@@ -185,11 +205,12 @@ def init_class_var(cls, _plugins, _hdhr_queue, _terminate_queue):
         WebHTTPHandler.channels_db = DBChannels(_plugins.config_obj.data)
         tmp_rmg_scans = {}
         for plugin_name in _plugins.plugins.keys():
-            if _plugins.config_obj.data.get(plugin_name.lower()):
-                if 'player-tuner_count' in _plugins.config_obj.data[plugin_name.lower()]:
-                    tmp_rmg_scans[plugin_name] = []
-                    for x in range(int(_plugins.config_obj.data[plugin_name.lower()]['player-tuner_count'])):
-                        tmp_rmg_scans[plugin_name].append('Idle')
+            if plugin_name:
+                if _plugins.config_obj.data.get(plugin_name.lower()):
+                    if 'player-tuner_count' in _plugins.config_obj.data[plugin_name.lower()]:
+                        tmp_rmg_scans[plugin_name] = []
+                        for x in range(int(_plugins.config_obj.data[plugin_name.lower()]['player-tuner_count'])):
+                            tmp_rmg_scans[plugin_name].append('Idle')
         WebHTTPHandler.rmg_station_scans = tmp_rmg_scans
         if WebHTTPHandler.total_instances == 0:
             WebHTTPHandler.total_instances = _plugins.config_obj.data['web']['concurrent_listeners']
@@ -214,7 +235,7 @@ def start_httpserver(cls, _plugins, _hdhr_queue, _terminate_queue, _port, _http_
         server_socket.listen(int(_plugins.config_obj.data['web']['concurrent_listeners']))
         utils.logging_setup(_plugins.config_obj.data)
         logger = logging.getLogger(__name__)
-        cls.init_class_var(_plugins, _hdhr_queue, _terminate_queue, _sched_queue)
+        cls.init_class_var_sub(_plugins, _hdhr_queue, _terminate_queue, _sched_queue)
         if cls.total_instances == 0:
             _plugins.config_obj.data['web']['concurrent_listeners']
         logger.info(
diff --git a/lib/clients/web_tuner.py b/lib/clients/web_tuner.py
index b5cf23c..031c67a 100644
--- a/lib/clients/web_tuner.py
+++ b/lib/clients/web_tuner.py
@@ -19,7 +19,10 @@
 import os
 import json
 import logging
+import os
 import pathlib
+import signal
+import threading
 import time
 import urllib
 from threading import Thread
@@ -27,6 +30,7 @@
 from http.server import HTTPServer
 from urllib.parse import urlparse
 
+from lib.common import utils
 from lib.common.decorators import gettunerrequest
 from lib.web.pages.templates import web_templates
 from lib.db.db_config_defn import DBConfigDefn
@@ -34,12 +38,13 @@
 from lib.streams.internal_proxy import InternalProxy
 from lib.streams.ffmpeg_proxy import FFMpegProxy
 from lib.streams.streamlink_proxy import StreamlinkProxy
+from lib.streams.thread_queue import ThreadQueue
 from .web_handler import WebHTTPHandler
 
 
 @gettunerrequest.route('/tunerstatus')
 def tunerstatus(_webserver):
-    _webserver.do_mime_response(200, 'application/json', json.dumps(WebHTTPHandler.rmg_station_scans))
+    _webserver.do_mime_response(200, 'application/json', json.dumps(WebHTTPHandler.rmg_station_scans, cls=ObjectJsonEncoder))
 
 
 @gettunerrequest.route('RE:/watch/.+')
@@ -50,30 +55,38 @@ def watch(_webserver):
 
 @gettunerrequest.route('/logreset')
 def logreset(_webserver):
-    logging.config.fileConfig(fname=_webserver.config['paths']['config_file'], 
-        disable_existing_loggers=False)
+    logging.config.fileConfig(fname=_webserver.config['paths']['config_file'],
+                              disable_existing_loggers=False)
     _webserver.do_mime_response(200, 'text/html')
 
 
 @gettunerrequest.route('RE:/auto/v.+')
-def logreset(_webserver):
+def autov(_webserver):
     channel = _webserver.content_path.replace('/auto/v', '')
     station_list = TunerHttpHandler.channels_db.get_channels(
         _webserver.query_data['name'], _webserver.query_data['instance'])
-    if channel not in station_list.keys():
-        # check channel number
-        for station in station_list.keys():
-            if station_list[station][0]['number'] == channel:
-                _webserver.do_tuning(station, _webserver.query_data['name'], 
-                    _webserver.query_data['instance'])
-                return
-    else:
-        _webserver.do_tuning(channel, _webserver.query_data['name'], 
-            _webserver.query_data['instance'])
-        return
+
+    # check channel number with adjustments
+    for station in station_list.keys():
+        updated_chnum = utils.wrap_chnum(
+            str(station_list[station][0]['display_number']), station_list[station][0]['namespace'],
+            station_list[station][0]['instance'], _webserver.config)
+        if updated_chnum == channel:
+            _webserver.do_tuning(station, _webserver.query_data['name'],
+                                 _webserver.query_data['instance'])
+            return
+
     _webserver.do_mime_response(503, 'text/html', web_templates['htmlError'].format('503 - Unknown channel'))
 
 
+class ObjectJsonEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, ThreadQueue):
+            return str(obj)
+        else:
+            return json.JSONEncoder.default(self.obj)
+
+
 class TunerHttpHandler(WebHTTPHandler):
 
     def __init__(self, *args):
@@ -99,12 +112,14 @@ def __init__(self, *args):
         try:
             super().__init__(*args)
         except ConnectionResetError as ex:
-            self.logger.warning('ConnectionResetError occurred, will try again {}' \
+            self.logger.warning(
+                'ConnectionResetError occurred, will try again {}'
                 .format(ex))
             time.sleep(1)
             super().__init__(*args)
         except ValueError as ex:
-            self.logger.warning('ValueError occurred, Bad stream recieved.  {}' \
+            self.logger.warning(
+                'ValueError occurred, Bad stream recieved.  {}'
                 .format(ex))
             raise
 
@@ -149,23 +164,34 @@ def do_tuning(self, sid, _namespace, _instance):
         self.plugins.config_obj.refresh_config_data()
         self.config = self.db_configdefn.get_config()
         self.plugins.config_obj.data = self.config
-        #try:
+        # try:
         station_list = TunerHttpHandler.channels_db.get_channels(_namespace, _instance)
         try:
             self.real_namespace, self.real_instance, station_data = self.get_ns_inst_station(station_list[sid])
             if not self.config[self.real_namespace.lower()]['enabled']:
-                self.logger.warning('Plugin is not enabled, ignoring request: {} sid:{}' \
+                self.logger.warning(
+                    'Plugin is not enabled, ignoring request: {} sid:{}'
                     .format(self.real_namespace, sid))
                 self.do_mime_response(503, 'text/html', web_templates['htmlError'].format('503 - Plugin Disabled'))
                 return
+            if not self.plugins.plugins[self.real_namespace].plugin_obj:
+                self.logger.warning(
+                    'Plugin not initialized, ignoring request: {}:{} sid:{}'
+                    .format(self.real_namespace, self.real_instance, sid))
+                self.do_mime_response(503, 'text/html',
+                                      web_templates['htmlError'].format('503 - Plugin Not Initialized'))
+                return
             section = self.plugins.plugins[self.real_namespace].plugin_obj.instances[self.real_instance].config_section
             if not self.config[section]['enabled']:
-                self.logger.warning('Plugin Instance is not enabled, ignoring request: {}:{} sid:{}' \
+                self.logger.warning(
+                    'Plugin Instance is not enabled, ignoring request: {}:{} sid:{}'
                     .format(self.real_namespace, self.real_instance, sid))
-                self.do_mime_response(503, 'text/html', web_templates['htmlError'].format('503 - Plugin Instance Disabled'))
+                self.do_mime_response(503, 'text/html',
+                                      web_templates['htmlError'].format('503 - Plugin Instance Disabled'))
                 return
         except (KeyError, TypeError):
-            self.logger.warning('Unknown Channel ID, not found in database {} {} {}' \
+            self.logger.warning(
+                'Unknown Channel ID, not found in database {} {} {}'
                 .format(_namespace, _instance, sid))
             self.do_mime_response(503, 'text/html', web_templates['htmlError'].format('503 - Unknown channel'))
             return
@@ -174,47 +200,60 @@ def do_tuning(self, sid, _namespace, _instance):
             self.do_dict_response(self.m3u8_redirect.gen_m3u8_response(station_data))
             return
         elif self.config[section]['player-stream_type'] == 'internalproxy':
-            resp = self.internal_proxy.gen_response(self.real_namespace, self.real_instance, station_data['number'], TunerHttpHandler)
+            resp = self.internal_proxy.gen_response(
+                self.real_namespace, self.real_instance, 
+                station_data['display_number'], station_data['json'].get('VOD'))
             self.do_dict_response(resp)
             if resp['tuner'] < 0:
                 return
             else:
-                self.internal_proxy.stream(station_data, self.wfile, self.terminate_queue)
+                self.internal_proxy.stream(station_data, self.wfile, self.terminate_queue, resp['tuner'])
         elif self.config[section]['player-stream_type'] == 'ffmpegproxy':
-            resp = self.ffmpeg_proxy.gen_response(self.real_namespace, self.real_instance, station_data['number'], TunerHttpHandler)
+            resp = self.ffmpeg_proxy.gen_response(
+                self.real_namespace, self.real_instance, 
+                station_data['display_number'], station_data['json'].get('VOD'))
             self.do_dict_response(resp)
             if resp['tuner'] < 0:
                 return
             else:
-                self.ffmpeg_proxy.stream(station_data, self.wfile)
+                self.ffmpeg_proxy.stream(station_data, self.wfile, resp['tuner'])
         elif self.config[section]['player-stream_type'] == 'streamlinkproxy':
-            resp = self.streamlink_proxy.gen_response(self.real_namespace, self.real_instance, station_data['number'], TunerHttpHandler)
+            resp = self.streamlink_proxy.gen_response(
+                self.real_namespace, self.real_instance, 
+                station_data['display_number'], station_data['json'].get('VOD'))
             self.do_dict_response(resp)
             if resp['tuner'] < 0:
                 return
             else:
-                self.streamlink_proxy.stream(station_data, self.wfile)
+                self.streamlink_proxy.stream(station_data, self.wfile, resp['tuner'])
         else:
             self.do_mime_response(501, 'text/html', web_templates['htmlError'].format('501 - Unknown streamtype'))
             self.logger.error('Unknown [player-stream_type] {}'
-                .format(self.config[section]['player-stream_type']))
+                              .format(self.config[section]['player-stream_type']))
             return
-        self.logger.notice('Provider Connection Closed, ch_id={}'.format(sid))
-        WebHTTPHandler.rmg_station_scans[self.real_namespace][resp['tuner']] = 'Idle'
+        station_scans = WebHTTPHandler.rmg_station_scans[self.real_namespace][resp['tuner']]
+        if station_scans != 'Idle':
+            if station_scans['mux'] is None or not station_scans['mux'].is_alive():
+                self.logger.notice('Provider Connection Closed, ch_id={} {}'.format(sid, threading.get_ident()))
+                WebHTTPHandler.rmg_station_scans[self.real_namespace][resp['tuner']] = 'Idle'
+            else:
+                self.logger.info('1 Client Connection Closed, provider continuing ch_id={} {}'.format(sid, threading.get_ident()))
+        else:
+            self.logger.info('2 Client Connection Closed, provider continuing ch_id={} {}'.format(sid, threading.get_ident()))
         time.sleep(0.01)
 
     def get_ns_inst_station(self, _station_data):
         lowest_namespace = _station_data[0]['namespace']
         lowest_instance = _station_data[0]['instance']
         station = _station_data[0]
-        
+
         # do simple checks first.
         # is there only one channel?
         if len(_station_data) == 1:
             return lowest_namespace, \
                 lowest_instance, \
                 station
-        
+
         # Is there only one channel instance enabled?
         i = 0
         for one_station in _station_data:
@@ -225,7 +264,7 @@ def get_ns_inst_station(self, _station_data):
             return station['namespace'], \
                 station['instance'], \
                 station
-        
+
         # round robin capability when instances are tied to a single provider
         # must make sure the channel is enabled for both instances
         ns = []
@@ -263,17 +302,19 @@ def get_ns_inst_station(self, _station_data):
         return lowest_namespace, lowest_instance, station
 
     @classmethod
-    def init_class_var(cls, _plugins, _hdhr_queue, _terminate_queue, _sched_queue):
+    def init_class_var_sub(cls, _plugins, _hdhr_queue, _terminate_queue, _sched_queue):
         WebHTTPHandler.logger = logging.getLogger(__name__)
         tuner_count = 0
         for plugin_name in _plugins.plugins.keys():
-            if _plugins.config_obj.data.get(plugin_name.lower()):
-                if 'player-tuner_count' in _plugins.config_obj.data[plugin_name.lower()]:
-                    WebHTTPHandler.logger.debug('{} Implementing {} tuners for {}'
-                        .format(cls.__name__,
-                        _plugins.config_obj.data[plugin_name.lower()]['player-tuner_count'],
-                        plugin_name))
-                    tuner_count += _plugins.config_obj.data[plugin_name.lower()]['player-tuner_count']
+            if plugin_name:
+                if _plugins.config_obj.data.get(plugin_name.lower()):
+                    if 'player-tuner_count' in _plugins.config_obj.data[plugin_name.lower()]:
+                        WebHTTPHandler.logger.debug('{} Implementing {} tuners for {}'
+                                                    .format(cls.__name__,
+                                                            _plugins.config_obj.data[plugin_name.lower()][
+                                                                'player-tuner_count'],
+                                                            plugin_name))
+                        tuner_count += _plugins.config_obj.data[plugin_name.lower()]['player-tuner_count']
         WebHTTPHandler.total_instances = tuner_count
         super(TunerHttpHandler, cls).init_class_var(_plugins, _hdhr_queue, _terminate_queue)
 
@@ -285,6 +326,7 @@ def __init__(self, server_socket, _plugins):
         self.bind_ip = _plugins.config_obj.data['web']['bind_ip']
         self.bind_port = _plugins.config_obj.data['web']['plex_accessible_port']
         self.socket = server_socket
+        self.server_close = None
         self.start()
 
     def run(self):
@@ -299,10 +341,20 @@ def FactoryTunerHttpHandler():
     class CustomHttpHandler(TunerHttpHandler):
         def __init__(self, *args, **kwargs):
             super(CustomHttpHandler, self).__init__(*args, **kwargs)
+
     return CustomHttpHandler
 
+def child_exited(sig, frame):
+    logger = logging.getLogger(__name__)
+    try:
+        pid, exitcode = os.wait()
+        logger.warning('Child process {} exited with code {}'.format(pid, exitcode))
+    except ChildProcessError as ex:
+        logger.warning('Child exit error {}'.format(str(ex)))
 
 def start(_plugins, _hdhr_queue, _terminate_queue):
+    # uncomment this to find out about m3u8 subprocess exits
+    #signal.signal(signal.SIGCHLD, child_exited)
     TunerHttpHandler.start_httpserver(
         _plugins, _hdhr_queue, _terminate_queue,
         _plugins.config_obj.data['web']['plex_accessible_port'],
diff --git a/lib/common/decorators.py b/lib/common/decorators.py
index 190536e..782a86f 100644
--- a/lib/common/decorators.py
+++ b/lib/common/decorators.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -18,70 +18,86 @@
 
 import functools
 import http
+import http.client
+import httpcore
+import httpx
 import json
 import logging
 import os
 import re
-import socket
 import sys
 import socket
 import time
+import traceback
 import urllib
+import urllib.parse
 import urllib.error
+import urllib3
 from functools import update_wrapper
 
+
 def handle_url_except(f=None, timeout=None):
     """
     timeout not currently used
     """
     if f is None:
         return functools.partial(handle_url_except, timeout=timeout)
+
     def wrapper_func(self, *args, **kwargs):
         ex_save = None
-        i = 2
-        while i > 0:
+        # arg0 = uri, arg1=retries
+        if len(args) == 0:
+            arg0 = 'None'
+            retries = 2
+        elif len(args) == 1:
+            arg0 = args[0]
+            retries = 2
+        else:
+            arg0 = args[0]
+            retries = args[1]
+        i = retries
+        is_done = 0
+        while i > is_done:
             i -= 1
             try:
-                if len(args) > 0:
-                    x = str(args[0])
-                else:
-                    x = 'unknown'
                 x = f(self, *args, **kwargs)
                 return x
             except UnicodeDecodeError as ex:
                 ex_save = ex
-                self.logger.info("UnicodeDecodeError in function {}(), retrying {} {} {}" \
-                    .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0]), ))            
-            except urllib.error.HTTPError as ex:
-                ex_save = ex
-                self.logger.info("HTTPError in function {}(), retrying {} {} {}" \
-                    .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0]), ))
+                self.logger.info("UnicodeDecodeError in function {}(), retrying {} {} {}"
+                                 .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0), ))
             except ConnectionRefusedError as ex:
                 ex_save = ex
-                self.logger.info("ConnectionRefusedError in function {}, retrying (): {} {} {}" \
-                    .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0])))
+                self.logger.info("ConnectionRefusedError in function {}(), retrying (): {} {} {}"
+                                 .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
             except ConnectionResetError as ex:
                 ex_save = ex
-                self.logger.info("ConnectionResetError in function {}(), retrying {} {} {}" \
-                    .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0])))
-            except urllib.error.URLError as ex:
+                self.logger.info("ConnectionResetError in function {}(), retrying {} {} {}"
+                                 .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
+            except (socket.timeout, httpx.ReadTimeout, httpx.ConnectTimeout, httpcore.ReadTimeout) as ex:
                 ex_save = ex
-                if isinstance(ex.reason, ConnectionRefusedError):
-                    self.logger.info("URLError:ConnectionRefusedError in function {}, slowing down: {} {} {}" \
-                        .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0])))
-                else:
-                    self.logger.info("URLError in function {}, retrying (): {} {} {}" \
-                        .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0])))
-            except socket.timeout as ex:
+                self.logger.info("Socket Timeout Error in function {}(), retrying {} {} {}"
+                                 .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
+
+            except (httpx.ConnectError) as ex:
                 ex_save = ex
-                self.logger.info("Socket Timeout Error in function {}(), retrying {} {} {}" \
-                    .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0])))
-            except http.client.RemoteDisconnected as ex:
+                if hasattr(ex.args[0], 'reason'):
+                    reason = ex.args[0].reason
+                else:
+                    reason = None
+                if isinstance(reason, urllib3.exceptions.NewConnectionError):
+                    self.logger.info("ConnectionError:ConnectionRefused in function {}(), retrying (): {} {} {}"
+                                     .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
+                    time.sleep(2)
+                else:
+                    self.logger.info("ConnectionError in function {}(), retrying (): {} {} {}"
+                                     .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
+            except (http.client.RemoteDisconnected, httpcore.RemoteProtocolError) as ex:
                 ex_save = ex
-                self.logger.info('Remote Server Disconnect Error in function {}(), retrying {} {} {}' \
-                    .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0])))
+                self.logger.info('Remote Server Disconnect Error in function {}(), retrying {} {} {}'
+                                 .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
             except http.client.InvalidURL as ex:
-                url_tuple = urllib.parse.urlparse(args[0])
+                url_tuple = urllib.parse.urlparse(arg0)
                 url_list = list(url_tuple)
                 url_list[2] = urllib.parse.quote(url_list[2])
                 url_list[3] = urllib.parse.quote(url_list[3])
@@ -93,17 +109,47 @@ def wrapper_func(self, *args, **kwargs):
                 args = tuple(args_list)
 
                 ex_save = ex
-                self.logger.info('InvalidURL, encoding and trying again. In function {}() {} {} {}' \
-                    .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0])))
+                self.logger.info('InvalidURL Error, encoding and trying again. In function {}() {} {} {}'
+                                 .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
+            except (urllib.error.HTTPError, httpx.HTTPError) as ex:
+                ex_save = ex
+                self.logger.info("HTTPError in function {}(), retrying {} {} {}"
+                                 .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0), ))
+            except urllib.error.URLError as ex:
+                ex_save = ex
+                if isinstance(ex.reason, ConnectionRefusedError):
+                    self.logger.info("URLError:ConnectionRefusedError in function {}(): {} {} {}"
+                                     .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
+                    count = 5
+                    while count > 0:
+                        try:
+                            x = f(self, *args, **kwargs)
+                            return x
+                        except urllib.error.URLError as ex2:
+                            self.logger.debug("{} URLError:ConnectionRefusedError in function {}(): {} {} {}"
+                                              .format(count, f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
+                            count -= 1
+                            time.sleep(.5)
+                        except Exception as ex3:
+                            break
+                else:
+                    self.logger.info("URLError in function {}(), retrying (): {} {} {}"
+                                     .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
             except http.client.IncompleteRead as ex:
                 ex_save = ex
-                self.logger.info('Partial data from url received in function {}(), retrying. {} {} {}' \
-                    .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0])))
+                self.logger.info('Partial Data Error from url received in function {}(), retrying. {} {} {}'
+                                 .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
+            except ValueError as ex:
+                ex_save = ex
+                self.logger.info('ValueError in function {}(), aborting. {} {} {}'
+                                 .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
+
             time.sleep(1.0)
-        self.logger.notice('Multiple HTTP Errors, unable to get url data, skipping {}() {} {} {}' \
-            .format(f.__qualname__, os.getpid(), str(ex_save), str(args[0])))
-        
+        self.logger.notice('Multiple HTTP Errors, unable to get url data, skipping {}() {} {} {}'
+                           .format(f.__qualname__, os.getpid(), str(ex_save), str(arg0)))
+
         return None
+
     return update_wrapper(wrapper_func, f)
 
 
@@ -111,9 +157,10 @@ def handle_json_except(f):
     def wrapper_func(self, *args, **kwargs):
         try:
             return f(self, *args, **kwargs)
-        except json.JSONDecodeError as jsonError:
+        except (json.JSONDecodeError) as jsonError:
             self.logger.error("JSONError in function {}(): {}".format(f.__qualname__, str(jsonError)))
             return None
+
     return update_wrapper(wrapper_func, f)
 
 
@@ -121,9 +168,9 @@ class Backup:
     """
     Decorator for collecting and processing export/backup methods
     """
-    
+
     backup2func = {}
-    
+
     def __init__(self, *pattern):
         self.pattern = pattern
 
@@ -134,7 +181,7 @@ def __call__(self, call_class_fn):
             for p in self.pattern:
                 Backup.backup2func[p] = call_class_fn
             return call_class_fn
-            
+
     @classmethod
     def log_backups(cls):
         logger = logging.getLogger(__name__)
@@ -142,7 +189,7 @@ def log_backups(cls):
             logger.debug('Registering BACKUP {}'.format(name))
 
     @classmethod
-    def call_backup(self, _name, *args, **kwargs):
+    def call_backup(cls, _name, *args, **kwargs):
         """
         Based on function, will create class instance and call
         the function with no parameters. *args are
@@ -167,9 +214,9 @@ class Restore:
     """
     Decorator for collecting and processing import/restore methods
     """
-    
+
     restore2func = {}
-    
+
     def __init__(self, *pattern):
         self.pattern = pattern
 
@@ -180,7 +227,7 @@ def __call__(self, call_class_fn):
             for p in self.pattern:
                 Restore.restore2func[p] = call_class_fn
             return call_class_fn
-            
+
     @classmethod
     def log_backups(cls):
         logger = logging.getLogger(__name__)
@@ -213,7 +260,7 @@ class Request:
     """
     Adds urls to functions for GET and POST methods
     """
-    
+
     def __init__(self):
         self.url2func = {}
         self.method = None
@@ -222,9 +269,10 @@ def route(self, *pattern):
         def wrap(func):
             for p in pattern:
                 if p.startswith('RE:'):
-                    p = re.compile(p.replace('RE:',''))
+                    p = re.compile(p.replace('RE:', ''))
                 self.url2func[p] = func
             return func
+
         return wrap
 
     def log_urls(self):
@@ -251,7 +299,7 @@ def __init__(self):
         super().__init__()
         self.method = 'GET'
 
-    
+
 class PostRequest(Request):
 
     def __init__(self):
@@ -275,8 +323,8 @@ def call_url(self, _webserver, _name, *args, **kwargs):
                 return True
         return False
 
+
 getrequest = GetRequest()
 gettunerrequest = GetRequest()
 postrequest = PostRequest()
 filerequest = FileRequest()
-
diff --git a/lib/common/encryption.py b/lib/common/encryption.py
index e6c8410..ff136ba 100644
--- a/lib/common/encryption.py
+++ b/lib/common/encryption.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
diff --git a/lib/common/log_handlers.py b/lib/common/log_handlers.py
index 8363b07..57543d6 100644
--- a/lib/common/log_handlers.py
+++ b/lib/common/log_handlers.py
@@ -18,6 +18,7 @@
 
 from logging.handlers import RotatingFileHandler
 
+
 class MPRotatingFileHandler(RotatingFileHandler):
     """
     Supports multiprocessing logging.  Main issue is when the
diff --git a/lib/common/pickling.py b/lib/common/pickling.py
index 5231be7..0137033 100644
--- a/lib/common/pickling.py
+++ b/lib/common/pickling.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -23,17 +23,19 @@
 
 TRAILER = '.pkl'
 
+
 class Pickling:
     """
     Do to MS Windows OS not forking processes, pickling must occur
     to have the variables passed to the process have data.
     Simple variables may be passed succesffully without pickling.
     """
+
     def __init__(self, _config):
         self.logger = logging.getLogger(__name__)
         self.config = _config
         self.temp_dir = _config['paths']['data_dir']
-    
+
     def to_pickle(self, _object_to_pickle):
         class_name = _object_to_pickle.__class__.__name__
         self.logger.debug('Pickling {}'.format(class_name))
@@ -52,7 +54,7 @@ def from_pickle(self, _class_name):
             return obj_copy
         else:
             self.logger.warning('Pickling import file does not exist: {}'
-                .format(file_path))
+                                .format(file_path))
             return None
 
     def delete_pickle(self, _class_name):
@@ -62,9 +64,7 @@ def delete_pickle(self, _class_name):
             os.remove(file_path)
         else:
             self.logger.warning('Deleting pickle file does not exist: {}'
-                .format(file_path))
-            
-
+                                .format(file_path))
 
     def get_file_path(self, classname):
         file_path = pathlib.Path(self.temp_dir) \
diff --git a/lib/common/tmp_mgmt.py b/lib/common/tmp_mgmt.py
index e4d173b..7b03043 100644
--- a/lib/common/tmp_mgmt.py
+++ b/lib/common/tmp_mgmt.py
@@ -37,7 +37,7 @@ def __init__(self, _config):
         self.config = _config
 
     @handle_url_except()
-    def download_file(self, _url, _folder, _filename, _file_type):
+    def download_file(self, _url, _retries, _folder, _filename, _file_type):
         if _filename == None:
             _filename = '{}{}'.format(time.time(), _file_type)
         if _folder is None:
diff --git a/lib/common/utils.py b/lib/common/utils.py
index 7ef371d..e08464f 100644
--- a/lib/common/utils.py
+++ b/lib/common/utils.py
@@ -27,6 +27,7 @@
 import os
 import pathlib
 import platform
+import re
 import shutil
 import socket
 import struct
@@ -36,10 +37,11 @@
 
 import lib.common.exceptions as exceptions
 
-VERSION = '0.9.9.8'
+VERSION = '0.9.14.03'
 CABERNET_URL = 'https://github.com/cabernetwork/cabernet'
-CABERNET_NAMESPACE = 'Cabernet'
-DEFAULT_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:92.0) Gecko/20100101 Firefox/92.0'
+CABERNET_ID = 'cabernet'
+CABERNET_REPO = 'manifest.json'
+DEFAULT_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:120.0) Gecko/20100101 Firefox/120.0'
 PLUGIN_DATA = 'Wawc9dxf2ivj5lmunpq4hrbsktgyXz01e3Y6o7Z8+/'
 
 
@@ -48,6 +50,20 @@ def get_version_str():
 
 logger = None
 LOG_LVL_NOTICE = 25
+LOG_LVL_TRACE = 5
+SEARCH_VERSION = re.compile('^([\d]+)\.([\d]+)\.([\d]+)(?:\.([\d]+))*(?:[\D]+(\d)+)*')
+
+def get_version_index(_ver):
+    """
+    Based on the version string will calculate a number representing the version,
+    which can be used to compare versions. Ignores any text after the fourth number
+    format a.b.c.d or a.b.c
+    """
+    m = re.findall(SEARCH_VERSION, _ver)
+    d1, d2, d3, d4, d5 = m[0]
+    v_int = ((((int(d1)*100)+int(d2 or 0))*100)+int(d3 or 0))*100+int(d4 or 0)+int(d5 or 0)/100 
+    return v_int
+
 
 def logging_setup(_config):
     global logger
@@ -65,6 +81,12 @@ def notice(self, message, *args, **kws):
             if self.isEnabledFor(LOG_LVL_NOTICE):
                 self._log(LOG_LVL_NOTICE, message, args, **kws) 
         logging.Logger.notice = notice
+    if str(logging.getLevelName('TRACE')).startswith('Level'):
+        logging.addLevelName(LOG_LVL_TRACE, 'TRACE')
+        def trace(self, message, *args, **kws):
+            if self.isEnabledFor(LOG_LVL_TRACE):
+                self._log(LOG_LVL_TRACE, message, args, **kws) 
+        logging.Logger.trace = trace
     if str(logging.getLevelName('NOTUSED')).startswith('Level'):
         try:
             logging.config.fileConfig(fname=_config['paths']['config_file'])
@@ -227,7 +249,7 @@ def instance_config_section(_namespace, _instance):
 
 def process_image_url(_config, _thumbnail_url):
     global logger
-    if _thumbnail_url.startswith('file://'):
+    if _thumbnail_url is not None and _thumbnail_url.startswith('file://'):
         filename = ntpath.basename(_thumbnail_url)
         mime_lookup = mimetypes.guess_type(filename)
         new_filename = filename.replace(' ','')
diff --git a/lib/common/xmltv.py b/lib/common/xmltv.py
index 7d68bc7..a98abd2 100644
--- a/lib/common/xmltv.py
+++ b/lib/common/xmltv.py
@@ -47,7 +47,7 @@ def __init__(self, _config, _url, _file_type):
         self.tmp_mgmt = TMPMgmt(self.config)
         self.has_future_dates = False
         self.start_date = None
-        self.file_compressed = self.tmp_mgmt.download_file(self.url, TMP_FOLDER, None, self.file_type)
+        self.file_compressed = self.tmp_mgmt.download_file(self.url, 2, TMP_FOLDER, None, self.file_type)
         if self.file_compressed is None:
             self.file = None
             raise exceptions.CabernetException('Unable to obtain XMLTV File {}' \
@@ -188,42 +188,45 @@ def get_next_elem(self, _program):
                     return True
                 elif elem.tag == 'credits':
                     credits = self.get_p_credits(elem)
-                    if len(credits['actors']) != 0:
-                        _program['actors'] = credits['actors']
-                    if len(credits['directors']) != 0:
-                        _program['directors'] = credits['directors']
+                    if credits:
+                        if len(credits['actors']) != 0:
+                            _program['actors'] = credits['actors']
+                        if len(credits['directors']) != 0:
+                            _program['directors'] = credits['directors']
                     return True
                 elif elem.tag == 'date':
                     p_date = self.get_p_date(elem)
-                    _program['air_date'] = p_date
-                    if len(p_date) == 4:
-                        _program['formatted_date'] = p_date
-                    else:
-                        _program['formatted_date'] = datetime.datetime.strptime(
-                            p_date, '%Y%m%d').strftime('%Y/%m/%d')
+                    if p_date:
+                        _program['air_date'] = p_date
+                        if len(p_date) == 4:
+                            _program['formatted_date'] = p_date
+                        else:
+                            _program['formatted_date'] = datetime.datetime.strptime(
+                                p_date, '%Y%m%d').strftime('%Y/%m/%d')
                     return True
                 elif elem.tag == 'episode-num':
                     episode_num = self.get_p_episode_num(elem)
-                    if episode_num['system'] == 'common' or \
-                            episode_num['system'] == 'SxxExx':
-                        ep_num = episode_num['text']
-                        _program['se_common'] = ep_num
-                        nums = re.findall('\d+', ep_num)
-                        if len(nums) < 2:
-                            _program['episode'] = nums[0]
-                        else:
-                            _program['episode'] = nums[1]
-                            _program['season'] = nums[0]
-                    elif episode_num['system'] == 'dd_progid':
-                        ep_num = episode_num['text']
-                        _program['se_progid'] = ep_num
-                        _program['progid'] = ep_num.replace('.', '')
-                        if _program['episode'] is None:
-                            nums = int(re.findall('\d+$', ep_num)[0])
-                            if nums != 0:
-                                _program['episode'] = nums
-                    elif episode_num['system'] == 'xmltv_ns':
-                        _program['se_xmltv_ns'] = episode_num['text']
+                    if episode_num:
+                        if episode_num['system'] == 'common' or \
+                                episode_num['system'] == 'SxxExx':
+                            ep_num = episode_num['text']
+                            _program['se_common'] = ep_num
+                            nums = re.findall('\d+', ep_num)
+                            if len(nums) < 2:
+                                _program['episode'] = nums[0]
+                            else:
+                                _program['episode'] = nums[1]
+                                _program['season'] = nums[0]
+                        elif episode_num['system'] == 'dd_progid':
+                            ep_num = episode_num['text']
+                            _program['se_progid'] = ep_num
+                            _program['progid'] = ep_num.replace('.', '')
+                            if _program['episode'] is None:
+                                nums = int(re.findall('\d+$', ep_num)[0])
+                                if nums != 0:
+                                    _program['episode'] = nums
+                        elif episode_num['system'] == 'xmltv_ns':
+                            _program['se_xmltv_ns'] = episode_num['text']
                     return True
             if event == 'end' and elem.tag == 'programme':
                 return False
diff --git a/lib/config/config_callbacks.py b/lib/config/config_callbacks.py
index f7094b9..7c6b905 100644
--- a/lib/config/config_callbacks.py
+++ b/lib/config/config_callbacks.py
@@ -50,7 +50,6 @@
 ENCRYPT_STRING = 'ENC::'
 
 
-
 def noop(_config_obj, _section, _key):
     pass
 
@@ -79,7 +78,7 @@ def logging_enable(_config_obj, _section, _key):
 
 def set_version(_config_obj, _section, _key):
     _config_obj.data[_section][_key] \
-        = 'v' + utils.get_version_str()
+        = utils.get_version_str()
 
 
 def set_system(_config_obj, _section, _key):
@@ -115,30 +114,37 @@ def set_path(_config_obj, _section, _key, _base_dir, _folder):
 def set_data_path(_config_obj, _section, _key):
     if _config_obj.data[_section][_key] is None:
         set_path(_config_obj, _section, _key,
-            _config_obj.data['paths']['main_dir'], 'data')
+                 _config_obj.data['paths']['main_dir'], 'data')
 
 
 def set_logs_path(_config_obj, _section, _key):
     if _config_obj.data[_section][_key] is None:
         set_path(_config_obj, _section, _key,
-            _config_obj.data['paths']['data_dir'], 'logs')
+                 _config_obj.data['paths']['data_dir'], 'logs')
+
+
+def set_thumbnails_path(_config_obj, _section, _key):
+    if _config_obj.data[_section][_key] is None:
+        set_path(_config_obj, _section, _key,
+                 _config_obj.data['paths']['data_dir'], 'thumbnails')
 
 
 def set_temp_path(_config_obj, _section, _key):
     if _config_obj.data[_section][_key] is None:
         set_path(_config_obj, _section, _key,
-            _config_obj.data['paths']['data_dir'], 'tmp')
+                 _config_obj.data['paths']['data_dir'], 'tmp')
 
 
 def set_database_path(_config_obj, _section, _key):
     if _config_obj.data[_section][_key] is None:
         set_path(_config_obj, _section, _key,
-            _config_obj.data['paths']['data_dir'], 'db')
+                 _config_obj.data['paths']['data_dir'], 'db')
+
 
 def set_backup_path(_config_obj, _section, _key):
     if _config_obj.data[_section][_key] is None:
         set_path(_config_obj, _section, _key,
-            _config_obj.data['paths']['data_dir'], 'backups')
+                 _config_obj.data['paths']['data_dir'], 'backups')
 
 
 def set_configdefn_path(_config_obj, _section, _key):
@@ -160,8 +166,9 @@ def set_ffmpeg_path(_config_obj, _section, _key):
                 _config_obj.data[_section][_key] \
                     = str(pathlib.Path(base_ffmpeg_dir).joinpath('ffmpeg.exe'))
             else:
-                _config_obj.logger \
-                    .info('ffmpeg_path does not exist and may be needed based on stream_type')
+                _config_obj.data[_section][_key] = 'ffmpeg.exe'
+                _config_obj.logger.notice(
+                    'ffmpeg_path does not exist in [cabernet]/ffmpeg/bin, will use PATH env to find ffmpeg.exe')
         else:
             _config_obj.data[_section][_key] = 'ffmpeg'
 
@@ -169,30 +176,50 @@ def set_ffmpeg_path(_config_obj, _section, _key):
 def set_ffprobe_path(_config_obj, _section, _key):
     if not _config_obj.data[_section][_key]:
         if platform.system() in ['Windows']:
-            base_ffprobe_dir \
+            base_ffmpeg_dir \
                 = pathlib.Path(_config_obj.script_dir).joinpath('ffmpeg/bin')
-            _config_obj.data[_section][_key] \
-                = str(pathlib.Path(base_ffprobe_dir).joinpath('ffprobe.exe'))
-            _config_obj.logger.info('ffprobe_path does not exist and may be needed based on stream_type')
+            if base_ffmpeg_dir.is_dir():
+                _config_obj.data[_section][_key] \
+                    = str(pathlib.Path(base_ffmpeg_dir).joinpath('ffprobe.exe'))
+            else:
+                _config_obj.data[_section][_key] = 'ffprobe.exe'
+                _config_obj.logger.notice(
+                    'ffprobe_path does not exist in [cabernet]/ffmpeg/bin, will use PATH env to find ffprobe.exe')
         else:
             _config_obj.data[_section][_key] = 'ffprobe'
 
+
+def set_streamlink_path(_config_obj, _section, _key):
+    if not _config_obj.data[_section][_key]:
+        if platform.system() in ['Windows']:
+            _config_obj.data[_section][_key] \
+                = 'streamlink.exe'
+            _config_obj.logger.notice(
+                'streamlink_path does not exist in PATH to find streamlink.exe')
+        else:
+            streamlink_file = os.path.expanduser('~/.local/bin/streamlink')
+            if os.path.isfile(streamlink_file):
+                _config_obj.data[_section][_key] = streamlink_file
+            else:
+                _config_obj.data[_section][_key] = 'streamlink'
+
+
 def set_pdata(_config_obj, _section, _key):
     if not _config_obj.data[_section][_key]:
         _config_obj.data[_section][_key] = \
-             utils.PLUGIN_DATA + config_defn.PLUGIN_DATA
+            utils.PLUGIN_DATA + config_defn.PLUGIN_DATA
 
 
 def check_encryption(_config_obj, _section, _key):
     if not CRYPTO_LOADED:
         return 'python cryptography module not installed, unable to encrypt'
-        
+
 
 def load_encrypted_setting(_config_obj, _section, _key):
     if CRYPTO_LOADED and _config_obj.data['main']['use_encryption']:
         if _config_obj.data['main']['encrypt_key'] is None:
             _config_obj.data['main']['encrypt_key'] = encryption.set_fernet_key().decode('utf-8')
-    
+
         if _config_obj.data[_section][_key] is not None:
             if _config_obj.data[_section][_key].startswith(ENCRYPT_STRING):
                 # encrypted
@@ -249,13 +276,13 @@ def enable_ssdp(_config_obj, _section, _key):
 
 
 def set_hdhomerun_id(_config_obj, _section, _key):
-    if _config_obj.data['hdhomerun']['hdhr_id'] is None:
+    if _config_obj.data[_section][_key] is None:
         _config_obj.write(
-            'hdhomerun', 'hdhr_id', hdhr_server.hdhr_gen_device_id())
+            _section, _key, hdhr_server.hdhr_gen_device_id())
     elif not hdhr_server.hdhr_validate_device_id(
-            _config_obj.data['hdhomerun']['hdhr_id']):
+            _config_obj.data[_section][_key]):
         _config_obj.write(
-            'hdhomerun', 'hdhr_id', hdhr_server.hdhr_gen_device_id())
+            _section, _key, hdhr_server.hdhr_gen_device_id())
 
 
 def set_uuid(_config_obj, _section, _key):
@@ -272,7 +299,7 @@ def update_instance_label(_config_obj, _section, _key):
     elif len(areas) == 0:
         return
     else:
-        result = None
+        results = None
     section_data = db_confdefn.get_one_section_dict(areas[0], _section)
     section_data[_section]['label'] = value
     db_confdefn.add_section(areas[0], _section, section_data[_section])
@@ -282,11 +309,14 @@ def update_instance_label(_config_obj, _section, _key):
     namespace, instance = _section.split('_', 1)
     tasks = db_scheduler.get_tasks_by_name(namespace, instance)
     for task in tasks:
-        WebHTTPHandler.sched_queue.put({'cmd': 'deltask', 'taskid': task['taskid'] })
+        WebHTTPHandler.sched_queue.put({'cmd': 'deltask', 'taskid': task['taskid']})
+    return results
 
 
 def update_channel_num(_config_obj, _section, _key):
     starting_num = _config_obj.data[_section][_key]
+    init_num = starting_num
+    is_changed = False
     namespace_l, instance = _section.split('_', 1)
     db_channels = DBChannels(_config_obj.data)
     namespaces = db_channels.get_channel_names()
@@ -296,11 +326,16 @@ def update_channel_num(_config_obj, _section, _key):
     namespace = list(namespace)[0]
     ch_list = db_channels.get_channels(namespace, instance)
     for ch in ch_list.values():
-        ch[0]['display_number'] = str(int(ch[0]['number'])+starting_num)
-        db_channels.update_channel_number(ch[0])
-
-    return '{} {} {}'.format(_section, _key, starting_num, namespace)
-
+        if starting_num != -1:
+            if ch[0]['display_number'] != starting_num:
+                ch[0]['display_number'] = starting_num
+                db_channels.update_channel_number(ch[0])
+            starting_num += 1
+
+    if init_num == -1:
+        return 'Renumbered channels back to default'.format(_section, _key)
+    else:
+        return 'Renumbered channels starting at {}'.format(_section, _key, init_num)
 
 
 def set_theme_folders(_defn, _config, _section, _key):
@@ -317,10 +352,9 @@ def set_theme_folders(_defn, _config, _section, _key):
             importlib.resources.read_text(themes_path, folder)
         except (IsADirectoryError, PermissionError):
             theme_list.append(folder)
-        except (UnicodeDecodeError):
+        except UnicodeDecodeError:
             continue
     _defn['general']['sections']['display']['settings']['theme']['values'] = theme_list
     theme_default = _defn['general']['sections']['display']['settings']['theme']['default']
     if theme_default not in theme_list:
         _defn['general']['sections']['display']['settings']['theme']['default'] = theme_list[0]
-    
\ No newline at end of file
diff --git a/lib/config/config_defn.py b/lib/config/config_defn.py
index 88cbad8..2e2a2a0 100644
--- a/lib/config/config_defn.py
+++ b/lib/config/config_defn.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -28,6 +28,7 @@
 CONFIG_DEFN_PATH = 'lib.resources.config_defn'
 PLUGIN_DATA = 'AOEPFQGLIKMCNRJSBTHUDV'
 
+
 def load_default_config_defns():
     """ loads all definition files from the default
         folder and returns the ConfigDefn object
@@ -227,8 +228,6 @@ def save_instance_defn_to_db(self, _delta_defn=None):
             for section, section_data in area_data['sections'].items():
                 self.db.add_instance(area, section, section_data)
 
-
-
     def get_type(self, _section, _key, _value):
         """ Returns the expected type of the setting
         """
@@ -249,7 +248,8 @@ def validate_list_item(self, _section, _key, _value):
                 if section == _section:
                     for setting in list(self.config_defn[module]['sections'][section]['settings'].keys()):
                         if setting == _key:
-                            if _value in str(self.config_defn[module]['sections'][section]['settings'][setting]['values']):
+                            if _value in str(
+                                    self.config_defn[module]['sections'][section]['settings'][setting]['values']):
                                 return True
                             else:
                                 return False
diff --git a/lib/config/configform_html.py b/lib/config/configform_html.py
index d0af790..79fcc86 100644
--- a/lib/config/configform_html.py
+++ b/lib/config/configform_html.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -26,7 +26,7 @@ def get_configform_html(_webserver):
     if 'area' in _webserver.query_data:
         configform = ConfigFormHTML()
         form = configform.get(_webserver.plugins.config_obj.defn_json.get_defn(
-            _webserver.query_data['area']), _webserver.query_data['area'])
+            _webserver.query_data['area']), _webserver.query_data['area'], _webserver.plugins.config_obj.data)
         _webserver.do_mime_response(200, 'text/html', form)
     else:
         _webserver.do_mime_response(404, 'text/html', web_templates['htmlError'].format('404 - Area Not Found'))
@@ -35,17 +35,16 @@ def get_configform_html(_webserver):
 @postrequest.route('/api/configform')
 def post_configform_html(_webserver):
     if _webserver.config['web']['disable_web_config']:
-        _webserver.do_mime_response(501, 'text/html', web_templates['htmlError']
+        _webserver.do_mime_response(
+            501, 'text/html', web_templates['htmlError']
             .format('501 - Config pages disabled. '
-                    'Set [web][disable_web_config] to False in the config file to enable'))
+            'Set [web][disable_web_config] to False in the config file to enable'))
     else:
         # Take each key and make a [section][key] to store the value
         config_changes = {}
         area = _webserver.query_data['area'][0]
         del _webserver.query_data['area']
-        namespace = _webserver.query_data['name']
         del _webserver.query_data['name']
-        instance = _webserver.query_data['instance']
         del _webserver.query_data['instance']
         for key in _webserver.query_data:
             key_pair = key.split('-', 1)
@@ -61,9 +60,11 @@ class ConfigFormHTML:
     def __init__(self):
         self.area = None
         self.config_defn = None
+        self.config = None
 
-    def get(self, _config_defn, _area):
+    def get(self, _config_defn, _area, _config):
         self.area = _area
+        self.config = _config
         self.config_defn = _config_defn
         return ''.join([self.header, self.body])
 
@@ -106,7 +107,8 @@ def tabs(self):
         active_tab = ' activeTab'
         area_html = ''.join(['<ul class="tabs">'])
         for section, section_data in self.config_defn['sections'].items():
-            area_html = ''.join([area_html,
+            area_html = ''.join([
+                area_html,
                 '<li><a id="tab', section_data['name'], '" class="form',
                 section_data['name'], ' configTab', active_tab, '" href="#">',
                 '<i class="md-icon tabIcon">',
@@ -131,11 +133,13 @@ def get_form(self, _section):
             '<form id="form', section_data['name'], '" class="sectionForm" ',
             'action="/api/configform" method="post">',
             section_data['description'],
-            '<table>'
+            '<div style="display: flex;"><table>'
         ])
         section_html = '<tbody>'
         subsection = None
         is_section_new = False
+        
+        plugin_image = ''
         for setting, setting_data in section_data['settings'].items():
             if setting_data['level'] == 4:
                 continue
@@ -148,7 +152,7 @@ def get_form(self, _section):
             if new_section != subsection and new_section is not None:
                 is_section_new = True
                 subsection = new_section
-                
+
             background_color = '#F0F0F0'
             if setting_data['help'] is not None:
                 title = ''.join([' title="', setting_data['help'], '"'])
@@ -206,21 +210,63 @@ def get_form(self, _section):
                     'name="', section_data['name'], '-', setting, '">',
                     option_html, '</select>'])
 
+            elif setting_data['type'] == 'image':
+                if setting != 'plugin_image':
+                    input_html = ''.join([
+                        '<img src="" width="128" ', 
+                        'style="border: var(--line-background) solid 1px;" ',
+                        'alt="',
+                        section_data['name'], '-', setting,
+                        '">'])
+                else:
+                    input_html = None
+                    img_size = self.lookup_config_size()
+                    plugin_image = ''.join([
+                        '<div style="left: 5%;position: relative;top: 20%;margin-top: 10px;">',
+                        '<img src="/api/manifest?plugin=',
+                        section_data['label'],
+                        '&key=icon" width="',
+                        str(img_size), '" ', 
+                        'style="border: var(--line-background) solid 1px;" ',
+                        'alt="',section_data['name'], '-', setting,'">',
+                        '</div>'
+                        ])
             if is_section_new:
                 is_section_new = False
                 section_html = ''.join([section_html,
-                '<tr class="hlevel"><td><hr><h3>', subsection.upper(), '</h3></td></tr>'])
-
-            section_html = ''.join([section_html,
-                '<tr class="dlevel', str(setting_data['level']),
-                '"><td><label ', title,
-                '>', setting_data['label'], '</label></td><td>', input_html,
-                '</td></tr>'])
-        return ''.join([form_html, section_html, '</tbody></table>'
-            '<button id="submit" STYLE="background-color: #E0E0E0; margin-top:1em" ',
+                                        '<tr class="hlevel"><td><hr><h3>', subsection.upper(), '</h3></td></tr>'])
+            if input_html:
+                section_html = ''.join([section_html,
+                                        '<tr class="dlevel', str(setting_data['level']),
+                                        '"><td><label ', title,
+                                        '>', setting_data['label'], '</label></td><td>', input_html,
+                                        '</td></tr>'])
+        return ''.join([
+            form_html, section_html, '</tbody></table>', plugin_image,
+            '</div><button id="submit" class="button" STYLE="margin:1em" ',
             'type="submit"><b>Save changes</b></button>',
             '<input type=hidden name="area" value="', self.area, '"></form>'])
 
+    def lookup_config_size(self):
+        size_text = self.config['channels']['thumbnail_size']
+        if size_text == 'None':
+            return 0
+        elif size_text == 'Tiny(16)':
+            return 16
+        elif size_text == 'Small(48)':
+            return 48
+        elif size_text == 'Medium(128)':
+            return 128
+        elif size_text == 'Large(180)':
+            return 180
+        elif size_text == 'X-Large(270)':
+            return 270
+        elif size_text == 'Full-Size':
+            return None
+        else:
+            return None
+
+
     @property
     def body(self):
         if self.config_defn is None:
diff --git a/lib/config/user_config.py b/lib/config/user_config.py
index ed5c588..935be50 100644
--- a/lib/config/user_config.py
+++ b/lib/config/user_config.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -22,9 +22,8 @@
 import logging
 import pathlib
 import os
+import re
 import shutil
-import time
-import urllib
 
 import lib.common.utils as utils
 import lib.config.config_defn as config_defn
@@ -35,10 +34,10 @@
 from lib.common.decorators import Backup
 from lib.common.decorators import Restore
 
-
 CONFIG_BKUP_NAME = 'backups-config_ini'
 CONFIG_FILENAME = 'config.ini'
 
+
 def get_config(script_dir, opersystem, args):
     return TVHUserConfig(script_dir, opersystem, args)
 
@@ -47,22 +46,24 @@ def get_config(script_dir, opersystem, args):
 def config_json(_webserver):
     if _webserver.config['web']['disable_web_config']:
         _webserver.do_mime_response(501, 'text/html', web_templates['htmlError']
-            .format('501 - Config pages disabled.'
-                    ' Set [web][disable_web_config] to False in the config file to enable'))
+                                    .format('501 - Config pages disabled.'
+                                            ' Set [web][disable_web_config] to False in the config file to enable'))
     else:
-        _webserver.do_mime_response(200, 'application/json', json.dumps(_webserver.plugins.config_obj.filter_config_data()))
+        _webserver.do_mime_response(200, 'application/json',
+                                    json.dumps(_webserver.plugins.config_obj.filter_config_data()))
 
 
 class TVHUserConfig:
 
-    config_handler = configparser.ConfigParser(interpolation=None)
-
     def __init__(self, _script_dir=None, _opersystem=None, _args=None, _config=None):
         self.logger = None
         self.defn_json = None
+        self.db = None
         self.script_dir = str(_script_dir)
         self.defn_json = config_defn.load_default_config_defns()
         self.data = self.defn_json.get_default_config()
+        self.config_handler = configparser.ConfigParser(interpolation=None)
+
         if _script_dir is not None:
             config_file = TVHUserConfig.get_config_path(_script_dir, _args)
             self.import_config(config_file)
@@ -78,7 +79,7 @@ def __init__(self, _script_dir=None, _opersystem=None, _args=None, _config=None)
             self.defn_json.garbage_collect()
         self.db = DBConfigDefn(self.data)
         self.db.add_config(self.data)
-        
+
     def refresh_config_data(self):
         self.data = self.db.get_config()
 
@@ -89,8 +90,8 @@ def set_config(self, _config):
 
     def init_logger_config(self):
         log_sections = ['loggers', 'logger_root', 'handlers', 'formatters',
-            'handler_filehandler', 'handler_loghandler', 
-            'formatter_extend', 'formatter_simple']
+                        'handler_filehandler', 'handler_loghandler',
+                        'formatter_extend', 'formatter_simple']
         for section in log_sections:
             try:
                 self.config_handler.add_section(section)
@@ -112,8 +113,20 @@ def import_config(self, config_file):
         self.logger = logging.getLogger(__name__)
         self.logger.info("Loading Configuration File: " + str(config_file))
 
+        search_section_name = re.compile('^[a-zA-Z0-9]+_?[a-zA-Z0-9]+$')
+
         for each_section in self.config_handler.sections():
             lower_section = each_section.lower()
+            if each_section != lower_section:
+                self.logger.error('ERROR: ALL SECTIONS IN THE config.ini MUST BE LOWER CASE. Found: {}'
+                    .format(each_section))
+                continue
+            m = re.match(search_section_name, each_section)
+            if m is None:
+                self.logger.error('ERROR: INVALID SECTION NAME IN THE config.ini. Found: {}'
+                    .format(each_section))
+                continue
+
             if lower_section not in self.data.keys():
                 self.data.update({lower_section: {}})
             for (each_key, each_val) in self.config_handler.items(each_section):
@@ -124,14 +137,27 @@ def import_config(self, config_file):
     @staticmethod
     def get_config_path(_script_dir, args=None):
         config_file = None
+        poss_config = None
         if args is not None and args.cfg:
             config_file = pathlib.Path(str(args.cfg))
         else:
-            for x in [CONFIG_FILENAME, 'data/'+CONFIG_FILENAME]:
+            for x in [CONFIG_FILENAME, 'data/' + CONFIG_FILENAME]:
                 poss_config = pathlib.Path(_script_dir).joinpath(x)
                 if os.path.exists(poss_config):
                     config_file = poss_config
                     break
+            if not config_file:
+                # create one in the data folder
+                try:
+                    data_folder = pathlib.Path(_script_dir).joinpath('data')
+                    if not data_folder.exists():
+                        os.mkdir(data_folder)
+                    f = open('data/' + CONFIG_FILENAME, 'wb')
+                    config_file = pathlib.Path(data_folder).joinpath(CONFIG_FILENAME)
+                    f.close()
+                except PermissionError as e:
+                    print('ERROR: {} unable to create {}'.format(str(e), poss_config))
+                    
         if config_file and os.path.exists(config_file):
             return config_file
         else:
@@ -148,7 +174,7 @@ def fix_value_type(self, _section, _key, _value):
                     _value = int(_value)
                 if not self.defn_json.validate_list_item(_section, _key, _value):
                     logging.info('INVALID VALUE ({}) FOR CONFIG ITEM [{}][{}]'
-                        .format(_value, _section, _key))
+                                 .format(_value, _section, _key))
                 return _value
             elif val_type == 'integer':
                 return int(_value)
@@ -184,7 +210,7 @@ def detect_change(self, _section, _key, _updated_data):
             pass
         else:
             self.logger.debug('unknown value type for [{}][{}]  type is {}'
-                .format(_section, _key, type(self.data[_section][_key])))
+                              .format(_section, _key, type(self.data[_section][_key])))
 
         if self.data[_section][_key] != _updated_data[_section][_key][0]:
             if len(_updated_data[_section][_key]) > 1:
@@ -204,6 +230,8 @@ def update_config(self, _area, _updated_data):
         # make sure the config_handler has all the data from the file
         self.config_handler.read(self.data['paths']['config_file'])
 
+        results = '<hr><h3>Status Results</h3><ul>'
+
         area_data = self.defn_json.get_defn(_area)
         for section, section_data in area_data['sections'].items():
             if section in _updated_data:
@@ -224,17 +252,17 @@ def update_config(self, _area, _updated_data):
                             self.detect_change(section, setting, _updated_data)
 
         # save the changes to config.ini and self.data
-        results = '<hr><h3>Status Results</h3><ul>'
-
         config_defaults = self.defn_json.get_default_config_area(_area)
         for key in _updated_data.keys():
             results += self.save_config_section(key, _updated_data, config_defaults)
+
+        results += self.defn_json.call_onchange(_area, _updated_data, self)
         with open(self.data['paths']['config_file'], 'w') as config_file:
             self.config_handler.write(config_file)
 
         # need to inform things that changes occurred...
         restart = False
-        results += self.defn_json.call_onchange(_area, _updated_data, self)
+
         self.db.add_config(self.data)
         if restart:
             results += '</ul><b>Service may need to be restarted if not all changes were implemented</b><hr><br>'
@@ -245,7 +273,7 @@ def update_config(self, _area, _updated_data):
     def save_config_section(self, _section, _updated_data, _config_defaults):
         results = ''
         for (key, value) in _updated_data[_section].items():
-            if value[1]:
+            if len(value) > 1 and value[1]:
                 if value[0] is None:
                     # use default and remove item from config.ini
                     try:
@@ -256,19 +284,18 @@ def save_config_section(self, _section, _updated_data, _config_defaults):
                         = _config_defaults[_section][key]
                     self.logger.debug(
                         'Config Update: Removed [{}][{}]'.format(_section, key))
-                    results += \
-                        '<li>Removed [{}][{}] from {}, using default value</li>' \
+                    results += '<li>Removed [{}][{}] from {}, using default value</li>'\
                         .format(_section, key, CONFIG_FILENAME)
                 else:
                     # set new value
                     if len(_updated_data[_section][key]) == 3:
                         self.logger.debug(
                             'Config Update: Changed [{}][{}] updated'
-                                .format(_section, key))
+                            .format(_section, key))
                     else:
                         self.logger.debug(
                             'Config Update: Changed [{}][{}] to {}'
-                                .format(_section, key, _updated_data[_section][key][0]))
+                            .format(_section, key, _updated_data[_section][key][0]))
 
                     try:
                         self.config_handler.set(
@@ -277,13 +304,14 @@ def save_config_section(self, _section, _updated_data, _config_defaults):
                         self.config_handler.add_section(_section)
                         self.config_handler.set(
                             _section, key, str(_updated_data[_section][key][0]))
-                    self.data[_section][key] = _updated_data[_section][key][0]
-                    if len(_updated_data[_section][key]) == 3:
-                        results += '<li>Updated [{}][{}] updated</li>' \
-                            .format(_section, key)
-                    else:
-                        results += '<li>Updated [{}][{}] to {}</li>' \
-                            .format(_section, key, _updated_data[_section][key][0])
+                    if self.data.get(_section) is not None:
+                        self.data[_section][key] = _updated_data[_section][key][0]
+                        if len(_updated_data[_section][key]) == 3:
+                            results += '<li>Updated [{}][{}] updated</li>' \
+                                .format(_section, key)
+                        else:
+                            results += '<li>Updated [{}][{}] to {}</li>' \
+                                .format(_section, key, _updated_data[_section][key][0])
         return results
 
     def write(self, _section, _key, _value):
@@ -301,6 +329,9 @@ def write(self, _section, _key, _value):
             self.config_handler.set(_section, _key, str(_value))
         with open(self.data['paths']['config_file'], 'w') as config_file:
             self.config_handler.write(config_file)
+        if self.db:
+            self.db.add_config(self.data)
+
 
 class BackupConfig:
 
@@ -315,8 +346,8 @@ def backup(self, backup_folder):
             if not os.path.isdir(backup_folder):
                 os.mkdir(backup_folder)
             backup_file = pathlib.Path(backup_folder, CONFIG_FILENAME)
-            shutil.copyfile(self.config['paths']['config_file'], 
-                backup_file)
+            shutil.copyfile(self.config['paths']['config_file'],
+                            backup_file)
         except PermissionError as e:
             self.logger.warning(e)
             self.logger.warning('Unable to make backups')
@@ -333,6 +364,6 @@ def restore(self, backup_folder):
             msg = 'Backup file does not exist, skipping: {}'.format(backup_file)
             self.logger.info(msg)
             return msg
-        shutil.copyfile(backup_file, 
-            self.config['paths']['config_file'])
-        return CONFIG_FILENAME+' restored, please restart the app'
+        shutil.copyfile(backup_file,
+                        self.config['paths']['config_file'])
+        return CONFIG_FILENAME + ' restored, please restart the app'
diff --git a/lib/db/datamgmt/backups.py b/lib/db/datamgmt/backups.py
index e96728d..66cb89b 100644
--- a/lib/db/datamgmt/backups.py
+++ b/lib/db/datamgmt/backups.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -18,23 +18,22 @@
 
 import datetime
 import glob
-import importlib
-import inspect
 import logging
 import os
 import pathlib
 import shutil
-import time
 import zipfile
 
+import lib.common.utils as utils
 from lib.db.db_scheduler import DBScheduler
 from lib.common.decorators import Backup
 from lib.common.decorators import Restore
 from lib.db.db_config_defn import DBConfigDefn
 
-BACKUP_FOLDER_NAME = 'CarbernetBackup'
-CODE_DIRS_TO_IGNORE = ['__pycache__', 'data', '.git', '.github', 'build', 'plugins_ext', 'misc']
-CODE_FILES_TO_IGNORE = ['config.ini', 'is_container']
+BACKUP_FOLDER_NAME = 'CabernetBackup'
+CODE_DIRS_TO_IGNORE = ['__pycache__', 'data', '.git', 'ffmpeg', 'streamlink', '.github', 'build', 'misc']
+CODE_FILES_TO_IGNORE = ['config.ini', 'is_container', 'uninst.exe']
+
 
 def scheduler_tasks(config):
     scheduler_db = DBScheduler(config)
@@ -47,33 +46,37 @@ def scheduler_tasks(config):
             20,
             'thread',
             'Backs up cabernet data including databases and config'
-            ):
+    ):
         scheduler_db.save_trigger(
             'Applications',
             'Backup',
             'weekly',
             dayofweek='Sunday',
             timeofday='02:00'
-            )
-    #Backup.log_backups()
+        )
+    # Backup.log_backups()
+
 
 def backup_data(_plugins):
     b = Backups(_plugins)
     b.backup_data()
     return True
 
+
 class Backups:
     def __init__(self, _plugins):
         self.logger = logging.getLogger(__name__)
         self.plugins = _plugins
         self.config = _plugins.config_obj.data
+        if self.config['paths']['external_plugins_pkg'] not in CODE_DIRS_TO_IGNORE:
+            CODE_DIRS_TO_IGNORE.append(self.config['paths']['external_plugins_pkg'])
 
     def backup_data(self):
         # get the location where the backups will be stored
         # also deal with the number of backup folder limit and clean up
         backups_to_retain = self.config['datamgmt']['backups-backupstoretain'] - 1
         backups_location = self.config['datamgmt']['backups-location']
-        folderlist = sorted(glob.glob(os.path.join(backups_location, BACKUP_FOLDER_NAME+'*')))
+        folderlist = sorted(glob.glob(os.path.join(backups_location, BACKUP_FOLDER_NAME + '*')))
 
         while len(folderlist) > backups_to_retain:
             try:
@@ -81,8 +84,8 @@ def backup_data(self):
             except PermissionError as e:
                 logging.warning(e)
                 break
-            folderlist = sorted(glob.glob(os.path.join(backups_location, BACKUP_FOLDER_NAME+'*')))
-        new_backup_folder = BACKUP_FOLDER_NAME + datetime.datetime.now().strftime('_%Y%m%d_%H%M')
+            folderlist = sorted(glob.glob(os.path.join(backups_location, BACKUP_FOLDER_NAME + '*')))
+        new_backup_folder = BACKUP_FOLDER_NAME +'_'+ utils.VERSION + datetime.datetime.now().strftime('_%Y%m%d_%H%M')
         new_backup_path = pathlib.Path(backups_location, new_backup_folder)
 
         for key in Backup.backup2func.keys():
@@ -125,7 +128,7 @@ def backup_code(self, _backup_folder):
         # default compression is 6
         zf = zipfile.ZipFile(pathlib.Path(
             self.config['datamgmt']['backups-location'], _backup_folder,
-            'cabernet_code.zip'), 
+            'cabernet_code.zip'),
             'w', compression=zipfile.ZIP_DEFLATED)
 
         base_path = os.path.dirname(self.config['paths']['main_dir'])
@@ -144,8 +147,8 @@ def backup_code(self, _backup_folder):
             rel_dirname = dirname.replace(base_path, '.')
             zf.write(dirname, arcname=rel_dirname)
             for filename in files:
-                zf.write(os.path.join(dirname, filename), 
-                    arcname=pathlib.Path(rel_dirname, filename))
+                zf.write(os.path.join(dirname, filename),
+                         arcname=pathlib.Path(rel_dirname, filename))
         zf.close()
         return True
 
@@ -157,7 +160,12 @@ def delete_code(self):
                     subdirs.remove(d)
             for filename in files:
                 if filename not in CODE_FILES_TO_IGNORE:
-                    os.remove(os.path.join(dirname, filename))
+                    try:
+                        os.remove(os.path.join(dirname, filename))
+                    except PermissionError as ex:
+                        self.logger.notice(
+                            'Exception: {}  Unable to delete file prior to overlaying upgrade'
+                            .format(str(ex)))
         return True
 
     def restore_code(self, _folder):
@@ -167,17 +175,22 @@ def restore_code(self, _folder):
         files, so standard code filtering is required.
         """
         new_code_path = os.path.join(self.config['paths']['tmp_dir'],
-            _folder)
+                                     _folder)
         for dirname, subdirs, files in os.walk(new_code_path):
             for d in CODE_DIRS_TO_IGNORE:
                 if d in subdirs:
                     subdirs.remove(d)
             rel_dirname = dirname.replace(new_code_path, '.')
             for filename in files:
-                os.makedirs(os.path.join(self.config['paths']['main_dir'], rel_dirname), \
-                    exist_ok=True)
-                shutil.move(os.path.join(dirname, filename), 
-                    os.path.join(self.config['paths']['main_dir'], rel_dirname))
+                os.makedirs(os.path.join(self.config['paths']['main_dir'], rel_dirname),
+                            exist_ok=True)
+                try:
+                    dest = shutil.move(os.path.join(dirname, filename),
+                                os.path.join(self.config['paths']['main_dir'], rel_dirname))
+                except shutil.Error as ex:
+                    self.logger.notice(
+                        'Exception: {}  Unable to overlay new file'
+                        .format(str(ex)))
 
     def check_code_write_permissions(self):
         result = ''
@@ -192,5 +205,3 @@ def check_code_write_permissions(self):
             return None
         else:
             return result
-
-
diff --git a/lib/db/datamgmt/data_mgmt_html.py b/lib/db/datamgmt/data_mgmt_html.py
index 2491fa1..a26f8c0 100644
--- a/lib/db/datamgmt/data_mgmt_html.py
+++ b/lib/db/datamgmt/data_mgmt_html.py
@@ -18,29 +18,27 @@
 
 import datetime
 import glob
-import json
 import logging
 import platform
 import re
 import shutil
 import os
 
+import lib.db.datamgmt.backups as backups
+from lib.common import utils
 from lib.common.decorators import getrequest
 from lib.common.decorators import postrequest
-import lib.db.datamgmt.backups as backups
 from lib.db.db_channels import DBChannels
 from lib.db.db_epg import DBepg
 from lib.db.db_epg_programs import DBEpgPrograms
 from lib.db.db_scheduler import DBScheduler
 from lib.db.db_plugins import DBPlugins
 
-
-BACKUP_FOLDER_NAME = 'CarbernetBackup'
+BACKUP_FOLDER_NAME = '*Backup'
 
 
-@getrequest.route('/api/data_mgmt')
+@getrequest.route('/api/datamgmt')
 def get_data_mgmt_html(_webserver):
-    plugin_list = _webserver.plugins.plugins.keys()
     data_mgmt_html = DataMgmtHTML(_webserver.plugins)
     if 'delete' in _webserver.query_data:
         data_mgmt_html.del_backup(_webserver.query_data['delete'])
@@ -52,25 +50,28 @@ def get_data_mgmt_html(_webserver):
     _webserver.do_mime_response(200, 'text/html', html)
 
 
-@postrequest.route('/api/data_mgmt')
+@postrequest.route('/api/datamgmt')
 def post_data_mgmt_html(_webserver):
-    plugin_list = _webserver.plugins.plugins.keys()
-    data_mgmt_html = DataMgmtHTML(_webserver.plugins)
     if 'folder' in _webserver.query_data:
         html = restore_from_backup(_webserver.plugins, _webserver.query_data)
     elif 'action' in _webserver.query_data:
         action = _webserver.query_data['action'][0]
         if action == 'reset_channel':
-            html = reset_channels(_webserver.plugins.config_obj.data, 
+            html = reset_channels(
+                _webserver.plugins.config_obj.data,
                 _webserver.query_data['name'][0], _webserver.query_data['resetedits'][0])
         elif action == 'reset_epg':
-            html = reset_epg(_webserver.plugins.config_obj.data, 
+            html = reset_epg(
+                _webserver.plugins.config_obj.data,
                 _webserver.query_data['name'][0])
         elif action == 'reset_scheduler':
-            html = reset_sched(_webserver.plugins.config_obj.data,
-                _webserver.query_data['name'][0])
+            html = reset_sched(
+                _webserver.plugins.config_obj.data,
+                _webserver.query_data['name'][0],
+                _webserver.sched_queue)
         elif action == 'del_instance':
-            html = del_instance(_webserver.plugins.config_obj.data,
+            html = del_instance(
+                _webserver.plugins.config_obj.data,
                 _webserver.query_data['name'][0])
         else:
             # database action request
@@ -96,8 +97,8 @@ def reset_epg(_config, _name):
     db_epg = DBepg(_config)
     db_epg.del_instance(_name, None)
     db_epg.set_last_update(_name)
-    #db_epg_programs = DBEpgPrograms(_config)
-    #db_epg_programs.del_namespace(_name)
+    # db_epg_programs = DBEpgPrograms(_config)
+    # db_epg_programs.del_namespace(_name)
 
     if _name is None:
         return 'EPG updated and will refresh all days on next request'
@@ -106,69 +107,68 @@ def reset_epg(_config, _name):
             .format(_name)
 
 
-def reset_sched(_config, _name):
+def reset_sched(_config, _name, _sched_queue):
     db_scheduler = DBScheduler(_config)
     tasks = db_scheduler.get_tasks_by_name(_name)
     html = ''
     for task in tasks:
-        db_scheduler.del_task(task['area'], task['title'])
-        html = ''.join([html, 
-            '<b>', task['area'], ':', task['title'], 
-            '</b> deleted from Scheduler<br>'
-            ])
-    return ''.join([html, 
-        'Restart the app to re-populate the scheduler with defaults'])
+        _sched_queue.put({'cmd': 'deltask', 'taskid': task['taskid']})
+        #db_scheduler.del_task(task['area'], task['title'])
+        html = ''.join([html,
+                        '<b>', task['area'], ':', task['title'],
+                        '</b> deleted from Scheduler<br>'
+                        ])
+    return ''.join([html,
+                    'Restart the app to re-populate the scheduler with defaults'])
+
 
 def del_instance(_config, _name):
     if _name is None:
         return 'Instance set to None. No instances deleted'
     if ':' not in _name:
         return 'Invalid action. Request ignored'
-    name_inst = _name.split(':',1)
+    name_inst = _name.split(':', 1)
 
     html = ''
     db_plugins = DBPlugins(_config)
-    num_del = db_plugins.del_instance(name_inst[0], name_inst[1])
+    num_del = db_plugins.del_instance(None, name_inst[0], name_inst[1])
     if num_del > 0:
         html = ''.join([html,
-            '<b>', _name, '</b> deleted from Plugins<br>'
-            ])
+                        '<b>', _name, '</b> deleted from Plugins<br>'
+                        ])
 
     db_channels = DBChannels(_config)
     db_channels.del_status(name_inst[0], name_inst[1])
     num_del = db_channels.del_channels(name_inst[0], name_inst[1])
     if num_del > 0:
-        html = ''.join([html, 
-            '<b>', _name, '</b> deleted from Channels<br>'
-            ])
+        html = ''.join([html,
+                        '<b>', _name, '</b> deleted from Channels<br>'
+                        ])
 
     db_epg = DBepg(_config)
     db_epg.del_instance(name_inst[0], name_inst[1])
     if num_del > 0:
-        html = ''.join([html, 
-            '<b>', _name, '</b> deleted from EPG<br>'
-            ])
+        html = ''.join([html,
+                        '<b>', _name, '</b> deleted from EPG<br>'
+                        ])
 
     db_programs = DBEpgPrograms(_config)
     db_programs.del_namespace(name_inst[0])
     if num_del > 0:
-        html = ''.join([html, 
-            '<b>', name_inst[0], '</b> deleted from EPG Programs<br>'
-            ])
-
+        html = ''.join([html,
+                        '<b>', name_inst[0], '</b> deleted from EPG Programs<br>'
+                        ])
 
     db_sched = DBScheduler(_config)
     task_list = db_sched.get_tasks_by_name(name_inst[0], name_inst[1])
     for task in task_list:
         db_sched.del_task(task['area'], task['title'])
     if len(task_list) > 0:
-        html = ''.join([html, 
-            '<b>', _name, '</b> deleted from Scheduler<br>'
-            ])
-    return ''.join([html, 
-        'Restart the app to re-populate the scheduler with defaults'])
-
-
+        html = ''.join([html,
+                        '<b>', _name, '</b> deleted from Scheduler<br>'
+                        ])
+    return ''.join([html,
+                    'Restart the app to re-populate the scheduler with defaults'])
 
 
 def restore_from_backup(_plugins, _query_data):
@@ -179,7 +179,6 @@ def restore_from_backup(_plugins, _query_data):
     del _query_data['instance']
     del _query_data['folder']
     html = ''
-    successful = True
     for restore_key, status in _query_data.items():
         if status[0] == '1':
             msg = b.restore_data(folder, restore_key)
@@ -187,7 +186,6 @@ def restore_from_backup(_plugins, _query_data):
                 html = ''.join([html, bkup_defn[restore_key]['label'], ' Restored<br>'])
             else:
                 html = ''.join([html, msg, '<br>'])
-                successful = False
     return html
 
 
@@ -197,6 +195,7 @@ def __init__(self, _plugins):
         self.logger = logging.getLogger(__name__)
         self.config = _plugins.config_obj.data
         self.bkups = backups.Backups(_plugins)
+        self.search_date = re.compile('[^_]+(_([\d.]+[-RC\d]*))?_(\d*?_\d*)')
 
     def get(self):
         return ''.join([self.header, self.body])
@@ -213,7 +212,7 @@ def header(self):
             '<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>',
             '<link rel="stylesheet" type="text/css" href="/modules/datamgmt/datamgmt.css">',
             '<script src="/modules/datamgmt/datamgmt.js"></script>'
-            ])
+        ])
 
     @property
     def title(self):
@@ -225,15 +224,14 @@ def title(self):
     @property
     def body(self):
         return ''.join(['<body>', self.title, self.db_updates, self.backups,
-            '</body>'
-            ])
-
+                        '</body>'
+                        ])
 
     @property
     def db_updates(self):
         html = ''.join([
             '<section id="reset_status"></section>',
-            '<form action="/api/data_mgmt" method="post">',
+            '<form action="/api/datamgmt" method="post">',
             '<table class="dmTable" width=95%>',
             '<tr>',
             '<td class="dmIcon">',
@@ -241,60 +239,60 @@ def db_updates(self):
             '<td class="dmItem" >',
             '<div class="dmItemTitle">Reset Channel Data &nbsp; ',
             '<input type="hidden" name="action" value="reset_channel">',
-            '<button type="submit">Reset</button></div>',
+            '<button class="button" type="submit">Reset</button></div>',
             '<div>Next channel request will force pull new data</div></td>',
         ])
         html_select = self.select_reset_channel
         html = ''.join([html, html_select,
-            '<tr><td colspan=3><hr></td></tr></table></form>',
-            '<form action="/api/data_mgmt" method="post">',
-            '<table class="dmTable" width=95%>',
-            '<tr>',
-            '<td class="dmIcon">',
-            '<i class="md-icon">inventory_2</i></td>',
-            '<td class="dmItem">',
-            '<div class="dmItemTitle">Reset EPG Data &nbsp; ',
-            '<input type="hidden" name="action" value="reset_epg">',
-            '<button type="submit">Reset</button></div>',
-            '<div>Next epg request will pull all days</div></td>',
-        ])
+                        '<tr><td colspan=3><hr></td></tr></table></form>',
+                        '<form action="/api/datamgmt" method="post">',
+                        '<table class="dmTable" width=95%>',
+                        '<tr>',
+                        '<td class="dmIcon">',
+                        '<i class="md-icon">inventory_2</i></td>',
+                        '<td class="dmItem">',
+                        '<div class="dmItemTitle">Reset EPG Data &nbsp; ',
+                        '<input type="hidden" name="action" value="reset_epg">',
+                        '<button class="button" type="submit">Reset</button></div>',
+                        '<div>Next epg request will pull all days</div></td>',
+                        ])
         html_select = self.select_reset_epg
         html = ''.join([html, html_select,
-            '<tr><td colspan=3><hr></td></tr></table></form>',
-            '<form action="/api/data_mgmt" method="post">',
-            '<table class="dmTable" width=95%>',
-            '<tr>',
-            '<td class="dmIcon">',
-            '<i class="md-icon">inventory_2</i></td>',
-            '<td class="dmItem">',
-            '<div class="dmItemTitle">Reset Scheduler Tasks &nbsp; ',
-            '<input type="hidden" name="action" value="reset_scheduler">',
-            '<button type="submit">Reset</button></div>',
-            '<div>Scheduler will reload default tasks on next app restart</div></td>',
-        ])
+                        '<tr><td colspan=3><hr></td></tr></table></form>',
+                        '<form action="/api/datamgmt" method="post">',
+                        '<table class="dmTable" width=95%>',
+                        '<tr>',
+                        '<td class="dmIcon">',
+                        '<i class="md-icon">inventory_2</i></td>',
+                        '<td class="dmItem">',
+                        '<div class="dmItemTitle">Reset Scheduler Tasks &nbsp; ',
+                        '<input type="hidden" name="action" value="reset_scheduler">',
+                        '<button class="button" type="submit">Reset</button></div>',
+                        '<div>Scheduler will reload default tasks on next app restart</div></td>',
+                        ])
         html_select = self.select_reset_sched
         html = ''.join([html, html_select,
-            '<tr><td colspan=3><hr></td></tr></table></form>',
-            '<form action="/api/data_mgmt" method="post">',
-            '<table class="dmTable" width=95%>',
-            '<tr>',
-            '<td class="dmIcon">',
-            '<i class="md-icon">inventory_2</i></td>',
-            '<td class="dmItem">',
-            '<div class="dmItemTitle">Delete Instance &nbsp; ',
-            '<input type="hidden" name="action" value="del_instance">',
-            '<button type="submit">Delete</button></div>',
-            '<div>Deletes the instance data from the database file.  Update config.ini, as needed, and restart app following a delete</div></td>',
-        ])
+                        '<tr><td colspan=3><hr></td></tr></table></form>',
+                        '<form action="/api/datamgmt" method="post">',
+                        '<table class="dmTable" width=95%>',
+                        '<tr>',
+                        '<td class="dmIcon">',
+                        '<i class="md-icon">inventory_2</i></td>',
+                        '<td class="dmItem">',
+                        '<div class="dmItemTitle">Delete Instance &nbsp; ',
+                        '<input type="hidden" name="action" value="del_instance">',
+                        '<button class="button" type="submit">Delete</button></div>',
+                        '<div>Deletes the instance data from the database file.  Update config.ini, ',
+                        'as needed, and restart app following a delete</div></td>',
+                        ])
         html_select = self.select_del_instance
         html = ''.join([html, html_select,
-            '</select></td></tr>'
-            '<tr><td colspan=3><hr></td></tr>',
-            '</table></form><br>',
-            ])
+                        '</select></td></tr>'
+                        '<tr><td colspan=3><hr></td></tr>',
+                        '</table></form><br>',
+                        ])
         return html
 
-    
     @property
     def backups(self):
         html = ''.join([
@@ -307,37 +305,37 @@ def backups(self):
         ])
         backups_location = self.config['datamgmt']['backups-location']
         folderlist = sorted(glob.glob(os.path.join(
-            backups_location, BACKUP_FOLDER_NAME+'*')), reverse=True)
+            backups_location, BACKUP_FOLDER_NAME + '*')), reverse=True)
         for folder in folderlist:
             filename = os.path.basename(folder)
             datetime_str = self.get_backup_date(filename)
             if datetime_str is None:
                 continue
             html = ''.join([html,
-                '<tr>',
-                '<td class="dmIcon">',
-                '<a href="#" onclick=\'load_backup_url("/api/data_mgmt?restore=',
-                filename, '")\'>',
-                '<i class="md-icon">folder</i></a></td>',
-                '<td class="dmItem">',
-                '<a href="#" onclick=\'load_backup_url("/api/data_mgmt?restore=',
-                filename, '")\'>',
-                '<div class="dmItemTitle">', datetime_str, '</div>',
-                '<div>', folder, '</div></td>',
-                '<td class="dmIcon">',
-                '<a href="#" onclick=\'load_dm_url("/api/data_mgmt?delete=', 
-                filename, '")\'>',
-                '<i class="md-icon">delete_forever</i></a></td>',
-                '</tr>'
-            ])
-        html = ''.join([html, 
-            '</table>',
-            '</div>'
-            ])
+                            '<tr>',
+                            '<td class="dmIcon">',
+                            '<a href="#" onclick=\'load_backup_url("/api/datamgmt?restore=',
+                            filename, '")\'>',
+                            '<i class="md-icon">folder</i></a></td>',
+                            '<td class="dmItem">',
+                            '<a href="#" onclick=\'load_backup_url("/api/datamgmt?restore=',
+                            filename, '")\'>',
+                            '<div class="dmItemTitle">', datetime_str, '</div>',
+                            '<div>', folder, '</div></td>',
+                            '<td class="dmIcon">',
+                            '<a href="#" onclick=\'load_dm_url("/api/datamgmt?delete=',
+                            filename, '")\'>',
+                            '<i class="md-icon">delete_forever</i></a></td>',
+                            '</tr>'
+                            ])
+        html = ''.join([html,
+                        '</table>',
+                        '</div>'
+                        ])
         return html
 
     def del_backup(self, _folder):
-        valid_regex = re.compile('^([a-zA-Z0-9_]+$)')
+        valid_regex = re.compile('^([a-zA-Z0-9_.]+$)')
         if not valid_regex.match(_folder):
             self.logger.info('Invalid backup folder to delete: {}'.format(_folder))
             return
@@ -356,15 +354,15 @@ def restore_form(self, _folder):
 
         html = ''.join([
             '<script src="/modules/datamgmt/restore_backup.js"></script>'
-            '<form action="/api/data_mgmt" method="post">',
+            '<form action="/api/datamgmt" method="post">',
             '<table class="dmTable" width=95%>',
             '<tr>',
             '<td class="dmIcon">',
-            '<a href="#" onclick=\'load_dm_url("/api/data_mgmt")\'>',
+            '<a href="#" onclick=\'load_dm_url("/api/datamgmt")\'>',
             '<div ><i class="md-icon">arrow_back</i></div></a></td>',
             '<td colspan=2 class="dmSection"><div >',
             'Backup from: ', datetime_str, '</div></td>'
-            '</tr>',
+                                           '</tr>',
             '<tr>',
             '<td></td>',
             '<td colspan=2><div>',
@@ -372,42 +370,50 @@ def restore_form(self, _folder):
             '</tr>',
             '<tr><td colspan=3><section id="status"></section></td></tr>',
             '<tr><td colspan=3>',
-            '<button class="dmButton" id="submit" STYLE="background-color: #E0E0E0; margin-top:1em" ',
+            '<button class="button dmButton" id="submit" STYLE="color: var(--theme-text-color); background-color: var(--button-background); margin-top:1em" ',
             'type="submit"><b>Restore Now</b></button>',
             '</td></tr>'
-            ])
+        ])
         bkup_defn = self.bkups.backup_list()
         for key in bkup_defn.keys():
-            html = ''.join([html, 
-                '<tr>',
-                '<td class="dmIcon">',
-                '<input value="1" type="checkbox" name="', key, '" checked="checked">',
-                '<input name="', key, '" value="0" type="hidden">',
-                '</td>',
-                '<td colspan=2>',
-                bkup_defn[key]['label'],
-                '</td>',
-                '</tr>'
-            ])
-        html = ''.join([html, 
-            '</table>',
-            '<input type="hidden" name="folder" value="', _folder, '">',
-            '</form>'
-            ])
+            html = ''.join([html,
+                            '<tr>',
+                            '<td class="dmIcon">',
+                            '<input value="1" type="checkbox" name="', key, '" checked="checked">',
+                            '<input name="', key, '" value="0" type="hidden">',
+                            '</td>',
+                            '<td colspan=2>',
+                            bkup_defn[key]['label'],
+                            '</td>',
+                            '</tr>'
+                            ])
+        html = ''.join([html,
+                        '</table>',
+                        '<input type="hidden" name="folder" value="', _folder, '">',
+                        '</form>'
+                        ])
         return html
 
     def get_backup_date(self, _filename):
         try:
-            datetime_obj = datetime.datetime.strptime(_filename, 
-                BACKUP_FOLDER_NAME + '_%Y%m%d_%H%M')
+            m = re.match(self.search_date, _filename)
+            if m and len(m.groups()) == 3:
+                ver = m.group(2)
+                if ver is None:
+                    ver = ''
+                date_str = m.group(3)
+                datetime_obj = datetime.datetime.strptime(
+                    date_str, '%Y%m%d_%H%M')
+            else:
+                raise ValueError('Filename incorrect format')
         except ValueError as e:
-            self.logger.info('Bad backup folder name {}: {}'.format(filename, e))
+            self.logger.info('Bad backup folder name {}: {}'.format(_filename, e))
             return None
         opersystem = platform.system()
         if opersystem in ['Windows']:
-            return datetime_obj.strftime('%m/%d/%Y, %#I:%M %p')
+            return datetime_obj.strftime('%m/%d/%Y, %#I:%M %p ' + str(ver))
         else:
-            return datetime_obj.strftime('%m/%d/%Y, %-I:%M %p')
+            return datetime_obj.strftime('%m/%d/%Y, %-I:%M %p ' + str(ver))
 
     @property
     def select_reset_channel(self):
@@ -418,12 +424,12 @@ def select_reset_channel(self):
             '<option value="0">No</option><option value="1">Yes</option></select> &nbsp; ',
             'Plugin: <select id="name" name="name"</select>',
             '<option value="">ALL</option>'
-            ])
+        ])
         for name in plugins_channel:
             html_option = ''.join([html_option,
-                '<option value="', name['namespace'], '">', name['namespace'], '</option>',
-                ])
-        return ''.join([html_option, '</select></td></tr>' ])
+                                   '<option value="', name['namespace'], '">', name['namespace'], '</option>',
+                                   ])
+        return ''.join([html_option, '</select></td></tr>'])
 
     @property
     def select_reset_epg(self):
@@ -432,19 +438,19 @@ def select_reset_epg(self):
 
         plugin_epg = db_epg.get_epg_names()
         plugin_programs = db_epg_programs.get_program_names()
-        plugin_epg_names = [ s['namespace'] for s in plugin_epg ]
-        plugin_programs_names = [ s['namespace'] for s in plugin_programs ]
-        plugin_list = list(set(plugin_epg_names+plugin_programs_names))
-                
+        plugin_epg_names = [s['namespace'] for s in plugin_epg]
+        plugin_programs_names = [s['namespace'] for s in plugin_programs]
+        plugin_list = list(set(plugin_epg_names + plugin_programs_names))
+
         html_option = ''.join([
             '<td nowrap>Plugin: <select id="name" name="name"</select>',
             '<option value="">ALL</option>',
-            ])
+        ])
         for name in plugin_list:
             html_option = ''.join([html_option,
-                '<option value="', name, '">', name, '</option>',
-                ])
-        return ''.join([html_option, '</select></td></tr>' ])
+                                   '<option value="', name, '">', name, '</option>',
+                                   ])
+        return ''.join([html_option, '</select></td></tr>'])
 
     @property
     def select_reset_sched(self):
@@ -453,12 +459,12 @@ def select_reset_sched(self):
         html_option = ''.join([
             '<td nowrap>Plugin: <select id="name" name="name"</select>',
             '<option value="">ALL</option>',
-            ])
+        ])
         for name in plugins_sched:
             html_option = ''.join([html_option,
-                '<option value="', name['namespace'], '">', name['namespace'], '</option>',
-                ])
-        return ''.join([html_option, '</select></td></tr>' ])
+                                   '<option value="', name['namespace'], '">', name['namespace'], '</option>',
+                                   ])
+        return ''.join([html_option, '</select></td></tr>'])
 
     @property
     def select_del_instance(self):
@@ -467,8 +473,11 @@ def select_del_instance(self):
         name_inst_dict = db_plugins.get_instances()
         for ns, inst_list in name_inst_dict.items():
             for inst in inst_list:
-                name_inst.append(''.join([
-                    ns, ':', inst]))
+                section = utils.instance_config_section(ns, inst)
+                if self.config.get(section) \
+                        and self.config[section].get('enabled'):
+                    name_inst.append(''.join([
+                        ns, ':', inst]))
         db_channels = DBChannels(self.config)
         name_inst_list = db_channels.get_channel_instances()
         self.update_ns_inst(name_inst, name_inst_list)
@@ -482,12 +491,12 @@ def select_del_instance(self):
         html_option = ''.join([
             '<td nowrap>Instance: <select id="name" name="name"</select>',
             '<option value="">None</option>',
-            ])
+        ])
         for name in name_inst:
             html_option = ''.join([html_option,
-                '<option value="', name, '">', name, '</option>',
-                ])
-        return ''.join([html_option, '</select></td></tr>' ])
+                                   '<option value="', name, '">', name, '</option>',
+                                   ])
+        return ''.join([html_option, '</select></td></tr>'])
 
     def update_ns_inst(self, _name_inst, _name_inst_list):
         for name_inst_dict in _name_inst_list:
@@ -496,7 +505,6 @@ def update_ns_inst(self, _name_inst, _name_inst_list):
                     name_inst_dict['namespace'],
                     ':',
                     name_inst_dict['instance'],
-                    ])
+                ])
                 if ns_in not in _name_inst:
                     _name_inst.append(ns_in)
-    
\ No newline at end of file
diff --git a/lib/db/db.py b/lib/db/db.py
index 5ce80b6..4273e2d 100644
--- a/lib/db/db.py
+++ b/lib/db/db.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -20,10 +20,12 @@
 import os
 import pathlib
 import random
+import shutil
 import sqlite3
 import threading
 import time
 
+LOCK = threading.Lock()
 DB_EXT = '.db'
 BACKUP_EXT = '.sql'
 
@@ -34,13 +36,13 @@
 SQL_UPDATE = '_update'
 SQL_GET = '_get'
 SQL_DELETE = '_del'
-
+FILE_LINK_ZIP = '_filelinks'
 
 class DB:
     conn = {}
 
     def __init__(self, _config, _db_name, _sqlcmds):
-        self.logger = logging.getLogger(__name__+str(threading.get_ident()))
+        self.logger = logging.getLogger(__name__ + str(threading.get_ident()))
         self.config = _config
         self.db_name = _db_name
         self.sqlcmds = _sqlcmds
@@ -48,7 +50,6 @@ def __init__(self, _config, _db_name, _sqlcmds):
         self.offset = -1
         self.where = None
         self.sqlcmd = None
-
         self.db_fullpath = pathlib.Path(self.config['paths']['db_dir']) \
             .joinpath(_db_name + DB_EXT)
         if not os.path.exists(self.db_fullpath):
@@ -57,84 +58,108 @@ def __init__(self, _config, _db_name, _sqlcmds):
         self.check_connection()
         DB.conn[self.db_name][threading.get_ident()].commit()
 
-    def sql_exec(self, _sqlcmd, _bindings=None):
+    def sql_exec(self, _sqlcmd, _bindings=None, _cursor=None):
         try:
             self.check_connection()
             if _bindings:
-                return DB.conn[self.db_name][threading.get_ident()].execute(_sqlcmd, _bindings)
+                if _cursor:
+                    return _cursor.execute(_sqlcmd, _bindings)
+                else:
+                    return DB.conn[self.db_name][threading.get_ident()].execute(_sqlcmd, _bindings)
             else:
-                return DB.conn[self.db_name][threading.get_ident()].execute(_sqlcmd)
+                if _cursor:
+                    return _cursor.execute(_sqlcmd)
+                else:
+                    return DB.conn[self.db_name][threading.get_ident()].execute(_sqlcmd)
         except sqlite3.IntegrityError as e:
             DB.conn[self.db_name][threading.get_ident()].close()
             del DB.conn[self.db_name][threading.get_ident()]
             raise e
 
     def rnd_sleep(self, _sec):
-        r = random.randrange(0,50)
+        r = random.randrange(0, 50)
         sec = _sec + r / 100
         time.sleep(sec)
 
     def add(self, _table, _values):
+        self.logger.trace('DB add() called {}'.format(threading.get_ident()))
         cur = None
         sqlcmd = self.sqlcmds[''.join([_table, SQL_ADD_ROW])]
-        i = 5
+        i = 10
         while i > 0:
             i -= 1
             try:
-                cur = self.sql_exec(sqlcmd, _values)
+                self.check_connection()
+                cur = DB.conn[self.db_name][threading.get_ident()].cursor()
+                self.sql_exec(sqlcmd, _values, cur)
                 DB.conn[self.db_name][threading.get_ident()].commit()
                 lastrow = cur.lastrowid
                 cur.close()
+                self.logger.trace('DB add() exit {}'.format(threading.get_ident()))
                 return lastrow
             except sqlite3.OperationalError as e:
                 self.logger.warning('{} Add request ignored, retrying {}, {}'
-                    .format(self.db_name, i, e))
+                                    .format(self.db_name, i, e))
                 DB.conn[self.db_name][threading.get_ident()].rollback()
                 if cur is not None:
                     cur.close()
                 self.rnd_sleep(0.3)
+        self.logger.trace('DB add() exit {}'.format(threading.get_ident()))
         return None
 
     def delete(self, _table, _values):
+        self.logger.trace('DB delete() called {}'.format(threading.get_ident()))
         cur = None
         sqlcmd = self.sqlcmds[''.join([_table, SQL_DELETE])]
-        i = 5
+        i = 10
         while i > 0:
             i -= 1
             try:
-                cur = self.sql_exec(sqlcmd, _values)
+                self.check_connection()
+                cur = DB.conn[self.db_name][threading.get_ident()].cursor()
+                self.sql_exec(sqlcmd, _values, cur)
                 num_deleted = cur.rowcount
                 DB.conn[self.db_name][threading.get_ident()].commit()
                 cur.close()
+                self.logger.trace('DB delete() exit {}'.format(threading.get_ident()))
                 return num_deleted
             except sqlite3.OperationalError as e:
                 self.logger.warning('{} Delete request ignored, retrying {}, {}'
-                    .format(self.db_name, i, e))
+                                    .format(self.db_name, i, e))
                 DB.conn[self.db_name][threading.get_ident()].rollback()
                 if cur is not None:
                     cur.close()
                 self.rnd_sleep(0.3)
+        self.logger.trace('DB delete() exit {}'.format(threading.get_ident()))
         return 0
 
     def update(self, _table, _values=None):
+        self.logger.trace('DB update() called {}'.format(threading.get_ident()))
         cur = None
         sqlcmd = self.sqlcmds[''.join([_table, SQL_UPDATE])]
-        i = 5
+        i = 10
         while i > 0:
             i -= 1
             try:
-                cur = self.sql_exec(sqlcmd, _values)
+                LOCK.acquire(True)
+                self.check_connection()
+                cur = DB.conn[self.db_name][threading.get_ident()].cursor()
+                self.sql_exec(sqlcmd, _values, cur)
                 DB.conn[self.db_name][threading.get_ident()].commit()
                 lastrow = cur.lastrowid
                 cur.close()
+                LOCK.release()
+                self.logger.trace('DB update() exit {}'.format(threading.get_ident()))
                 return lastrow
             except sqlite3.OperationalError as e:
-                self.logger.warning('{} Update request ignored, retrying {}, {}'
-                    .format(self.db_name, i, e))
+                self.logger.notice('{} Update request ignored, retrying {}, {}'
+                                    .format(self.db_name, i, e))
                 DB.conn[self.db_name][threading.get_ident()].rollback()
                 if cur is not None:
                     cur.close()
+                LOCK.release()
                 self.rnd_sleep(0.3)
+        self.logger.trace('DB update() exit {}'.format(threading.get_ident()))
         return None
 
     def commit(self):
@@ -143,17 +168,19 @@ def commit(self):
     def get(self, _table, _where=None):
         cur = None
         sqlcmd = self.sqlcmds[''.join([_table, SQL_GET])]
-        i = 5
+        i = 10
         while i > 0:
             i -= 1
             try:
-                cur = self.sql_exec(sqlcmd, _where)
+                self.check_connection()
+                cur = DB.conn[self.db_name][threading.get_ident()].cursor()
+                self.sql_exec(sqlcmd, _where, cur)
                 result = cur.fetchall()
                 cur.close()
                 return result
             except sqlite3.OperationalError as e:
                 self.logger.warning('{} GET request ignored retrying {}, {}'
-                    .format(self.db_name, i, e))
+                                    .format(self.db_name, i, e))
                 DB.conn[self.db_name][threading.get_ident()].rollback()
                 if cur is not None:
                     cur.close()
@@ -166,23 +193,28 @@ def get_dict(self, _table, _where=None, sql=None):
             sqlcmd = self.sqlcmds[''.join([_table, SQL_GET])]
         else:
             sqlcmd = sql
-        i = 5
+        i = 10
         while i > 0:
             i -= 1
             try:
-                cur = self.sql_exec(sqlcmd, _where)
+                LOCK.acquire(True)
+                self.check_connection()
+                cur = DB.conn[self.db_name][threading.get_ident()].cursor()
+                self.sql_exec(sqlcmd, _where, cur)
                 records = cur.fetchall()
                 rows = []
                 for row in records:
                     rows.append(dict(zip([c[0] for c in cur.description], row)))
                 cur.close()
+                LOCK.release()
                 return rows
             except sqlite3.OperationalError as e:
                 self.logger.warning('{} GET request ignored retrying {}, {}'
-                    .format(self.db_name, i, e))
+                                    .format(self.db_name, i, e))
                 DB.conn[self.db_name][threading.get_ident()].rollback()
                 if cur is not None:
                     cur.close()
+                LOCK.release()
                 self.rnd_sleep(0.3)
         return None
 
@@ -205,6 +237,77 @@ def get_dict_next(self):
         row = records[0]
         return dict(zip([c[0] for c in self.cur.description], row))
 
+    def save_file(self, _keys, _blob):
+        """
+        Stores the blob in the folder with the db name with
+        the filename of concatenated _keys
+        _keys is the list of unique keys for the table
+        Returns the filepath to the file generated
+        """
+        folder_path = pathlib.Path(self.config['paths']['db_dir']) \
+            .joinpath(self.db_name)
+        os.makedirs(folder_path, exist_ok=True)
+        filename = '_'.join(str(x) for x in _keys) + '.txt'
+        file_rel_path = pathlib.Path(self.db_name).joinpath(filename)
+        filepath = folder_path.joinpath(filename)
+        try:
+            with open(filepath, mode='wb') as f:
+                if isinstance(_blob, str):
+                    f.write(_blob.encode())
+                else:
+                    f.write(_blob)
+                f.flush()
+                f.close()
+        except PermissionError as ex:
+            self.logger.warning('Unable to create linked database file {}'
+                .format(file_rel_path))
+            return None
+        return file_rel_path
+
+    def delete_file(self, _filepath):
+        """
+        _filepath is relative to the database path
+        """
+        fullpath = pathlib.Path(self.config['paths']['db_dir']) \
+            .joinpath(_filepath)
+        try:
+            os.remove(fullpath)
+            return True
+        except PermissionError as ex:
+            self.logger.warning('Unable to delete linked database file {}'
+                .format(_filepath))
+            return False
+        except FileNotFoundError as ex:
+            self.logger.warning('File missing, unable to delete linked database file {}'
+                .format(_filepath))
+            return False
+
+    def get_file(self, _filepath):
+        """
+        _filepath is relative to the database path
+        return the blob
+        """
+        fullpath = pathlib.Path(self.config['paths']['db_dir']) \
+            .joinpath(_filepath)
+
+        if not fullpath.exists():
+            self.logger.warning('Linked database file Missing {}'.format(_filepath))
+            return None
+        try:
+            with open(fullpath, mode='rb') as f:
+                blob = f.read()
+                f.close()
+            return blob
+        except PermissionError as ex:
+            self.logger.warning('Unable to read linked database file {}'
+                .format(_filepath))
+            return None
+
+    def get_file_by_key(self, _keys):
+        filename = '_'.join(str(x) for x in _keys) + '.txt'
+        file_rel_path = pathlib.Path(self.db_name).joinpath(filename)
+        return self.get_file(file_rel_path)
+
     def reinitialize_tables(self):
         self.drop_tables()
         self.create_tables()
@@ -225,20 +328,38 @@ def export_sql(self, backup_folder):
             if not os.path.isdir(backup_folder):
                 os.mkdir(backup_folder)
             self.check_connection()
+
+            # Check for linked file folder and zip up if present
+            db_linkfilepath = pathlib.Path(self.config['paths']['db_dir']) \
+                .joinpath(self.db_name)
+            if db_linkfilepath.exists():
+                self.logger.debug('Linked file folder exists, backing up folder for db {}'.format(self.db_name))
+                backup_filelink = pathlib.Path(backup_folder, self.db_name + FILE_LINK_ZIP)
+                shutil.make_archive(backup_filelink, 'zip', db_linkfilepath)
+
             backup_file = pathlib.Path(backup_folder, self.db_name + BACKUP_EXT)
-            with open(backup_file, 'w') as export_f:
+            with open(backup_file, 'w', encoding='utf-8') as export_f:
                 for line in DB.conn[self.db_name][threading.get_ident()].iterdump():
                     export_f.write('%s\n' % line)
         except PermissionError as e:
             self.logger.warning(e)
             self.logger.warning('Unable to make backups')
-            
+
     def import_sql(self, backup_folder):
         self.logger.debug('Running restore for {} database'.format(self.db_name))
         if not os.path.isdir(backup_folder):
             msg = 'Backup folder does not exist: {}'.format(backup_folder)
             self.logger.warning(msg)
             return msg
+
+        # Check for linked file folder and zip up if present
+        backup_filelink = pathlib.Path(backup_folder, self.db_name + FILE_LINK_ZIP + '.zip')
+        db_linkfilepath = pathlib.Path(self.config['paths']['db_dir']) \
+            .joinpath(self.db_name)
+        if backup_filelink.exists():
+            self.logger.debug('Linked file folder exists, restoring folder for db {}'.format(self.db_name))
+            shutil.unpack_archive(backup_filelink, db_linkfilepath)
+
         backup_file = pathlib.Path(backup_folder, self.db_name + BACKUP_EXT)
         if not os.path.isfile(backup_file):
             msg = 'Backup file does not exist, skipping: {}'.format(backup_file)
@@ -265,7 +386,7 @@ def check_connection(self):
         if self.db_name not in DB.conn:
             DB.conn[self.db_name] = {}
         db_conn_dbname = DB.conn[self.db_name]
-        
+
         if threading.get_ident() not in db_conn_dbname:
             db_conn_dbname[threading.get_ident()] = sqlite3.connect(
                 self.db_fullpath, detect_types=sqlite3.PARSE_DECLTYPES | sqlite3.PARSE_COLNAMES)
diff --git a/lib/db/db_channels.py b/lib/db/db_channels.py
index df16d2c..02a7c7b 100644
--- a/lib/db/db_channels.py
+++ b/lib/db/db_channels.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -79,7 +79,6 @@
             )
         """
 
-
     ],
     'dt': [
         """
@@ -90,12 +89,12 @@
         """,
         """
         DROP TABLE IF EXISTS categories
-        """
+        """,
         """
         DROP TABLE IF EXISTS zones
         """
-        ],
-    
+    ],
+
     'channels_add':
         """
         INSERT INTO channels (
@@ -114,7 +113,7 @@
         UPDATE channels SET 
             enabled=?, display_number=?, display_name=?, group_tag=?, thumbnail=?, thumbnail_size=?
             WHERE namespace=? AND instance=? AND uid=?
-        """,        
+        """,
     'channels_updated_update':
         """
         UPDATE channels SET updated = False WHERE namespace=? AND instance=?
@@ -137,6 +136,12 @@
             display_number=?
             WHERE namespace=? AND instance=? AND uid=?
         """,
+    'channels_num_update':
+        """
+        UPDATE channels SET 
+            number=?
+            WHERE namespace=? AND instance=? AND uid=?
+        """,
     'channels_del':
         """
         DELETE FROM channels WHERE updated LIKE ?
@@ -145,7 +150,8 @@
     'channels_get':
         """
         SELECT * FROM channels WHERE namespace LIKE ?
-        AND instance LIKE ? ORDER BY CAST(number as FLOAT), namespace, instance
+        AND instance LIKE ? AND enabled LIKE ?
+        ORDER BY CAST(number as FLOAT), namespace, instance
         """,
     'channels_one_get':
         """
@@ -160,7 +166,7 @@
         """
         SELECT DISTINCT namespace,instance FROM channels
         """,
-    
+
     'status_add':
         """
         INSERT OR REPLACE INTO status (
@@ -202,9 +208,10 @@ def save_channel_list(self, _namespace, _instance, _ch_dict, save_edit_groups=Tr
         Assume the list is complete and will remove any old channels not updated
         """
         if _instance is None or _namespace is None:
-            self.logger.warning('Saving Channel List: Namespace or Instance is None {}:{}'
+            self.logger.warning(
+                'Saving Channel List: Namespace or Instance is None {}:{}'
                 .format(_namespace, _instance))
-        self.update(DB_CHANNELS_TABLE + '_updated', (_namespace, _instance,))        
+        self.update(DB_CHANNELS_TABLE + '_updated', (_namespace, _instance,))
         for ch in _ch_dict:
             if save_edit_groups:
                 edit_groups = ch['groups_other']
@@ -225,6 +232,12 @@ def save_channel_list(self, _namespace, _instance, _ch_dict, save_edit_groups=Tr
                     True,
                     json.dumps(ch)))
             except sqlite3.IntegrityError as ex:
+                # record already present.  Check the thumbnail and update as needed
+                ch_stored = self.get_channel(ch['id'], _namespace, _instance)
+                if ch_stored['thumbnail'] is None and ch['thumbnail'] is not None:
+                    ch_stored['thumbnail'] = ch['thumbnail']
+                    ch_stored['thumbnail_size'] = ch['thumbnail_size']
+                    self.update_channel(ch_stored)
                 self.update(DB_CHANNELS_TABLE, (
                     ch['number'],
                     True,
@@ -242,7 +255,7 @@ def update_channel(self, _ch):
         """
         Updates the editable fields for one channel
         """
-        self.update(DB_CHANNELS_TABLE+'_editable', (
+        self.update(DB_CHANNELS_TABLE + '_editable', (
             _ch['enabled'],
             _ch['display_number'],
             _ch['display_name'],
@@ -260,7 +273,7 @@ def del_channels(self, _namespace, _instance):
         if not _instance:
             _instance = '%'
         return self.delete(DB_CHANNELS_TABLE, ('%', _namespace, _instance,))
-    
+
     def del_status(self, _namespace=None, _instance=None):
         if not _namespace:
             _namespace = '%'
@@ -269,8 +282,7 @@ def del_status(self, _namespace=None, _instance=None):
         return self.delete(DB_STATUS_TABLE, (_namespace, _instance,))
 
     def get_status(self, _namespace, _instance):
-        result = self.get(DB_STATUS_TABLE,
-            (_namespace, _instance))
+        result = self.get(DB_STATUS_TABLE, (_namespace, _instance))
         if result:
             last_update = result[0][0]
             if last_update is not None:
@@ -280,14 +292,16 @@ def get_status(self, _namespace, _instance):
         else:
             return None
 
-    def get_channels(self, _namespace, _instance):
+    def get_channels(self, _namespace, _instance, _enabled=None):
         if not _namespace:
             _namespace = '%'
         if not _instance:
             _instance = '%'
+        if _enabled is None:
+            _enabled = '%'
 
         rows_dict = {}
-        rows = self.get_dict(DB_CHANNELS_TABLE, (_namespace, _instance,))
+        rows = self.get_dict(DB_CHANNELS_TABLE, (_namespace, _instance, _enabled))
         if rows is None:
             return None
         for row in rows:
@@ -302,7 +316,7 @@ def get_channels(self, _namespace, _instance):
             else:
                 rows_dict[row['uid']] = []
                 rows_dict[row['uid']].append(row)
-                
+
         return rows_dict
 
     def get_channel_names(self):
@@ -318,12 +332,13 @@ def get_channel(self, _uid, _namespace, _instance):
             _instance = '%'
 
         rows = self.get_dict(DB_CHANNELS_TABLE + '_one', (_uid, _namespace, _instance,))
-        for row in rows:
-            ch = json.loads(row['json'])
-            row['json'] = ch
-            if row['atsc'] is not None:
-                row['atsc'] = ast.literal_eval(row['atsc'])
-            return row
+        if rows:
+            for row in rows:
+                ch = json.loads(row['json'])
+                row['json'] = ch
+                if row['atsc'] is not None:
+                    row['atsc'] = ast.literal_eval(row['atsc'])
+                return row
         return None
 
     def update_channel_atsc(self, _ch):
@@ -331,7 +346,7 @@ def update_channel_atsc(self, _ch):
         Updates the atsc field for one channel
         """
         atsc_str = str(_ch['atsc'])
-        self.update(DB_CHANNELS_TABLE+'_atsc', (
+        self.update(DB_CHANNELS_TABLE + '_atsc', (
             atsc_str,
             _ch['namespace'],
             _ch['instance'],
@@ -343,7 +358,7 @@ def update_channel_json(self, _ch, _namespace, _instance):
         Updates the json field for one channel
         """
         json_str = json.dumps(_ch)
-        self.update(DB_CHANNELS_TABLE+'_json', (
+        self.update(DB_CHANNELS_TABLE + '_json', (
             json_str,
             _namespace,
             _instance,
@@ -355,15 +370,27 @@ def update_channel_number(self, _ch):
         Updates the display_number field for one channel
         """
         display_number = str(_ch['display_number'])
-        self.update(DB_CHANNELS_TABLE+'_chnum', (
+        self.update(DB_CHANNELS_TABLE + '_chnum', (
             display_number,
             _ch['namespace'],
             _ch['instance'],
             _ch['uid']
         ))
+        
+    def update_number(self, _ch):
+        """
+        Updates the display_number field for one channel
+        """
+        number = str(_ch['number'])
+        self.update(DB_CHANNELS_TABLE + '_num', (
+            number,
+            _ch['namespace'],
+            _ch['instance'],
+            _ch['uid']
+        ))
 
-
-    def get_sorted_channels(self, _namespace, _instance, _first_sort_key=[None, True], _second_sort_key=[None, True]):
+    def get_sorted_channels(self, _namespace, _instance,
+                            _first_sort_key=[None, True], _second_sort_key=[None, True]):
         """
         Using dynamic SQl to create a SELECT statement and send to the DB
         keys are [name_of_column, direction_asc=True]
@@ -379,31 +406,29 @@ def get_sorted_channels(self, _namespace, _instance, _first_sort_key=[None, True
             _namespace = '%'
         if not _instance:
             _instance = '%'
-
-        rows_dict = {}
         rows = self.get_dict(None, (_namespace, _instance,), sql=sqlcmd)
         for row in rows:
             ch = json.loads(row['json'])
             row['json'] = ch
             row['thumbnail_size'] = ast.literal_eval(row['thumbnail_size'])
         return rows
-    
+
     def get_channels_orderby(self, _column, _ascending):
         str_types = ['namespace', 'instance', 'enabled', 'display_name', 'group_tag', 'thumbnail']
         float_types = ['uid', 'display_number']
         json_types = ['HD', 'callsign']
         if _ascending:
-            dir = 'ASC'
+            dir_ = 'ASC'
         else:
-            dir = 'DESC'
+            dir_ = 'DESC'
         if _column is None:
             return ''
         elif _column in str_types:
-            return ''.join([_column, ' ', dir, ', '])
+            return ''.join([_column, ' ', dir_, ', '])
         elif _column in float_types:
-            return ''.join(['CAST(', _column, ' as FLOAT) ', dir, ', '])
+            return ''.join(['CAST(', _column, ' as FLOAT) ', dir_, ', '])
         elif _column in json_types:
-            return ''.join(['JSON_EXTRACT(json, "$.', _column,  '") ', dir, ', '])    
+            return ''.join(['JSON_EXTRACT(json, "$.', _column, '") ', dir_, ', '])
 
     def add_zone(self, _namespace, _instance, _uid, _name):
         self.add(DB_ZONE_TABLE, (_namespace, _instance, _uid, _name))
@@ -411,8 +436,6 @@ def add_zone(self, _namespace, _instance, _uid, _name):
     def get_zones(self, _namespace, _instance):
         return self.get_dict(DB_ZONE_TABLE, (_namespace, _instance,))
 
-
-
     @Backup(DB_CONFIG_NAME)
     def backup(self, backup_folder):
         self.export_sql(backup_folder)
diff --git a/lib/db/db_config_defn.py b/lib/db/db_config_defn.py
index 64237e7..5f2d6d6 100644
--- a/lib/db/db_config_defn.py
+++ b/lib/db/db_config_defn.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -17,7 +17,6 @@
 """
 
 import json
-import threading
 
 from lib.db.db import DB
 from lib.common.decorators import Backup
diff --git a/lib/db/db_epg.py b/lib/db/db_epg.py
index 7110f55..c536766 100644
--- a/lib/db/db_epg.py
+++ b/lib/db/db_epg.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -18,13 +18,11 @@
 
 import json
 import datetime
-import threading
 
 from lib.db.db import DB
 from lib.common.decorators import Backup
 from lib.common.decorators import Restore
 
-
 DB_EPG_TABLE = 'epg'
 DB_CONFIG_NAME = 'db_files-epg_db'
 
@@ -36,7 +34,7 @@
             instance  VARCHAR(255) NOT NULL,
             day       DATE NOT NULL,
             last_update TIMESTAMP,
-            json      TEXT NOT NULL,
+            file      VARCHAR(255) NOT NULL,
             UNIQUE(namespace, instance, day)
             )
         """
@@ -44,13 +42,18 @@
     'dt': [
         """
         DROP TABLE IF EXISTS epg
+        """
+    ],
+
+    'epg_column_names_get':
+        """
+        SELECT name FROM pragma_table_info('epg')
         """,
-        ],
 
     'epg_add':
         """
         INSERT OR REPLACE INTO epg (
-            namespace, instance, day, last_update, json
+            namespace, instance, day, last_update, file
             ) VALUES ( ?, ?, ?, ?, ? )
         """,
 
@@ -58,11 +61,21 @@
         """
         DELETE FROM epg WHERE namespace LIKE ? AND instance LIKE ? AND day < DATE('now',?)
         """,
-    'epg_del':
+    'epg_by_day_get':
+        """
+        SELECT file FROM epg WHERE namespace LIKE ? AND instance LIKE ? AND day < DATE('now',?)
+        """,
+
+    'epg_instance_del':
         """
         DELETE FROM epg WHERE namespace=? AND instance LIKE ?
         """,
 
+    'epg_instance_get':
+        """
+        SELECT file FROM epg WHERE namespace=? AND instance LIKE ?
+        """,
+
     'epg_last_update_get':
         """
         SELECT datetime(last_update, 'localtime') FROM epg WHERE
@@ -89,7 +102,7 @@
         """
         SELECT DISTINCT namespace FROM epg
         """,
-    'epg_instance_get':
+    'epg_instances_get':
         """
         SELECT DISTINCT namespace, instance FROM epg
         """
@@ -101,23 +114,32 @@ class DBepg(DB):
     def __init__(self, _config):
         super().__init__(_config, _config['datamgmt'][DB_CONFIG_NAME], sqlcmds)
 
+    def get_col_names(self):
+        return self.get(DB_EPG_TABLE + '_column_names')
+    
     def save_program_list(self, _namespace, _instance, _day, _prog_list):
-        self.add(DB_EPG_TABLE, (
-            _namespace,
-            _instance,
-            _day,
-            datetime.datetime.utcnow(),
-            json.dumps(_prog_list),))
+        filepath = self.save_file((DB_EPG_TABLE, _namespace, _instance, _day), json.dumps(_prog_list))
+        if filepath:
+            self.add(DB_EPG_TABLE, (
+                _namespace,
+                _instance,
+                _day,
+                datetime.datetime.utcnow(),
+                str(filepath),))
 
-    def del_old_programs(self, _namespace, _instance, _days='-1 day'):
+    def del_old_programs(self, _namespace, _instance, _days='-2 day'):
         """
-        Removes all records for this namespace/instance that are over 1 day old
+        Removes all records for this namespace/instance that are over 2 day old
         """
         if not _namespace:
             _namespace = '%'
         if not _instance:
             _instance = '%'
-        self.delete(DB_EPG_TABLE +'_by_day', (_namespace, _instance, _days,))
+        files = self.get(DB_EPG_TABLE + '_by_day', (_namespace, _instance, _days,))
+        files = [x[0] for x in files]
+        for f in files:
+            self.delete_file(f)
+        self.delete(DB_EPG_TABLE + '_by_day', (_namespace, _instance, _days,))
 
     def del_instance(self, _namespace, _instance):
         """
@@ -125,14 +147,18 @@ def del_instance(self, _namespace, _instance):
         """
         if not _instance:
             _instance = '%'
-        return self.delete(DB_EPG_TABLE, (_namespace, _instance,))
+        files = self.get(DB_EPG_TABLE + '_instance', (_namespace, _instance,))
+        files = [x[0] for x in files]
+        for f in files:
+            self.delete_file(f)
+        return self.delete(DB_EPG_TABLE + '_instance', (_namespace, _instance,))
 
     def set_last_update(self, _namespace=None, _instance=None, _day=None):
         if not _namespace:
             _namespace = '%'
         if not _instance:
             _instance = '%'
-        self.update(DB_EPG_TABLE+'_last_update', (
+        self.update(DB_EPG_TABLE + '_last_update', (
             _day,
             _namespace,
             _instance,
@@ -155,10 +181,16 @@ def get_epg_names(self):
         return self.get_dict(DB_EPG_TABLE + '_name')
 
     def get_epg_instances(self):
-        return self.get_dict(DB_EPG_TABLE + '_instance')
+        return self.get_dict(DB_EPG_TABLE + '_instances')
 
     def get_epg_one(self, _namespace, _instance, _day):
-        return self.get_dict(DB_EPG_TABLE + '_one', (_namespace, _instance, _day))
+        row = self.get_dict(DB_EPG_TABLE + '_one', (_namespace, _instance, _day))
+        if len(row):
+            blob = self.get_file_by_key((_namespace, _instance, _day,))
+            if blob:
+                row[0]['json'] = json.loads(blob)
+                return row
+        return []
 
     def init_get_query(self, _namespace, _instance):
         if not _namespace:
@@ -176,13 +208,18 @@ def get_next_row(self):
             namespace = row['namespace']
             instance = row['instance']
             day = row['day']
-            json_data = json.loads(row['json'])
+            file = row['file']
+            blob = self.get_file(file)
+            if blob:
+                json_data = json.loads(blob)
+            else:
+                json_data = []
             row = json_data
         return row, namespace, instance, day
 
     def close_query(self):
         self.cur.close()
-        
+
     @Backup(DB_CONFIG_NAME)
     def backup(self, backup_folder):
         self.export_sql(backup_folder)
diff --git a/lib/db/db_epg_programs.py b/lib/db/db_epg_programs.py
index 381d59e..98af69c 100644
--- a/lib/db/db_epg_programs.py
+++ b/lib/db/db_epg_programs.py
@@ -18,13 +18,11 @@
 
 import json
 import datetime
-import threading
 
 from lib.db.db import DB
 from lib.common.decorators import Backup
 from lib.common.decorators import Restore
 
-
 DB_PROGRAMS_TABLE = 'programs'
 DB_CONFIG_NAME = 'db_files-epg_programs_db'
 
@@ -44,7 +42,7 @@
         """
         DROP TABLE IF EXISTS programs
         """,
-        ],
+    ],
 
     'programs_add':
         """
@@ -89,7 +87,7 @@ def del_old_programs(self, _namespace, _instance, _days='-30 day'):
         """
         Removes all records for this namespace/instance that are over xx days old
         """
-        self.delete(DB_PROGRAMS_TABLE +'_by_day', (_namespace, _days))
+        self.delete(DB_PROGRAMS_TABLE + '_by_day', (_namespace, _days))
 
     def del_namespace(self, _namespace):
         """
@@ -102,7 +100,7 @@ def get_program_names(self):
 
     def get_program(self, _namespace, _id):
         return self.get_dict(DB_PROGRAMS_TABLE, (_namespace, _id))
-        
+
     @Backup(DB_CONFIG_NAME)
     def backup(self, backup_folder):
         self.export_sql(backup_folder)
diff --git a/lib/db/db_plugins.py b/lib/db/db_plugins.py
index a78f403..4de8291 100644
--- a/lib/db/db_plugins.py
+++ b/lib/db/db_plugins.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -17,74 +17,117 @@
 """
 
 import json
-import threading
 
 from lib.db.db import DB
 from lib.common.decorators import Backup
 from lib.common.decorators import Restore
 
-
+DB_REPOS_TABLE = 'repos'
 DB_PLUGINS_TABLE = 'plugins'
 DB_INSTANCE_TABLE = 'instance'
 DB_CONFIG_NAME = 'db_files-plugins_db'
 
-
 sqlcmds = {
     'ct': [
+        """
+        CREATE TABLE IF NOT EXISTS repos (
+            id        VARCHAR(255) NOT NULL,
+            name      VARCHAR(255) NOT NULL,
+            url       VARCHAR(255) NOT NULL,
+            json TEXT NOT NULL,
+            UNIQUE(id)
+            )
+        """,
         """
         CREATE TABLE IF NOT EXISTS plugins (
             id        VARCHAR(255) NOT NULL,
+            repo      VARCHAR(255) NOT NULL,
             namespace VARCHAR(255) NOT NULL,
+            installed BOOLEAN NOT NULL,
             json TEXT NOT NULL,
-            UNIQUE(namespace, id)
+            UNIQUE(repo, namespace, id)
             )
         """,
         """
         CREATE TABLE IF NOT EXISTS instance (
+            repo      VARCHAR(255) NOT NULL,
             namespace VARCHAR(255) NOT NULL,
             instance  VARCHAR(255) NOT NULL,
             description TEXT,
-            UNIQUE(namespace, instance)
+            UNIQUE(repo, namespace, instance)
             )
         """
     ],
     'dt': [
+        """
+        DROP TABLE IF EXISTS instance
+        """,
         """
         DROP TABLE IF EXISTS plugins
         """,
         """
-        DROP TABLE IF EXISTS instance
+        DROP TABLE IF EXISTS repos
+        """
+    ],
+    'repos_add':
         """
-        ],
+        INSERT OR REPLACE INTO repos (
+            id, name, url, json
+            ) VALUES ( ?, ?, ?, ? )
+        """,
+    'repos_get':
+        """
+        SELECT * FROM repos WHERE id LIKE ?
+        """,
+    'repos_del':
+        """
+        DELETE FROM repos WHERE id=?
+        """,
 
     'plugins_add':
         """
         INSERT OR REPLACE INTO plugins (
-            id, namespace, json
-            ) VALUES ( ?, ?, ? )
+            id, repo, namespace, installed, json
+            ) VALUES ( ?, ?, ?, ?, ? )
         """,
     'plugins_get':
         """
-        SELECT * FROM plugins WHERE namespace LIKE ?
+        SELECT * FROM plugins WHERE repo LIKE ? AND id LIKE ?
+        AND installed=?
+        """,
+    'plugins_name_get':
+        """
+        SELECT * FROM plugins WHERE repo LIKE ? AND namespace LIKE ?
+        AND installed=?
+        """,
+    'plugins_all_get':
+        """
+        SELECT * FROM plugins WHERE repo LIKE ? AND id LIKE ?
+        """,
+    'plugins_all_name_get':
+        """
+        SELECT * FROM plugins WHERE repo LIKE ? AND namespace LIKE ?
         """,
     'plugins_del':
         """
-        DELETE FROM plugins WHERE namespace=?
+        DELETE FROM plugins WHERE repo=? AND id=?
         """,
 
     'instance_add':
         """
         INSERT OR REPLACE INTO instance (
-            namespace, instance, description
-            ) VALUES ( ?, ?, ? )
+            repo, namespace, instance, description
+            ) VALUES ( ?, ?, ?, ? )
         """,
     'instance_get':
         """
-        SELECT * FROM instance ORDER BY namespace, instance
+        SELECT * FROM instance WHERE repo LIKE ?
+        AND namespace LIKE ? ORDER BY namespace, instance
         """,
     'instance_del':
         """
-        DELETE FROM instance WHERE namespace LIKE ? AND instance LIKE ?
+        DELETE FROM instance WHERE repo LIKE ? AND 
+        namespace LIKE ? AND instance LIKE ?
         """
 }
 
@@ -94,22 +137,62 @@ class DBPlugins(DB):
     def __init__(self, _config):
         super().__init__(_config, _config['datamgmt'][DB_CONFIG_NAME], sqlcmds)
 
+    def save_repo(self, _repo_dict):
+        self.add(DB_REPOS_TABLE, (
+            _repo_dict['id'],
+            _repo_dict['name'],
+            _repo_dict['repo_url'],
+            json.dumps(_repo_dict)))
+
     def save_plugin(self, _plugin_dict):
         self.add(DB_PLUGINS_TABLE, (
             _plugin_dict['id'],
+            _plugin_dict['repoid'],
             _plugin_dict['name'],
+            _plugin_dict['version']['installed'],
             json.dumps(_plugin_dict)))
 
-    def save_instance(self, namespace, instance, descr):
+    def save_instance(self, _repo_id, _namespace, _instance, _descr):
         self.add(DB_INSTANCE_TABLE, (
-            namespace,
-            instance,
-            descr))
+            _repo_id,
+            _namespace,
+            _instance,
+            _descr))
 
-    def get_plugins(self, _namespace = None):
-        if not _namespace:
-            _namespace = '%'
-        rows = self.get_dict(DB_PLUGINS_TABLE, (_namespace,))
+    def get_repos(self, _id):
+        if not _id:
+            _id = '%'
+        rows = self.get_dict(DB_REPOS_TABLE, (_id,))
+        plugin_list = []
+        for row in rows:
+            plugin_list.append(json.loads(row['json']))
+        if len(plugin_list) == 0:
+            plugin_list = None
+        return plugin_list
+
+    def del_repo(self, _id):
+        """
+        If a plugin is installed, it must be removed before the 
+        repo can be deleted.  Once all plugins are not installed,
+        then will remove the repo, plugin and all instances
+        """
+        plugins_installed = self.get_plugins(True, _id)
+        self.logger.warning('################## TBD, aborting delete {}'.format(len(plugins_installed)))
+        
+
+        #self.delete(DB_INSTANCE_TABLE, (_id, '%', '%',))
+        #self.delete(DB_PLUGINS_TABLE, (_id, '%',))
+        #self.delete(DB_REPOS_TABLE, (_id,))
+
+    def get_plugins(self, _installed, _repo_id=None, _plugin_id=None):
+        if not _repo_id:
+            _repo_id = '%'
+        if not _plugin_id:
+            _plugin_id = '%'
+        if _installed is None:
+            rows = self.get_dict(DB_PLUGINS_TABLE+'_all', (_repo_id, _plugin_id,))
+        else:
+            rows = self.get_dict(DB_PLUGINS_TABLE, (_repo_id, _plugin_id, _installed,))
         plugin_list = []
         for row in rows:
             plugin_list.append(json.loads(row['json']))
@@ -117,24 +200,45 @@ def get_plugins(self, _namespace = None):
             plugin_list = None
         return plugin_list
 
-    def del_plugin(self, _namespace):
+    def get_plugins_by_name(self, _installed, _repo_id=None, _plugin_name=None):
+        if not _repo_id:
+            _repo_id = '%'
+        if not _plugin_name:
+            _plugin_name = '%'
+        if _installed is None:
+            rows = self.get_dict(DB_PLUGINS_TABLE+'_all_name', (_repo_id, _plugin_name,))
+        else:
+            rows = self.get_dict(DB_PLUGINS_TABLE+'_name', (_repo_id, _plugin_name, _installed,))
+        plugin_list = []
+        for row in rows:
+            plugin_list.append(json.loads(row['json']))
+        if len(plugin_list) == 0:
+            plugin_list = None
+        return plugin_list
+
+    def del_plugin(self, _repo_id, _plugin_id):
         """
         Deletes the instance rows first due to constaints, then
         deletes the plugin
         """
+        self.delete(DB_INSTANCE_TABLE, (_repo_id, _plugin_id, '%',))
+        self.delete(DB_PLUGINS_TABLE, (_repo_id, _plugin_id,))
 
-        self.delete(DB_INSTANCE_TABLE, (_namespace, '%', ))
-        self.delete(DB_PLUGINS_TABLE, (_namespace,))
-
-    def del_instance(self, _namespace, _instance):
-        return self.delete(DB_INSTANCE_TABLE, (_namespace, _instance))
+    def del_instance(self, _repo, _namespace, _instance):
+        if not _repo:
+            _repo = '%'
+        return self.delete(DB_INSTANCE_TABLE, (_repo, _namespace, _instance,))
 
-    def get_instances(self):
+    def get_instances(self, _repo=None, _namespace=None):
         """
         createa a dict of namespaces that contain an array of instances
         """
+        if not _repo:
+            _repo = '%'
+        if not _namespace:
+            _namespace = '%'
         rows_dict = {}
-        rows = self.get_dict(DB_INSTANCE_TABLE)
+        rows = self.get_dict(DB_INSTANCE_TABLE, (_repo, _namespace,))
         for row in rows:
             if row['namespace'] not in rows_dict:
                 rows_dict[row['namespace']] = []
@@ -144,9 +248,13 @@ def get_instances(self):
 
         return rows_dict
 
-    def get_instances_full(self):
+    def get_instances_full(self, _repo=None, _namespace=None):
+        if not _repo:
+            _repo = '%'
+        if not _namespace:
+            _namespace = '%'
         rows_dict = {}
-        rows = self.get_dict(DB_INSTANCE_TABLE)
+        rows = self.get_dict(DB_INSTANCE_TABLE, (_repo, _namespace,))
         for row in rows:
             rows_dict[row['namespace']] = row
         return rows_dict
diff --git a/lib/db/db_scheduler.py b/lib/db/db_scheduler.py
index 177d3ac..72a8913 100644
--- a/lib/db/db_scheduler.py
+++ b/lib/db/db_scheduler.py
@@ -16,23 +16,18 @@
 substantial portions of the Software.
 """
 
-import ast
-import json
 import datetime
 import sqlite3
-import threading
 import uuid
 
 from lib.db.db import DB
 from lib.common.decorators import Backup
 from lib.common.decorators import Restore
 
-
 DB_TASK_TABLE = 'task'
 DB_TRIGGER_TABLE = 'trigger'
 DB_CONFIG_NAME = 'db_files-scheduler_db'
 
-
 sqlcmds = {
     'ct': [
         """
@@ -79,8 +74,8 @@
         """
         DROP TABLE IF EXISTS task
         """
-        ],
-    
+    ],
+
     'task_add':
         """
         INSERT INTO task (
@@ -154,7 +149,7 @@
         FROM task
         WHERE active='1'
         """,
-        
+
     'task_del':
         """
         DELETE FROM task WHERE
@@ -208,18 +203,18 @@
 class DBScheduler(DB):
 
     def __init__(self, _config):
-        super().__init__(_config, _config['datamgmt'][DB_CONFIG_NAME], sqlcmds)        
+        super().__init__(_config, _config['datamgmt'][DB_CONFIG_NAME], sqlcmds)
 
-    def save_task(self, _area, _title, _namespace, _instance, _funccall, 
-            _priority, _threadtype, _description):
+    def save_task(self, _area, _title, _namespace, _instance, _funccall,
+                  _priority, _threadtype, _description):
         """
         Returns true if the record was saved.  If the record already exists,
         it will return false.
         """
         try:
-            id = str(uuid.uuid1()).upper()
+            id_ = str(uuid.uuid1()).upper()
             self.add(DB_TASK_TABLE, (
-                id,
+                id_,
                 _area,
                 _title,
                 _namespace,
@@ -280,7 +275,7 @@ def get_task(self, _id):
         if len(task) == 1:
             return task[0]
         else:
-            return None    
+            return None
 
     def get_task_names(self):
         return self.get_dict(DB_TASK_TABLE + '_name')
@@ -315,13 +310,17 @@ def reset_activity(self, _activity=False, _area=None, _title=None):
         ))
 
     def get_active_status(self, _taskid):
-        return self.get_dict(DB_TASK_TABLE + '_active', (_taskid,))[0]['active']
+        res = self.get_dict(DB_TASK_TABLE + '_active', (_taskid,))
+        if res:
+            return res[0]['active']
+        else:
+            return None
 
     def get_num_active(self):
         return self.get(DB_TASK_TABLE + '_num_active')[0][0]
 
-    def save_trigger(self, _area, _title, _timetype, timeofday=None, 
-            dayofweek=None, interval=-1, timelimit=-1, randdur=-1):
+    def save_trigger(self, _area, _title, _timetype, timeofday=None,
+                     dayofweek=None, interval=-1, timelimit=-1, randdur=-1):
         """
         timetype: daily, weekly, interval, startup
         timelimit: maximum time it can run before terminating. -1 is not used
@@ -331,9 +330,9 @@ def save_trigger(self, _area, _title, _timetype, timeofday=None,
         randdur: maximum in minutes. Interval only. Will add a randum amount 
         to the event start time up to the maximum minutes.  -1 is not used.
         """
-        id = str(uuid.uuid1()).upper()
+        id_ = str(uuid.uuid1()).upper()
         self.add(DB_TRIGGER_TABLE, (
-            id,
+            id_,
             _area,
             _title,
             _timetype,
@@ -343,7 +342,7 @@ def save_trigger(self, _area, _title, _timetype, timeofday=None,
             interval,
             randdur,
         ))
-        return id
+        return id_
 
     def get_triggers_by_type(self, _timetype):
         """
@@ -359,7 +358,7 @@ def get_trigger(self, _uuid):
         if len(trigger) == 1:
             return trigger[0]
         else:
-            return None    
+            return None
 
     def get_triggers(self, _taskid=None):
         """
diff --git a/lib/db/db_temp.py b/lib/db/db_temp.py
old mode 100755
new mode 100644
index 44eb7b3..7d401d8
--- a/lib/db/db_temp.py
+++ b/lib/db/db_temp.py
@@ -18,13 +18,11 @@
 
 import json
 import datetime
-import threading
 
 from lib.db.db import DB
 from lib.common.decorators import Backup
 from lib.common.decorators import Restore
 
-
 DB_TEMP_TABLE = 'temp'
 DB_CONFIG_NAME = 'db_files-temp_db'
 
@@ -45,7 +43,7 @@
         """
         DROP TABLE IF EXISTS temp
         """,
-        ],
+    ],
 
     'temp_add':
         """
@@ -88,13 +86,14 @@ def save_json(self, _namespace, _instance, _value, _json):
 
     def cleanup_temp(self, _namespace, _instance, _hours='-6 hours'):
         """
-        Removes all records for this namespace/instance that are over 1 hour old
+        Removes all records for this namespace/instance that are over 6 hour old
         """
         if not _namespace:
             _namespace = '%'
         if not _instance:
             _instance = '%'
-        deleted = self.delete(DB_TEMP_TABLE +'_by_day', (_namespace, _instance, _hours,))
+        deleted = self.delete(DB_TEMP_TABLE + '_by_day', (_namespace, _instance, _hours,))
+        self.sql_exec('VACUUM')
 
     def del_instance(self, _namespace, _instance):
         """
@@ -107,7 +106,6 @@ def del_instance(self, _namespace, _instance):
     def get_record(self, _namespace, _instance, _value):
         return self.get_dict(DB_TEMP_TABLE, (_namespace, _instance, _value))
 
-        
     @Backup(DB_CONFIG_NAME)
     def backup(self, backup_folder):
         self.export_sql(backup_folder)
diff --git a/lib/m3u8/__init__.py b/lib/m3u8/__init__.py
index 36150b6..2d07fea 100644
--- a/lib/m3u8/__init__.py
+++ b/lib/m3u8/__init__.py
@@ -3,8 +3,9 @@
 # Use of this source code is governed by a MIT License
 # license that can be found in the LICENSE file.
 
-import sys
+import logging
 import os
+import sys
 
 from .httpclient import DefaultHTTPClient, _parsed_url
 from .model import (M3U8, Segment, SegmentList, PartialSegment,
@@ -23,13 +24,20 @@
             'PreloadHint' 'DateRange', 'DateRangeList', 'loads', 'load',
             'parse', 'ParseError')
 
+LOGGER = None
+
 def loads(content, uri=None, custom_tags_parser=None):
     '''
     Given a string with a m3u8 content, returns a M3U8 object.
     Optionally parses a uri to set a correct base_uri on the M3U8 object.
     Raises ValueError if invalid content
     '''
-
+    global LOGGER
+    if LOGGER is None:
+        LOGGER = logging.getLogger(__name__)
+    if not content.startswith('#EXTM3U'):
+        LOGGER.warning('INVALID m3u format: #EXTM3U missing {}'.format(uri))
+        return None
     if uri is None:
         return M3U8(content, custom_tags_parser=custom_tags_parser)
     else:
@@ -37,20 +45,35 @@ def loads(content, uri=None, custom_tags_parser=None):
         return M3U8(content, base_uri=base_uri, custom_tags_parser=custom_tags_parser)
 
 
-def load(uri, timeout=None, headers={}, custom_tags_parser=None, http_client=DefaultHTTPClient(), verify_ssl=True):
+def load(uri, timeout=9, headers={}, custom_tags_parser=None, http_client=DefaultHTTPClient(), verify_ssl=True, http_session=None):
     '''
     Retrieves the content from a given URI and returns a M3U8 object.
     Raises ValueError if invalid content or IOError if request fails.
     '''
+    global LOGGER
+    if LOGGER is None:
+        LOGGER = logging.getLogger(__name__)
     if is_url(uri):
-        content, base_uri = http_client.download(uri, timeout, headers, verify_ssl)
+        content, base_uri = http_client.download(uri, timeout, headers, verify_ssl, http_session)
+        if content is None:
+            LOGGER.warning('Unable to obtain m3u file {}'.format(uri))
+            return None        
+        if not content.startswith('#EXTM3U'):
+            LOGGER.warning('INVALID m3u format: #EXTM3U missing {}'.format(uri))
+            return None
         return M3U8(content, base_uri=base_uri, custom_tags_parser=custom_tags_parser)
     else:
         return _load_from_file(uri, custom_tags_parser)
 
 
 def _load_from_file(uri, custom_tags_parser=None):
+    global LOGGER
+    if LOGGER is None:
+        LOGGER = logging.getLogger(__name__)
     with open(uri, encoding='utf8') as fileobj:
         raw_content = fileobj.read().strip()
     base_uri = os.path.dirname(uri)
+    if not raw_content.startswith('#EXTM3U'):
+        LOGGER.warning('INVALID m3u format: #EXTM3U missing {}'.format(uri))
+        return None
     return M3U8(raw_content, base_uri=base_uri, custom_tags_parser=custom_tags_parser)
diff --git a/lib/m3u8/httpclient.py b/lib/m3u8/httpclient.py
index d03bbab..6e75135 100644
--- a/lib/m3u8/httpclient.py
+++ b/lib/m3u8/httpclient.py
@@ -1,3 +1,4 @@
+import logging
 import posixpath
 import ssl
 import sys
@@ -18,18 +19,35 @@ class DefaultHTTPClient:
 
     def __init__(self, proxies=None):
         self.proxies = proxies
-
-    def download(self, uri, timeout=None, headers={}, verify_ssl=True):
-        proxy_handler = urllib.request.ProxyHandler(self.proxies)
-        https_handler = HTTPSHandler(verify_ssl=verify_ssl)
-        opener = urllib.request.build_opener(proxy_handler, https_handler)
-        opener.addheaders = headers.items()
-        resource = opener.open(uri, timeout=timeout)
-        base_uri = _parsed_url(resource.geturl())
-        content = resource.read().decode(
-            resource.headers.get_content_charset(failobj="utf-8")
-        )
-        return content, base_uri
+        self.base_uri = None
+        self.logger = None
+
+    def download(self, uri, timeout=9, headers={}, verify_ssl=True, http_session=None):
+        content = self.get_uri(uri, timeout, headers, verify_ssl, http_session)
+        return content, self.base_uri
+
+    def get_uri(self, _uri, _timeout, _headers, _verify_ssl, _http_session):
+        if self.logger is None:
+            self.logger = logging.getLogger(__name__)
+
+        if _http_session:
+            resp = _http_session.get(_uri, headers=_headers, timeout=_timeout)
+            x = resp.text
+            self.base_uri = _parsed_url(str(resp.url))
+            resp.raise_for_status()
+            return x
+
+        else:
+            proxy_handler = urllib.request.ProxyHandler(self.proxies)
+            https_handler = HTTPSHandler(verify_ssl=_verify_ssl)
+            opener = urllib.request.build_opener(proxy_handler, https_handler)
+            opener.addheaders = _headers.items()
+            resource = opener.open(_uri, timeout=_timeout)
+            self.base_uri = _parsed_url(resource.geturl())
+            content = resource.read().decode(
+                resource.headers.get_content_charset(failobj="utf-8")
+            )
+            return content
 
 
 class HTTPSHandler:
diff --git a/lib/main.py b/lib/main.py
index 7689335..880ad73 100644
--- a/lib/main.py
+++ b/lib/main.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -34,8 +34,15 @@
         pip(['install', 'cryptography'])
     except ModuleNotFoundError:
         print('Unable to install required cryptography module')
+    try:
+        import httpx
+    except ImportError:
+        pip(['install', 'httpx[http2]'])
+    except ModuleNotFoundError:
+        print('Unable to install required httpx[http2] module')
 except (ImportError, ModuleNotFoundError):
-    print('Unable to load pip module to install cryptography module')
+    print('Unable to load pip module to install required modules')
+
 
 
 import lib.clients.hdhr.hdhr_server as hdhr_server
@@ -48,6 +55,7 @@
 import lib.updater.updater as updater
 import lib.config.user_config as user_config
 from lib.db.db_scheduler import DBScheduler
+from lib.db.db_temp import DBTemp
 from lib.common.utils import clean_exit
 from lib.common.pickling import Pickling
 from lib.schedule.scheduler import Scheduler
@@ -106,28 +114,42 @@ def main(script_dir):
     # Get Operating system
     opersystem = platform.system()
     config_obj = None
+    scheduler = None
+    terminate_queue = None
     try:
         RESTART_REQUESTED = False
 
         config_obj = user_config.get_config(script_dir, opersystem, args)
         config = config_obj.data
         LOGGER = logging.getLogger(__name__)
+        # reduce logging for httpx modules
+        logging.getLogger("hpack").setLevel(logging.WARNING)
+        logging.getLogger("httpx").setLevel(logging.WARNING)
+        logging.getLogger("httpcore").setLevel(logging.WARNING)
 
         LOGGER.warning('#########################################')
         LOGGER.warning('MIT License, Copyright (C) 2021 ROCKY4546')
         LOGGER.notice('Cabernet v{}'.format(utils.get_version_str()))
+    except KeyboardInterrupt:
+        if LOGGER:
+            LOGGER.warning('^C received, shutting down the server')
+        return
 
+    try:
         # use this until 0.9.3 due to maintenance mode not being enabled in 0.9.1
-        if args.restart and config['main']['maintenance_mode']:
+        if config['main']['maintenance_mode']:
             LOGGER.info('In maintenance mode, applying patches')
             patcher.patch_upgrade(config_obj, utils.VERSION)
-            config_obj.write('main', 'maintenance_mode', False)
             time.sleep(0.01)
+        config_obj.write('main', 'maintenance_mode', False)
 
         utils.cleanup_web_temp(config)
+        dbtemp = DBTemp(config)
+        dbtemp.cleanup_temp(None, None)
         plugins = init_plugins(config_obj)
         config_obj.defn_json = None
         init_versions(plugins)
+
         if opersystem in ['Windows']:
             pickle_it = Pickling(config)
             pickle_it.to_pickle(plugins)
@@ -158,7 +180,8 @@ def main(script_dir):
         terminate_processes(config, hdhr_serverx, ssdp_serverx, webadmin, tuner, scheduler, config_obj)
 
     except KeyboardInterrupt:
-        LOGGER.warning('^C received, shutting down the server')
+        if LOGGER:
+            LOGGER.warning('^C received, shutting down the server')
         shutdown(config, hdhr_serverx, ssdp_serverx, webadmin, tuner, scheduler, config_obj, terminate_queue)
 
 
@@ -234,9 +257,11 @@ def init_hdhr(_config, _hdhr_queue):
 
 
 def shutdown(_config, _hdhr_serverx, _ssdp_serverx, _webadmin, _tuner, _scheduler, _config_obj, _terminate_queue):
-    _terminate_queue.put('shutdown')
-    time.sleep(2)
-    terminate_processes(_config, _hdhr_serverx, _ssdp_serverx, _webadmin, _tuner, _scheduler, _config_obj)
+    if _terminate_queue:
+        _terminate_queue.put('shutdown')
+        time.sleep(0.01)
+        terminate_processes(_config, _hdhr_serverx, _ssdp_serverx, _webadmin, _tuner, _scheduler, _config_obj)
+    LOGGER.debug('main process terminated')
     clean_exit()
 
 
@@ -263,3 +288,4 @@ def terminate_processes(_config, _hdhr_serverx, _ssdp_serverx, _webadmin, _tuner
     if _config_obj and _config_obj.defn_json:
         _config_obj.defn_json.terminate()
         del _config_obj
+    time.sleep(0.5)
\ No newline at end of file
diff --git a/lib/plugins/__init__.py b/lib/plugins/__init__.py
index 3740447..87d95d7 100644
--- a/lib/plugins/__init__.py
+++ b/lib/plugins/__init__.py
@@ -1 +1 @@
-# location to install plugins
+import lib.plugins.plugin_manager
\ No newline at end of file
diff --git a/lib/plugins/plugin.py b/lib/plugins/plugin.py
index 47b0b07..c91d97d 100644
--- a/lib/plugins/plugin.py
+++ b/lib/plugins/plugin.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -27,7 +27,6 @@
 from lib.db.db_plugins import DBPlugins
 from lib.db.db_config_defn import DBConfigDefn
 
-
 PLUGIN_CONFIG_DEFN_FILE = 'config_defn.json'
 PLUGIN_INSTANCE_DEFN_FILE = 'instance_defn.json'
 PLUGIN_MANIFEST_FILE = 'plugin.json'
@@ -40,19 +39,17 @@ def register(func):
 
 
 class Plugin:
-
     # Temporarily used to register the plugin setup() function
     _plugin_func = None
     logger = None
 
-    def __init__(self, _config_obj, _plugin_defn, _plugin_path):
-
+    def __init__(self, _config_obj, _plugin_defn, _plugins_pkg, _plugin_id, _is_external):
         if Plugin.logger is None:
             Plugin.logger = logging.getLogger(__name__)
         self.enabled = True
-        self.plugin_path = _plugin_path
+        self.plugin_path = '.'.join([_plugins_pkg, _plugin_id])
+        self.plugin_id = _plugin_id
         self.config_obj = _config_obj
-
         self.db_configdefn = DBConfigDefn(_config_obj.data)
         self.load_config_defn()
 
@@ -60,23 +57,53 @@ def __init__(self, _config_obj, _plugin_defn, _plugin_path):
         self.init_func = Plugin._plugin_func
         self.plugin_settings = {}
         self.plugin_db = DBPlugins(_config_obj.data)
-        self.namespace = None
+        self.namespace = ''
         self.instances = []
-        self.load_plugin_manifest(_plugin_defn)
+        self.repo_id = None
+        self.load_plugin_manifest(_plugin_defn, _is_external)
+        if not self.namespace:
+            self.enabled = False
+            self.logger.debug('1 Plugin disabled in config.ini for {}'.format(self.namespace))
+            return
         self.plugin_obj = None
-        if not self.config_obj.data[self.namespace.lower()]['enabled']:
+        self.config_obj.data[self.namespace.lower()]['version'] = self.plugin_settings['version']['current']
+        if not self.config_obj.data[self.namespace.lower()].get('enabled'):
             self.enabled = False
-            self.logger.debug('Plugin disabled in config.ini for {}'.format(self.namespace))
+            self.logger.debug('2 Plugin disabled in config.ini for {}'.format(self.namespace))
+            self.db_configdefn.add_config(self.config_obj.data)
             return
         self.load_instances()
         self.logger.notice('Plugin created for {}'.format(self.namespace))
 
+    def terminate(self):
+        """
+        Removes all has a object from the object and calls any subclasses to also terminate
+        Not calling inherited class at this time
+        """
+        self.enabled = False
+        self.config_obj.write(
+            self.namespace.lower(), 'enabled', False)
+
+        if self.plugin_obj:
+            self.plugin_obj.terminate()
+        self.plugin_path = None
+        self.plugin_id = None
+        self.config_obj = None
+        self.db_configdefn = None
+        self.init_func = None
+        self.plugin_settings = None
+        self.plugin_db = None
+        self.namespace = None
+        self.instances = None
+        self.repo_id = None
+        self.plugin_obj = None
+
+
     def load_config_defn(self):
         try:
             self.logger.debug(
                 'Plugin Config Defn file loaded at {}'.format(self.plugin_path))
             defn_obj = ConfigDefn(self.plugin_path, PLUGIN_CONFIG_DEFN_FILE, self.config_obj.data)
-            
             default_config = defn_obj.get_default_config()
             self.config_obj.merge_config(default_config)
             defn_obj.call_oninit(self.config_obj)
@@ -95,15 +122,16 @@ def load_config_defn(self):
 
     def load_instances(self):
         inst_defn_obj = ConfigDefn(self.plugin_path, PLUGIN_INSTANCE_DEFN_FILE, self.config_obj.data, True)
-        # determine in the config data whether the instance of this name exists.  It would have a section name = 'name-instance'
+        # determine in the config data whether the instance of this name exists.
+        # It would have a section name = 'name-instance'
         self.instances = self.find_instances()
         if len(self.instances) == 0:
-            self.enabled = False
-            self.config_obj.data[self.namespace.lower()]['enabled'] = False
-            self.logger.info('No instances found, disabling plugin {}'.format(self.namespace))
+            self.enabled = True
+            self.config_obj.data[self.namespace.lower()]['enabled'] = True
+            self.logger.info('No instances found, {}'.format(self.namespace))
             return
         for inst in self.instances:
-            self.plugin_db.save_instance(self.namespace, inst, '')
+            self.plugin_db.save_instance(self.repo_id, self.namespace, inst, '')
             # create a defn with the instance name as the section name. then process it.
             inst_defn_obj.is_instance_defn = False
             for area, area_data in inst_defn_obj.config_defn.items():
@@ -114,16 +142,17 @@ def load_instances(self):
                 base_section = section.split('_', 1)[0]
                 area_data['sections'][base_section + '_' + inst] = area_data['sections'].pop(section)
                 if 'label' in self.config_obj.data[base_section + '_' + inst] \
-                    and self.config_obj.data[base_section + '_' + inst]['label'] is not None:
-                    area_data['sections'][base_section + '_' + inst]['label'] = self.config_obj.data[base_section + '_' + inst]['label']
+                        and self.config_obj.data[base_section + '_' + inst]['label'] is not None:
+                    area_data['sections'][base_section + '_' + inst]['label'] = \
+                        self.config_obj.data[base_section + '_' + inst]['label']
                 inst_defn_obj.save_defn_to_db()
-                
+
                 default_config = inst_defn_obj.get_default_config()
                 self.config_obj.merge_config(default_config)
                 inst_defn_obj.call_oninit(self.config_obj)
                 self.config_obj.defn_json.merge_defn_obj(inst_defn_obj)
-                for area, area_data in inst_defn_obj.config_defn.items():
-                    for section, section_data in area_data['sections'].items():
+                for area2, area_data2 in inst_defn_obj.config_defn.items():
+                    for section, section_data in area_data2['sections'].items():
                         for setting in section_data['settings'].keys():
                             new_value = self.config_obj.fix_value_type(
                                 section, setting, self.config_obj.data[section][setting])
@@ -138,23 +167,37 @@ def find_instances(self):
                 instances.append(section.split(inst_sec, 1)[1])
         return instances
 
-    def load_plugin_manifest(self, _plugin_defn):
+    def load_plugin_manifest(self, _plugin_defn, _is_external):
         self.load_default_settings(_plugin_defn)
-        self.import_manifest()
+        self.import_manifest(_is_external)
 
     def load_default_settings(self, _plugin_defn):
         for name, attr in _plugin_defn.items():
             self.plugin_settings[name] = attr['default']
 
-    def import_manifest(self):
+    def import_manifest(self, _is_external):
         try:
-            json_settings = importlib.resources.read_text(self.plugin_path, PLUGIN_MANIFEST_FILE)
-            settings = json.loads(json_settings)
-            self.namespace = settings['name']
-            self.plugin_db.save_plugin(settings)
+            json_settings = self.plugin_db.get_plugins(_installed=None, _repo_id=None, _plugin_id=self.plugin_id)
+
+            local_settings = importlib.resources.read_text(self.plugin_path, PLUGIN_MANIFEST_FILE)
+            local_settings = json.loads(local_settings)
+            local_settings = local_settings['plugin']
+
+            if not json_settings:
+                json_settings = local_settings
+                json_settings['repoid'] = None
+            else:
+                json_settings = json_settings[0]
+                self.repo_id = json_settings['repoid']
+                if local_settings['version']['current']:
+                    json_settings['version']['current'] = local_settings['version']['current']
+            json_settings['external'] = _is_external
+            json_settings['version']['installed'] = True
+            self.namespace = json_settings['name']
+            self.plugin_db.save_plugin(json_settings)
             self.logger.debug(
                 'Plugin Manifest file loaded at {}'.format(self.plugin_path))
-            self.plugin_settings = utils.merge_dict(self.plugin_settings, settings, True)
+            self.plugin_settings = utils.merge_dict(self.plugin_settings, json_settings, True)
         except FileNotFoundError:
             self.logger.warning(
                 'PLUGIN MANIFEST FILE NOT FOUND AT {}'.format(self.plugin_path))
@@ -162,4 +205,3 @@ def import_manifest(self):
     @property
     def name(self):
         return self.plugin_settings['name']
-
diff --git a/lib/plugins/plugin_channels.py b/lib/plugins/plugin_channels.py
index 7e6c77f..5e23077 100644
--- a/lib/plugins/plugin_channels.py
+++ b/lib/plugins/plugin_channels.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -21,22 +21,18 @@
 import json
 import logging
 import io
-import os
-import pathlib
 import re
-import shutil
 import threading
 import time
-import urllib.request
 
 import lib.m3u8 as m3u8
+import lib.config.config_callbacks as config_callbacks
 import lib.common.utils as utils
 import lib.image_size.get_image_size as get_image_size
 from lib.db.db_channels import DBChannels
 from lib.common.decorators import handle_url_except
 from lib.common.decorators import handle_json_except
 
-
 class PluginChannels:
 
     def __init__(self, _instance_obj):
@@ -47,11 +43,25 @@ def __init__(self, _instance_obj):
         self.instance_key = _instance_obj.instance_key
         self.db = DBChannels(self.config_obj.data)
         self.config_section = self.instance_obj.config_section
-        if self.config_obj.data[self.config_section].get('channel-start_ch_num') is not None:
-            self.ch_num_enum = self.config_obj.data[self.config_section]['channel-start_ch_num']
-        else:
+
+        self.ch_num_enum = self.config_obj.data[self.config_section].get('channel-start_ch_num')
+        if self.ch_num_enum is None or self.ch_num_enum < 0:
             self.ch_num_enum = 0
 
+    def terminate(self):
+        """
+        Removes all has a object from the object and calls any subclasses to also terminate
+        Not calling inherited class at this time
+        """
+        self.logger = None
+        self.instance_obj = None
+        self.config_obj = None
+        self.plugin_obj = None
+        self.instance_key = None
+        self.db = None
+        self.config_section = None
+        self.ch_num_enum = None
+
     def set_channel_num(self, _number):
         """
         if _number is None then will set the channel number based
@@ -64,7 +74,6 @@ def set_channel_num(self, _number):
         else:
             return _number
 
-
     def get_channels(self):
         """
         Interface method to override
@@ -73,40 +82,43 @@ def get_channels(self):
 
     @handle_url_except()
     @handle_json_except
-    def get_uri_json_data(self, _uri):
+    def get_uri_json_data(self, _uri, _retries):
         header = {
             'Content-Type': 'application/json',
             'User-agent': utils.DEFAULT_USER_AGENT}
-        req = urllib.request.Request(_uri, headers=header)
-        with urllib.request.urlopen(req, timeout=10.0) as resp:
-            return json.load(resp)
+        resp = self.plugin_obj.http_session.get(_uri, headers=header, timeout=8)
+        x = resp.json()
+        resp.raise_for_status()
+        return x
 
     @handle_url_except()
-    def get_uri_data(self, _uri, _header=None, _data=None):
+    def get_uri_data(self, _uri, _retries, _header=None, _data=None):
         if _header is None:
             header = {
                 'User-agent': utils.DEFAULT_USER_AGENT}
         else:
             header = _header
-        req = urllib.request.Request(_uri, data=_data, headers=header)
-        with urllib.request.urlopen(req, timeout=10.0) as resp:
-            return resp.read()
+        if _data:
+            resp = self.plugin_obj.http_session.post(_uri, headers=header, data=_data, timeout=8)
+        else:
+            resp = self.plugin_obj.http_session.get(_uri, headers=header, timeout=8)
+        x = resp.content
+        return x
 
-    @handle_url_except(timeout=10.0)
-    @handle_json_except
-    def get_m3u8_data(self, _uri, _header=None):
+    @handle_url_except()
+    def get_m3u8_data(self, _uri, _retries, _header=None):
         if _header is None:
             return m3u8.load(_uri,
-                headers={'User-agent': utils.DEFAULT_USER_AGENT})
+                             headers={'User-agent': utils.DEFAULT_USER_AGENT},
+                             http_session=self.plugin_obj.http_session)
         else:
             return m3u8.load(_uri,
-                headers=_header)
+                             headers=_header,
+                             http_session=self.plugin_obj.http_session)
 
-        
     def refresh_channels(self, force=False):
-        if self.config_obj.data[self.config_section].get('channel-start_ch_num') is not None:
-            self.ch_num_enum = self.config_obj.data[self.config_section]['channel-start_ch_num']
-        else:
+        self.ch_num_enum = self.config_obj.data[self.config_section].get('channel-start_ch_num')
+        if self.ch_num_enum is None or self.ch_num_enum < 0:
             self.ch_num_enum = 0
         last_update = self.db.get_status(self.plugin_obj.name, self.instance_key)
         update_needed = False
@@ -114,8 +126,8 @@ def refresh_channels(self, force=False):
             update_needed = True
         else:
             delta = datetime.datetime.now() - last_update
-            if delta.total_seconds() / 3600 >= self.config_obj.data[
-                    self.config_section]['channel-update_timeout']:
+            if delta.total_seconds() / 3600 >= \
+                    self.config_obj.data[self.config_section]['channel-update_timeout']:
                 update_needed = True
         if update_needed or force:
             i = 0
@@ -124,19 +136,25 @@ def refresh_channels(self, force=False):
                 i += 1
                 time.sleep(0.5)
                 ch_dict = self.get_channels()
-            if ch_dict == None:
-                self.logger.warning('Unable to retrieve channel data from {}:{}, aborting refresh' \
+            if ch_dict is None:
+                self.logger.warning(
+                    'Unable to retrieve channel data from {}:{}, aborting refresh'
                     .format(self.plugin_obj.name, self.instance_key))
                 return False
             if 'channel-import_groups' in self.config_obj.data[self.config_section]:
-                self.db.save_channel_list(self.plugin_obj.name, self.instance_key, ch_dict, \
+                self.db.save_channel_list(
+                    self.plugin_obj.name, self.instance_key, ch_dict,
                     self.config_obj.data[self.config_section]['channel-import_groups'])
             else:
                 self.db.save_channel_list(self.plugin_obj.name, self.instance_key, ch_dict)
-            self.logger.debug('{}:{} Channel update complete' \
+            if self.config_obj.data[self.config_section].get('channel-start_ch_num') > -1:
+                config_callbacks.update_channel_num(self.config_obj, self.config_section, 'channel-start_ch_num')
+            self.logger.debug(
+                '{}:{} Channel update complete'
                 .format(self.plugin_obj.name, self.instance_key))
         else:
-            self.logger.debug('Channel data still new for {} {}, not refreshing' \
+            self.logger.debug(
+                'Channel data still new for {} {}, not refreshing'
                 .format(self.plugin_obj.name, self.instance_key))
             return False
 
@@ -146,7 +164,7 @@ def clean_group_name(self, group_name):
         return re.sub('[ +&*%$#@!:;,<>?]', '', group_name)
 
     @handle_url_except()
-    def get_thumbnail_size(self, _thumbnail, _ch_uid, ):
+    def get_thumbnail_size(self, _thumbnail, _retries, _ch_uid, ):
         thumbnail_size = (0, 0)
         if _thumbnail is None or _thumbnail == '':
             return thumbnail_size
@@ -154,86 +172,135 @@ def get_thumbnail_size(self, _thumbnail, _ch_uid, ):
         if _ch_uid is not None:
             ch_row = self.db.get_channel(_ch_uid, self.plugin_obj.name, self.instance_key)
             if ch_row is not None:
-                ch_dict = ch_row['json']
                 if ch_row['json']['thumbnail'] == _thumbnail:
                     return ch_row['json']['thumbnail_size']
 
         h = {'User-Agent': utils.DEFAULT_USER_AGENT,
-            'Accept': '*/*',
-            'Accept-Encoding': 'identity',
-            'Connection': 'Keep-Alive'
-            }
-        req = urllib.request.Request(_thumbnail, headers=h)
-        with urllib.request.urlopen(req) as resp:
-            img_blob = resp.read()
-            fp = io.BytesIO(img_blob)
-            sz = len(img_blob)
-            try:
-                thumbnail_size = get_image_size.get_image_size_from_bytesio(fp, sz)
-            except get_image_size.UnknownImageFormat as e:
-                self.logger.warning('{}: Thumbnail unknown format. {}'
-                    .format(self.plugin_obj.name, str(e)))
-                pass
+             'Accept': '*/*',
+             'Accept-Encoding': 'identity',
+             'Connection': 'Keep-Alive'
+             }
+        resp = self.plugin_obj.http_session.get(_thumbnail, headers=h, timeout=8)
+        resp.raise_for_status()
+        img_blob = resp.content
+        fp = io.BytesIO(img_blob)
+        sz = len(img_blob)
+        try:
+            thumbnail_size = get_image_size.get_image_size_from_bytesio(fp, sz)
+        except get_image_size.UnknownImageFormat as e:
+            self.logger.warning('{}: Thumbnail unknown format. {}'
+                                .format(self.plugin_obj.name, str(e)))
+            pass
         return thumbnail_size
 
     @handle_url_except
-    def get_best_stream(self, _url, _channel_id):
-        self.logger.debug('{}: Getting best video stream info for {} {}' \
+    def get_best_stream(self, _url, _retries, _channel_id, _referer=None):
+        if self.config_obj.data[self.config_section]['player-stream_type'] == 'm3u8redirect':
+            return _url
+
+
+        self.logger.debug(
+            '{}: Getting best video stream info for {} {}'
             .format(self.plugin_obj.name, _channel_id, _url))
-        bestStream = None
-        videoUrlM3u = m3u8.load(_url,
-            headers={'User-agent': utils.DEFAULT_USER_AGENT})
-        self.logger.debug("Found " + str(len(videoUrlM3u.playlists)) + " Playlists")
-
-        max_bitrate = 570000
-
-        # obtain lowest value that exceeds max_bitrate
-        if len(videoUrlM3u.playlists) > 0:
-            bandwidth_list = {}
-            for videoStream in videoUrlM3u.playlists:
-                bandwidth_list[videoStream.stream_info.bandwidth] = videoStream
-            bandwidth_list = collections.OrderedDict(sorted(bandwidth_list.items(), reverse=True))
-            self.logger.warning(bandwidth_list.keys())
-            
-            for videoStream in videoUrlM3u.playlists:
-                if bestStream is None:
-                    bestStream = videoStream
-                elif videoStream.stream_info.resolution is None:
-                    for bps, seg in bandwidth_list.items():
-                        if bps < max_bitrate:
-                            bestStream = seg
-                            break
-                        else:
-                            bestStream = seg
-                            
-                    self.logger.warning('Using bandwidth {} for {}'.format(bestStream.stream_info.bandwidth, _channel_id))
+        best_stream = None
+        if _referer:
+            header = {
+                'User-agent': utils.DEFAULT_USER_AGENT,
+                'Referer': _referer}
+        else:
+            header = {'User-agent': utils.DEFAULT_USER_AGENT}
+
+        ch_dict = self.db.get_channel(_channel_id, self.plugin_obj.name, self.instance_key)
+        ch_json = ch_dict['json']
+        best_resolution = -1
+        video_url_m3u = m3u8.load(
+            _url, headers=header,
+            http_session=self.plugin_obj.http_session)
+
+        if not video_url_m3u:
+            self.logger.notice('{}:{} Unable to obtain m3u file, aborting stream {}'
+                               .format(self.plugin_obj.name, self.instance_key, _channel_id))
+            return
+        self.logger.debug("Found " + str(len(video_url_m3u.playlists)) + " Playlists")
+
+        if len(video_url_m3u.playlists) > 0:
+            max_bitrate = self.config_obj.data[self.config_section]['player-stream_quality']
+            bitrate_list = {}
+            for video_stream in video_url_m3u.playlists:
+                bitrate_list[video_stream.stream_info.bandwidth] = video_stream
+            bitrate_list = collections.OrderedDict(sorted(bitrate_list.items(), reverse=True))
+            # bitrate is sorted from highest to lowest
+            if list(bitrate_list.keys())[0] > max_bitrate:
+                is_set_by_bitrate = True
+            else:
+                is_set_by_bitrate = False
+            for bps, seg in bitrate_list.items():
+                if bps < max_bitrate:
+                    best_stream = seg
+                    if seg.stream_info.resolution:
+                        best_resolution = seg.stream_info.resolution[1]
                     break
- 
-                    if videoStream.stream_info.bandwidth > bestStream.stream_info.bandwidth:
-                        # current is higher bandwidth
-                        bestStream = videoStream
-                elif ((videoStream.stream_info.resolution[0] > bestStream.stream_info.resolution[0]) and
-                      (videoStream.stream_info.resolution[1] > bestStream.stream_info.resolution[1])):
-                    bestStream = videoStream
-                elif ((videoStream.stream_info.resolution[0] == bestStream.stream_info.resolution[0]) and
-                      (videoStream.stream_info.resolution[1] == bestStream.stream_info.resolution[1]) and
-                      (videoStream.stream_info.bandwidth > bestStream.stream_info.bandwidth)):
-                    bestStream = videoStream
-            if bestStream is not None:
-                if bestStream.stream_info.resolution is None:
-                    self.logger.debug('{} will use bandwidth at {} bps' \
-                        .format(_channel_id, str(bestStream.stream_info.bandwidth)))
                 else:
-                    self.logger.notice(self.plugin_obj.name + ': ' + _channel_id + " will use " +
-                        str(bestStream.stream_info.resolution[0]) + "x" +
-                        str(bestStream.stream_info.resolution[1]) +
-                        " resolution at " + str(bestStream.stream_info.bandwidth) + "bps")
-                return bestStream.absolute_uri
+                    best_stream = seg
+                    if seg.stream_info.resolution:
+                        best_resolution = seg.stream_info.resolution[1]
+
+            for video_stream in video_url_m3u.playlists:
+                if best_stream is None:
+                    best_stream = video_stream
+                    if video_stream.stream_info.resolution:
+                        best_resolution = video_stream.stream_info.resolution[1]
+                elif not video_stream.stream_info.resolution:
+                    # already set earlier
+                    continue
+                elif ((video_stream.stream_info.resolution[0] > best_stream.stream_info.resolution[0]) and
+                      (video_stream.stream_info.resolution[1] > best_stream.stream_info.resolution[1]) and
+                      not is_set_by_bitrate):
+                    best_stream = video_stream
+                    best_resolution = video_stream.stream_info.resolution[1]
+                elif ((video_stream.stream_info.resolution[0] == best_stream.stream_info.resolution[0]) and
+                      (video_stream.stream_info.resolution[1] == best_stream.stream_info.resolution[1]) and
+                      (video_stream.stream_info.bandwidth > best_stream.stream_info.bandwidth) and
+                      not is_set_by_bitrate):
+                    best_stream = video_stream
+                    best_resolution = video_stream.stream_info.resolution[1]
+
+            json_needs_updating = False
+            if best_stream is not None:
+                # use resolution over 720 as HD or
+                # bandwidth over 3mil
+                if best_resolution >= 720 and ch_json['HD'] == 0:
+                    ch_json['HD'] = 1
+                    json_needs_updating = True
+                elif 0 < best_resolution < 720 and ch_json['HD'] == 1:
+                    ch_json['HD'] = 0
+                    json_needs_updating = True
+                elif best_stream.stream_info.bandwidth > 3000000 and ch_json['HD'] == 0:
+                    ch_json['HD'] = 1
+                    json_needs_updating = True
+                elif best_stream.stream_info.bandwidth <= 3000000 and ch_json['HD'] == 1:
+                    ch_json['HD'] = 0
+                    json_needs_updating = True
+
+                if best_stream.stream_info.resolution is None:
+                    self.logger.debug(
+                        '{} will use bandwidth at {} bps'
+                        .format(_channel_id, str(best_stream.stream_info.bandwidth)))
+                else:
+                    self.logger.notice(
+                        self.plugin_obj.name + ': ' + _channel_id + " will use " +
+                        str(best_stream.stream_info.resolution[0]) + "x" +
+                        str(best_stream.stream_info.resolution[1]) +
+                        " resolution at " + str(best_stream.stream_info.bandwidth) + "bps")
+
+                if json_needs_updating:
+                    self.db.update_channel_json(ch_json, self.plugin_obj.name, self.instance_key)
+                return best_stream.absolute_uri
         else:
             self.logger.debug('{}: {} No variant streams found for this station.  Assuming single stream only.'
-                .format(self.plugin_obj.name, _channel_id))
+                              .format(self.plugin_obj.name, _channel_id))
             return _url
 
     def check_logger_refresh(self):
         if not self.logger.isEnabledFor(40):
-            self.logger = logging.getLogger(__name__+str(threading.get_ident()))
+            self.logger = logging.getLogger(__name__ + str(threading.get_ident()))
diff --git a/lib/plugins/plugin_epg.py b/lib/plugins/plugin_epg.py
index 25f2188..e463c6b 100644
--- a/lib/plugins/plugin_epg.py
+++ b/lib/plugins/plugin_epg.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -20,7 +20,6 @@
 import json
 import logging
 import threading
-import urllib.request
 
 import lib.common.utils as utils
 from lib.db.db_epg import DBepg
@@ -28,7 +27,6 @@
 from lib.common.decorators import handle_json_except
 
 
-
 class PluginEPG:
 
     def __init__(self, _instance_obj):
@@ -39,24 +37,37 @@ def __init__(self, _instance_obj):
         self.plugin_obj = _instance_obj.plugin_obj
         self.db = DBepg(self.config_obj.data)
         self.config_section = self.instance_obj.config_section
-        self.episode_adj = self.config_obj.data \
-            [self.instance_obj.config_section].get('epg-episode_adjustment')
+        self.episode_adj = self.config_obj.data[self.instance_obj.config_section]\
+            .get('epg-episode_adjustment')
         if self.episode_adj is None:
             self.episode_adj = 0
         else:
             self.episode_adj = int(self.episode_adj)
-            
+
+    def terminate(self):
+        """
+        Removes all has a object from the object and calls any subclasses to also terminate
+        Not calling inherited class at this time
+        """
+        self.logger = None
+        self.instance_obj = None
+        self.config_obj = None
+        self.instance_key = None
+        self.plugin_obj = None
+        self.db = None
+        self.config_section = None
+        self.episode_adj = None
 
     @handle_url_except(timeout=10.0)
     @handle_json_except
-    def get_uri_data(self, _uri, _header=None):
+    def get_uri_data(self, _uri, _retries, _header=None):
         if _header is None:
             header = {'User-agent': utils.DEFAULT_USER_AGENT}
         else:
             header = _header
-        req = urllib.request.Request(_uri, headers=header)
-        with urllib.request.urlopen(req, timeout=10.0) as resp:
-            x = json.load(resp)
+        resp = self.plugin_obj.http_session.get(_uri, headers=header, timeout=8)
+        x = resp.json()
+        resp.raise_for_status()
         return x
 
     def refresh_epg(self):
@@ -65,7 +76,7 @@ def refresh_epg(self):
             return False
         if not self.config_obj.data[self.instance_obj.config_section]['epg-enabled']:
             self.logger.info('EPG Collection not enabled for {} {}'
-                .format(self.plugin_obj.name, self.instance_key))
+                             .format(self.plugin_obj.name, self.instance_key))
             return False
         forced_dates, aging_dates = self.dates_to_pull()
         self.db.del_old_programs(self.plugin_obj.name, self.instance_key)
@@ -91,9 +102,6 @@ def get_channel_days(self, _zone, _uid, _days):
         """
         pass
 
-
-
-
     def dates_to_pull(self):
         """
         Returns the days to pull, if EPG is less than a day, then
@@ -127,4 +135,4 @@ def is_refresh_expired(self):
 
     def check_logger_refresh(self):
         if not self.logger.isEnabledFor(40):
-            self.logger = logging.getLogger(__name__+str(threading.get_ident()))
+            self.logger = logging.getLogger(__name__ + str(threading.get_ident()))
diff --git a/lib/plugins/plugin_handler.py b/lib/plugins/plugin_handler.py
index 8531bfa..0fe8225 100644
--- a/lib/plugins/plugin_handler.py
+++ b/lib/plugins/plugin_handler.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -16,22 +16,27 @@
 substantial portions of the Software.
 """
 
+import configparser
 import logging
 import json
 import importlib
 import importlib.resources
+import os
+import pathlib
 
 import lib.common.exceptions as exceptions
 import lib.common.utils as utils
 
 from .plugin import Plugin
+from .repo_handler import RepoHandler
 from lib.db.db_plugins import DBPlugins
+from lib.db.db_channels import DBChannels
+from lib.db.db_config_defn import DBConfigDefn
 
 PLUGIN_DEFN_FILE = 'plugin_defn.json'
 
 
 class PluginHandler:
-
     logger = None
     cls_plugins = None
 
@@ -41,37 +46,119 @@ def __init__(self, _config_obj):
         if PluginHandler.logger is None:
             PluginHandler.logger = logging.getLogger(__name__)
         self.plugin_defn = self.load_plugin_defn()
-        self.collect_plugins(self.config_obj.data['paths']['internal_plugins_pkg'])
-        self.collect_plugins(self.config_obj.data['paths']['external_plugins_pkg'])
+        self.check_external_plugin_folder()
+        self.repos = RepoHandler(self.config_obj)
+
+        self.repos.load_cabernet_repo()
+        self.collect_plugins(self.config_obj.data['paths']['internal_plugins_pkg'], False)
+        self.collect_plugins(self.config_obj.data['paths']['external_plugins_pkg'], True)
+        self.cleanup_config_missing_plugins()
         if PluginHandler.cls_plugins is not None:
             del PluginHandler.cls_plugins
         PluginHandler.cls_plugins = self.plugins
 
-    def collect_plugins(self, _plugins_pkg):
-        plugin_db = DBPlugins(self.config_obj.data)
-        #plugin_db.reinitialize_tables()
-        for folder in importlib.resources.contents(_plugins_pkg):
-            if folder.startswith('__'):
-                continue
+    def terminate(self, _plugin_name):
+        """
+        calls terminate to the plugin requested
+        """
+        self.plugins[_plugin_name].terminate()
+        del self.plugins[_plugin_name]
+
+    def check_external_plugin_folder(self):
+        """
+        If the folder does not exists, then create it and place the 
+        __init__.py file in it.
+        """
+        ext_folder = pathlib.Path(self.config_obj.data['paths']['main_dir']) \
+            .joinpath(self.config_obj.data['paths']['external_plugins_pkg'])
+        init_file = ext_folder.joinpath('__init__.py')
+        if not init_file.exists():
+            self.logger.notice('Creating external plugin folder for use by Cabernet')
             try:
-                importlib.resources.read_text(_plugins_pkg, folder)
-            except (IsADirectoryError, PermissionError) as e:
-                try:
-                    plugin = Plugin(self.config_obj, self.plugin_defn, '.'.join([_plugins_pkg, folder]))
-                    self.plugins[plugin.name] = plugin
-                except (exceptions.CabernetException, AttributeError):
-                    pass
+                if not ext_folder.exists():
+                    os.makedirs(ext_folder)
+                f = open(init_file, 'wb')
+                f.close()
+            except PermissionError as e:
+                self.logger.warning('ERROR: {} unable to create {}'.format(str(e), init_file))
+
+    def collect_plugins(self, _plugins_pkg, _is_external):
+        pkg = importlib.util.find_spec(_plugins_pkg)
+        if not pkg:
+            # module folder does not exist, do nothing
+            self.logger.notice(
+                'plugin folder {} does not exist with a __init__.py empty file in it.'
+                .format(_plugins_pkg))
+            return
+        
+        for folder in importlib.resources.contents(_plugins_pkg):
+            self.collect_plugin(_plugins_pkg, _is_external, folder)
         self.del_missing_plugins()
 
+    def cleanup_config_missing_plugins(self):
+        """
+        Case where the plugin is deleted from folder, but database and config
+        still have data.
+        """
+        ch_db = DBChannels(self.config_obj.data)
+        ns_inst_list = ch_db.get_channel_instances()
+        ns_list = ch_db.get_channel_names()
+        for ns in ns_list:
+            ns = ns['namespace']
+            if not self.plugins.get(ns) and self.config_obj.data.get(ns.lower()):
+                for nv in self.config_obj.data.get(ns.lower()).items():
+                    new_value = self.set_value_type(nv[1])
+                    self.config_obj.data[ns.lower()][nv[0]] = new_value
+        for ns_inst in ns_inst_list:
+            if not self.plugins.get(ns_inst['namespace']):
+                inst_name = utils.instance_config_section(ns_inst['namespace'], ns_inst['instance'])
+                if self.config_obj.data.get(inst_name):
+                    for nv in self.config_obj.data.get(inst_name).items():
+                        new_value = self.set_value_type(nv[1])
+                        self.config_obj.data[inst_name][nv[0]] = new_value
+        db_configdefn = DBConfigDefn(self.config_obj.data)
+        db_configdefn.add_config(self.config_obj.data)
+
+    def set_value_type(self, _value):
+        if not isinstance(_value, str):
+            return _value
+        if _value == 'True':
+            return True
+        elif _value == 'False':
+            return False
+        elif _value.isdigit():
+            return int(_value)
+        else:
+            return _value
+
+    def collect_plugin(self, _plugins_pkg, _is_external, _folder):
+        if _folder.startswith('__'):
+            return
+        try:
+            importlib.resources.read_text(_plugins_pkg, _folder)
+        except (IsADirectoryError, PermissionError):
+            try:
+                plugin = Plugin(self.config_obj, self.plugin_defn, _plugins_pkg, _folder, _is_external)
+                self.plugins[plugin.name] = plugin
+            except (exceptions.CabernetException, AttributeError):
+                pass
+        except UnicodeDecodeError:
+            pass
+        except Exception:
+            pass
+        return
+
     def del_missing_plugins(self):
         """
-        deletes the plugins from the db that are no longer present
+        updates to uninstalled the plugins from the db that are no longer present
         """
         plugin_db = DBPlugins(self.config_obj.data)
-        plugin_dblist = plugin_db.get_plugins()
-        for p_dict in plugin_dblist:
-            if (p_dict['name'] not in self.plugins) and (p_dict['name'] != utils.CABERNET_NAMESPACE):
-                plugin_db.del_plugin(p_dict['name'])
+        plugin_dblist = plugin_db.get_plugins(_installed=True)
+        if plugin_dblist:
+            for p_dict in plugin_dblist:
+                if (p_dict['name'] not in self.plugins) and (p_dict['name'] != utils.CABERNET_ID):
+                    p_dict['version']['installed'] = False
+                    plugin_db.save_plugin(p_dict)
 
     def load_plugin_defn(self):
         try:
@@ -86,7 +173,7 @@ def load_plugin_defn(self):
 
     def initialize_plugins(self):
         for name, plugin in self.plugins.items():
-            if not self.config_obj.data[plugin.name.lower()]['enabled']:
+            if not plugin.enabled or not self.config_obj.data[plugin.name.lower()]['enabled']:
                 self.logger.info('Plugin {} is disabled in config.ini'.format(plugin.name))
                 plugin.enabled = False
             else:
diff --git a/lib/plugins/plugin_instance_obj.py b/lib/plugins/plugin_instance_obj.py
index 1962a9c..cf86f1f 100644
--- a/lib/plugins/plugin_instance_obj.py
+++ b/lib/plugins/plugin_instance_obj.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -41,8 +41,31 @@ def __init__(self, _plugin_obj, _instance_key):
         else:
             self.enabled = True
 
+    def terminate(self):
+        """
+        Removes all has a object from the object and calls any subclasses to also terminate
+        Not calling inherited class at this time
+        """
+        self.enabled = False
+        if self.channels:
+            self.channels.terminate()
+        if self.epg:
+            self.epg.terminate()
+        if self.programs:
+            self.programs.terminate()
+        self.logger = None
+        self.config_obj = None
+        self.plugin_obj = None
+        self.instance_key = None
+        self.scheduler_db = None
+        self.enabled = None
+        self.channels = None
+        self.programs = None
+        self.epg = None
+
+
     ##############################
-    ### EXTERNAL STREAM METHODS
+    # ## EXTERNAL STREAM METHODS
     ##############################
 
     def is_time_to_refresh(self, _last_refresh):
@@ -61,12 +84,13 @@ def get_channel_uri(self, sid):
         if self.enabled and self.config_obj.data[self.config_section]['enabled']:
             return self.channels.get_channel_uri(sid)
         else:
-            self.logger.debug('{}:{} Plugin instance disabled, not getting Channel uri' \
+            self.logger.debug(
+                '{}:{} Plugin instance disabled, not getting Channel uri'
                 .format(self.plugin_obj.name, self.instance_key))
             return None
 
     ##############################
-    ### EXTERNAL EPG METHODS
+    # ## EXTERNAL EPG METHODS
     ##############################
 
     def get_channel_day(self, _zone, _uid, _day):
@@ -77,11 +101,11 @@ def get_channel_day(self, _zone, _uid, _day):
         if self.enabled and self.config_obj.data[self.config_section]['enabled']:
             return self.epg.get_channel_day(_zone, _uid, _day)
         else:
-            self.logger.debug('{}:{} Plugin instance disabled, not getting EPG channel data' \
+            self.logger.debug(
+                '{}:{} Plugin instance disabled, not getting EPG channel data'
                 .format(self.plugin_obj.name, self.instance_key))
             return None
 
-
     def get_program_info(self, _prog_id):
         """
         External request to return the program details
@@ -91,11 +115,11 @@ def get_program_info(self, _prog_id):
         if self.enabled and self.config_obj.data[self.config_section]['enabled']:
             return self.programs.get_program_info(_prog_id)
         else:
-            self.logger.debug('{}:{} Plugin instance disabled, not getting EPG program data' \
+            self.logger.debug(
+                '{}:{} Plugin instance disabled, not getting EPG program data'
                 .format(self.plugin_obj.name, self.instance_key))
             return None
 
-
     def get_channel_list(self, _zone_id, _ch_ids=None):
         """
         External request to return the channel list for a zone.
@@ -104,14 +128,13 @@ def get_channel_list(self, _zone_id, _ch_ids=None):
         if self.enabled and self.config_obj.data[self.config_section]['enabled']:
             return self.channels.get_channel_list(_zone_id, _ch_ids)
         else:
-            self.logger.debug('{}:{} Plugin instance disabled, not getting EPG zone data' \
+            self.logger.debug(
+                '{}:{} Plugin instance disabled, not getting EPG zone data'
                 .format(self.plugin_obj.name, self.instance_key))
             return None
 
-
     ##############################
 
-
     def scheduler_tasks(self):
         """
         dummy routine that will be overridden by subclass,
@@ -119,7 +142,6 @@ def scheduler_tasks(self):
         """
         pass
 
-
     def refresh_channels(self):
         """
         Called from the scheduler
@@ -129,11 +151,11 @@ def refresh_channels(self):
                 self.config_obj.data[self.config_section]['enabled']:
             return self.channels.refresh_channels()
         else:
-            self.logger.notice('{}:{} Plugin instance disabled, not refreshing Channels' \
+            self.logger.notice(
+                '{}:{} Plugin instance disabled, not refreshing Channels'
                 .format(self.plugin_obj.name, self.instance_key))
             return False
 
-
     def refresh_epg(self):
         """
         Called from the scheduler
@@ -143,13 +165,14 @@ def refresh_epg(self):
                 self.config_obj.data[self.config_section]['enabled']:
             return self.epg.refresh_epg()
         else:
-            self.logger.info('{}:{} Plugin instance disabled, not refreshing EPG' \
+            self.logger.info(
+                '{}:{} Plugin instance disabled, not refreshing EPG'
                 .format(self.plugin_obj.name, self.instance_key))
             return False
 
     def check_logger_refresh(self):
         if not self.logger.isEnabledFor(40):
-            self.logger = logging.getLogger(__name__+str(threading.get_ident()))
+            self.logger = logging.getLogger(__name__ + str(threading.get_ident()))
             if self.channels is not None:
                 self.channels.check_logger_refresh()
             if self.epg is not None:
diff --git a/lib/plugins/plugin_manager/__init__.py b/lib/plugins/plugin_manager/__init__.py
new file mode 100644
index 0000000..d05eb0a
--- /dev/null
+++ b/lib/plugins/plugin_manager/__init__.py
@@ -0,0 +1,2 @@
+import lib.plugins.plugin_manager.plugins_html
+import lib.plugins.plugin_manager.plugins_form_html
diff --git a/lib/plugins/plugin_manager/plugin_manager.py b/lib/plugins/plugin_manager/plugin_manager.py
new file mode 100644
index 0000000..ce922ea
--- /dev/null
+++ b/lib/plugins/plugin_manager/plugin_manager.py
@@ -0,0 +1,323 @@
+"""
+MIT License
+
+Copyright (C) 2023 ROCKY4546
+https://github.com/rocky4546
+
+This file is part of Cabernet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+"""
+
+import logging
+import os
+import pathlib
+import plugins
+import shutil
+import sys
+import time
+import urllib
+import zipfile
+
+import lib.common.utils as utils
+from lib.db.db_plugins import DBPlugins
+from lib.db.db_scheduler import DBScheduler
+from lib.common.decorators import handle_url_except
+
+
+class PluginManager:
+    logger = None
+
+    def __init__(self, _plugins, _config_obj=None):
+        """
+        If called during a patch update, the plugins is unknown,
+        so it should be set to None and the config object passed in instead
+        Otherwise, pass in the plugins and set the config object to None
+        """
+        if PluginManager.logger is None:
+            PluginManager.logger = logging.getLogger(__name__)
+        self.plugin_handler = _plugins
+        if self.plugin_handler:
+            self.config = _plugins.config_obj.data
+            self.config_obj = _plugins.config_obj
+        else:
+            self.config = _config_obj.data
+            self.config_obj = _config_obj
+        
+        self.plugin_db = DBPlugins(self.config)
+        self.db_scheduler = DBScheduler(self.config)
+        self.plugin_rec = None
+        self.repo_rec = None
+
+    def check_plugin_status(self, _repo_id, _plugin_id):
+        """
+        Returns None if successful, otherwise, returns
+        string of the error
+        """
+        self.plugin_rec = self.plugin_db.get_plugins(None, _repo_id, _plugin_id)
+        if not self.plugin_rec:
+            self.logger.notice('No plugin found, aborting')
+            return 'Error: No plugin found, aborting request'
+
+        self.repo_rec = self.plugin_db.get_repos(_repo_id)
+        if not self.repo_rec:
+            self.logger.notice('No repo {} associated with plugin {}, aborting install'
+                .format(_repo_id, _plugin_id))
+            return 'Error: No repo found {}, associated with plugin {}, aborting install' \
+                .format(_repo_id, _plugin_id)
+        self.plugin_rec = self.plugin_rec[0]
+        self.repo_rec = self.repo_rec[0]
+
+        # if plugin exists, make sure we can delete it
+        if self.plugin_rec['external']:
+            plugin_path = self.config['paths']['external_plugins_pkg']
+        else:
+            plugin_path = self.config['paths']['internal_plugins_pkg']
+        plugin_path = pathlib.Path(
+            self.config['paths']['main_dir'],
+            plugin_path,
+            _plugin_id
+            )
+        if plugin_path.exists() and not os.access(plugin_path, os.W_OK):
+            self.logger.warning('Unable to update folder: OS Permission issue on plugin {}, aborting'.format(plugin_path))
+            return 'Error: Unable to update folder: OS Permission issue on plugin {}, aborting'.format(plugin_path)
+
+        return None
+
+    def check_version_requirements(self):
+        # check Cabernet required version
+        req = self.plugin_rec.get('requires')
+        if req:
+            cabernet = req[0].get(utils.CABERNET_ID)
+            if cabernet:
+                ver = cabernet.get('version')
+                if ver:
+                    v_req = utils.get_version_index(ver)
+                    v_cur = utils.get_version_index(utils.VERSION)
+                    if v_req > v_cur:
+                        self.logger.notice('Cabernet version too low, aborting install')
+                        return 'Error: Cabernet version {} too low for plugin. Requires {}, aborting install' \
+                            .format(utils.VERSION, ver)
+        return None
+        
+    def get_plugin_zipfile(self):
+        # starting install process
+        zip_file = ''.join([
+            self.plugin_rec['id'], '-', 
+            self.plugin_rec['version']['latest'],
+            '.zip'
+            ])
+        zippath = '/'.join([
+            self.repo_rec['dir']['datadir']['url'], 
+            self.plugin_rec['id'], zip_file
+            ])
+        tmp_zip_path = self.download_zip(zippath, 2, zip_file)
+        if not tmp_zip_path:
+            self.logger.notice('Unable to obtain zip file from repo, aborting')
+            results = 'Error: Unable to obtain zip file {} from repo, aborting' \
+                .format(zip_file)
+            return (False, results)
+        results = 'Downloaded plugin {} from repo'.format(zip_file)
+        try:
+            with zipfile.ZipFile(tmp_zip_path, 'r') as z:
+                file_list = z.namelist()
+                res = [i for i in file_list if i.endswith(self.plugin_rec['id']+'/')]
+                if not res:
+                    results += '<br>Error: Zip file does not contain plugin folder {}, aborting' \
+                        .format(self.plugin_rec['id'])
+                    return (False, results)
+                if len(res) != 1:
+                    results += '<br>Error: Zip file contains multiple plugin folders {}, aborting' \
+                        .format(self.plugin_rec['id'])
+                    return (False, results)
+
+                z.extractall(os.path.dirname(tmp_zip_path))
+                
+        except FileNotFoundError as ex:
+            self.logger.notice('File {} missing from tmp area, aborting'
+                .format(zip_file))
+            results += '<br>Error: File {} missing from tmp area, aborting' \
+                .format(zip_file)
+            return (False, results)
+
+        tmp_plugin_path = pathlib.Path(os.path.dirname(tmp_zip_path), res[0])
+        plugin_folder = pathlib.Path(
+            self.config['paths']['main_dir'], 
+            self.config['paths']['external_plugins_pkg'])
+
+        plugin_id_folder = plugin_folder.joinpath(self.plugin_rec['id'])
+
+        if plugin_id_folder.exists():
+            try:
+                shutil.rmtree(plugin_id_folder)
+            except OSError as ex:
+                self.logger.warning('Unable to upgrade, {}'.format(str(ex)))
+                results += '<br>Error: Unable to delete folder for upgrade, {}'.format(str(ex))
+                return (False, results)
+            
+        shutil.move(str(tmp_plugin_path), str(plugin_folder))
+        results += '<br>Installed plugin {} from repo, version {}' \
+            .format(self.plugin_rec['id'], self.plugin_rec['version']['latest'])
+        
+        # remove the leftovers in the tmp folder
+        try:
+            p = pathlib.Path(tmp_plugin_path)
+            shutil.rmtree(p.parents[0])
+            os.remove(tmp_zip_path)
+        except OSError as ex:
+            self.logger.notice('Unable to delete plugin from tmp area: {}'.format(str(ex)))
+            results += '<br>Error: Unable to delete plugin folder from tmp area {}'.format(str(ex))
+            return (False, results)
+        return (True, results)
+
+    def upgrade_plugin(self, _repo_id, _plugin_id, _sched_queue):
+        results = self.check_plugin_status(_repo_id, _plugin_id)
+        if results:
+            return results
+        
+        results = self.check_version_requirements()
+        if results:
+            return results
+
+        is_successful, results = self.get_plugin_zipfile()
+        if not is_successful:
+            return results
+
+        # update the plugin database entry with the new version...
+        self.plugin_rec['version']['current'] = self.plugin_rec['version']['latest']
+        self.plugin_db.save_plugin(self.plugin_rec)
+
+        results += '<br>A restart is required to finish cleaning up plugin'
+        return results
+
+    def install_plugin(self, _repo_id, _plugin_id, _sched_queue=None):
+        results = self.check_plugin_status(_repo_id, _plugin_id)
+        if results:
+            return results
+        
+        if self.plugin_rec['version']['installed']:
+            self.logger.notice('Error: Plugin already installed, aborting')
+            return 'Error: Plugin already installed, aborting install'
+
+        results = self.check_version_requirements()
+        if results:
+            return results
+
+        is_successful, results = self.get_plugin_zipfile()
+        if not is_successful:
+            return results
+
+        # next inform cabernet that there is a new plugin
+        if self.plugin_handler:
+            try:
+                self.plugin_handler.collect_plugin(self.config['paths']['external_plugins_pkg'], True, self.plugin_rec['id'])
+            except FileNotFoundError:
+                self.logger.notice('Plugin folder not in external plugin folder: {}'.format(str(ex)))
+                results += '<br>Error: Plugin folder not in external plugin folder {}'.format(str(ex))
+                return results
+
+        # update the database to say plugin is installed and what version
+        # Enable plugin?
+        self.config_obj.write(
+            self.plugin_rec['name'].lower(), 'enabled', True)
+
+        results += '<br>A restart is suggested to finish cleaning up plugin'
+        return results
+
+    def delete_plugin(self, _repo_id, _plugin_id, _sched_queue=None):
+        plugin_rec = self.plugin_db.get_plugins(None, _repo_id, _plugin_id)
+        if not plugin_rec:
+            self.logger.notice('No plugin found, aborting')
+            return 'Error: No plugin found, aborting delete request'
+        elif not plugin_rec[0]['version']['installed']:
+            self.logger.notice('Plugin not installed, aborting')
+            return 'Error: Plugin not installed, aborting delete request'
+        
+        plugin_rec = plugin_rec[0]
+        namespace = plugin_rec['name']
+        if plugin_rec['external']:
+            plugin_path = self.config['paths']['external_plugins_pkg']
+        else:
+            plugin_path = self.config['paths']['internal_plugins_pkg']
+
+        plugin_path = pathlib.Path(
+            self.config['paths']['main_dir'],
+            plugin_path,
+            _plugin_id
+            )
+        if not plugin_path.exists():
+            self.logger.notice('Missing plugin {}, aborting'.format(plugin_path))
+            return 'Error: Missing plugin {}, aborting'.format(plugin_path)
+        elif not os.access(plugin_path, os.W_OK):
+            self.logger.warning('Unable to delete folder: OS Permission issue on plugin {}, aborting'.format(plugin_path))
+            return 'Error: Unable to delete folder: OS Permission issue on plugin {}, aborting'.format(plugin_path)
+
+        results = 'Deleting all {} scheduled tasks'.format(namespace)
+        tasks = self.db_scheduler.get_tasks_by_name(plugin_rec['name'], None)
+        if _sched_queue:
+            for task in tasks:
+                _sched_queue.put({'cmd': 'delinstance', 'name': plugin_rec['name'], 'instance': None})
+
+        results += '<br>Deleting plugin objects'
+        if self.plugin_handler:
+            self.plugin_handler.terminate(namespace)
+
+        results += '<br>Deleting plugin folder {}'.format(plugin_path)
+        try:
+            shutil.rmtree(plugin_path)
+        except OSError as ex:
+            self.logger.notice('Unable to delete plugin: {}'.format(str(ex)))
+            results += '<br>Error: Unable to delete plugin folder {}'.format(str(ex))
+            return results
+
+        plugin_rec['version']['installed'] = False
+        plugin_rec['version']['current'] = None
+        plugin_rec = self.plugin_db.save_plugin(plugin_rec)
+
+        results += '<br>A restart is suggested to finish cleaning up plugin'
+        return results
+
+    def add_instance(self, _repo_id, _plugin_id, _sched_queue=None):
+        plugin_rec = self.plugin_db.get_plugins(None, _repo_id, _plugin_id)
+        if not plugin_rec:
+            self.logger.notice('No plugin found, aborting')
+            return 'Error: No plugin found, aborting delete request'
+        elif not plugin_rec[0]['version']['installed']:
+            self.logger.notice('Plugin not installed, aborting')
+            return 'Error: Plugin not installed, aborting delete request'
+        
+        plugin_rec = plugin_rec[0]
+        namespace = plugin_rec['name']
+
+        results = 'Adding Instance {}'.format(_plugin_id)
+
+        results += '<br>A restart is suggested to finish adding the instance'
+        return results
+
+    
+        
+    @handle_url_except
+    def download_zip(self, _zip_url, _retries, _zip_filename):
+        """
+        Returns the location of the zip file
+        """
+        buf_size = 2 * 16 * 16 * 1024
+        save_path = pathlib.Path(self.config['paths']['tmp_dir']).joinpath(_zip_filename)
+
+        h = {'Content-Type': 'application/zip', 'User-agent': utils.DEFAULT_USER_AGENT}
+        req = urllib.request.Request(_zip_url, headers=h)
+        with urllib.request.urlopen(req) as resp:
+            with open(save_path, 'wb') as out_file:
+                while True:
+                    chunk = resp.read(buf_size)
+                    if not chunk:
+                        break
+                    out_file.write(chunk)
+        return save_path
diff --git a/lib/plugins/plugin_manager/plugins_form_html.py b/lib/plugins/plugin_manager/plugins_form_html.py
new file mode 100644
index 0000000..dbb749b
--- /dev/null
+++ b/lib/plugins/plugin_manager/plugins_form_html.py
@@ -0,0 +1,467 @@
+"""
+MIT License
+
+Copyright (C) 2023 ROCKY4546
+https://github.com/rocky4546
+
+This file is part of Cabernet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+"""
+
+import logging
+
+import lib.common.utils as utils
+import lib.common.exceptions as exceptions
+
+from lib.common.decorators import getrequest
+from lib.common.decorators import postrequest
+from lib.web.pages.templates import web_templates
+from lib.db.db_plugins import DBPlugins
+from lib.plugins.plugin_manager.plugin_manager import PluginManager
+
+@getrequest.route('/api/pluginsform')
+def get_plugins_form_html(_webserver, _namespace=None, _sort_col=None, _sort_dir=None, filter_dict=None):
+    plugins_form = PluginsFormHTML(_webserver.config)
+
+    _area = _webserver.query_data.get('area')
+    _plugin = _webserver.query_data.get('plugin')
+    _repo = _webserver.query_data.get('repo')
+    
+    if _area is None and _plugin is None and _repo is None:
+        _webserver.do_mime_response(
+            404, 'text/html', web_templates['htmlError']
+            .format('404 - Badly formed request'))
+    elif _area:
+            try:
+                form = plugins_form.get(_area)
+                _webserver.do_mime_response(200, 'text/html', form)
+            except exceptions.CabernetException as ex:
+                _webserver.do_mime_response(
+                    404, 'text/html', web_templates['htmlError']
+                    .format('404 - Badly formed area request'))
+    elif _plugin and _repo:
+        try:
+            form = plugins_form.get_plugin(_repo, _plugin)
+            _webserver.do_mime_response(200, 'text/html', form)
+        except exceptions.CabernetException as ex:
+            _webserver.do_mime_response(
+                404, 'text/html', web_templates['htmlError']
+                .format('404 - Badly formed plugin request'))
+    else:
+        # case where plugin and repo are not provided together
+        _webserver.do_mime_response(
+            404, 'text/html', web_templates['htmlError']
+            .format('404 - Badly formed plugin/repo request'))
+
+
+@postrequest.route('/api/pluginsform')
+def post_plugins_html(_webserver):
+    action = _webserver.query_data.get('action')
+    pluginid = _webserver.query_data.get('pluginId')
+    repoid = _webserver.query_data.get('repoId')
+    if action and pluginid and repoid:
+        action = action[0]
+        pluginid = pluginid[0]
+        repoid = repoid[0]
+        if action == "deletePlugin":
+            pm = PluginManager(_webserver.plugins)
+            results = pm.delete_plugin(repoid, pluginid, _webserver.sched_queue)
+            _webserver.do_mime_response(200, 'text/html', 'STATUS: Deleting plugin: {}:{}<br> '.format(repoid, pluginid) + str(results))
+        if action == "addInstance":
+            pm = PluginManager(_webserver.plugins)
+            results = pm.add_instance(repoid, pluginid, _webserver.sched_queue)
+            _webserver.do_mime_response(200, 'text/html', 'STATUS: Adding Instance plugin: {}:{}<br> '.format(repoid, pluginid) + str(results))
+        elif action == "installPlugin":
+            pm = PluginManager(_webserver.plugins)
+            results = pm.install_plugin(repoid, pluginid, _webserver.sched_queue)
+            _webserver.do_mime_response(200, 'text/html', 'STATUS: Installing plugin: {}:{}<br> '.format(repoid, pluginid) + str(results))
+        elif action == "upgradePlugin":
+            pm = PluginManager(_webserver.plugins)
+            results = pm.upgrade_plugin(repoid, pluginid, _webserver.sched_queue)
+            _webserver.do_mime_response(200, 'text/html', 'STATUS: Installing plugin: {}:{}<br> '.format(repoid, pluginid) + str(results))
+        else:
+            _webserver.do_mime_response(200, 'text/html', "doing something else"+str(action[0]))
+    else:
+        _webserver.do_mime_response(
+            404, 'text/html', web_templates['htmlError']
+            .format('404 - Badly formed request'))
+
+
+class PluginsFormHTML:
+
+    def __init__(self, _config):
+        self.logger = logging.getLogger(__name__)
+        self.config = _config
+        self.plugin_db = DBPlugins(self.config)
+        self.active_tab_name = None
+        self.num_of_plugins = 0
+        self.plugin_data = None
+        self.area = None
+
+    def get(self, _area):
+        self.area = _area
+        return ''.join([self.header, self.body])
+
+    def get_plugin(self, _repo_id, _plugin_id):
+        plugin_defn = self.plugin_db.get_plugins(
+                _installed=None,
+                _repo_id=_repo_id,
+                _plugin_id=_plugin_id)
+        if not plugin_defn:
+            self.logger.warning(
+                'HTTP request: Unknown plugin: {}'
+                .format(_plugin_id))
+            raise exceptions.CabernetException(
+                'Unknown Plugin: {}'
+                .format(_plugin_id))
+        plugin_defn = plugin_defn[0]
+        return ''.join([self.get_plugin_header(plugin_defn), self.get_menu_section(plugin_defn), self.get_plugin_section(plugin_defn)])
+
+    def get_menu_top_section(self, _plugin_defn):
+        return ''.join([
+            '<ul class="menuList">',
+            '<li class="menuItem" style="display: flex;">',
+            '<div style="position: relative; padding-left: 0.5em;">',
+            '<img class="icon-size" src="/api/manifest?plugin=',
+                _plugin_defn['name'], '&key=icon" alt="',
+                _plugin_defn['name'],'">',
+            '</div>',
+            '<div style="position: relative; padding: 0.5em;display: flex; flex-direction: column; justify-content: center;">',
+            _plugin_defn['name'],
+            '</div>',
+
+            '</li>',
+            '</ul>'
+            ])
+
+    def get_menu_items(self, _plugin_defn):
+        if not _plugin_defn['external']:
+            menu_list=''
+        elif _plugin_defn['version']['installed']:
+            # delete and possible upgrade...
+            menu_list = ''
+            if _plugin_defn['version']['latest'] != _plugin_defn['version']['current']:
+                menu_list = ''.join([
+                    '<li class="menuItem">',
+                    '<button type="submit" name="action" value="upgradePlugin" class="menuButton" ',
+                    'title="Download and install latest version of plugin. Restart required">',
+                    '<i class="md-icon" style="padding-right: 5px; font-size: 1.7em;">upgrade</i>',
+                    'Upgrade Plugin',
+                    '</button>',
+                    '</li>'
+                    ])
+            menu_list += ''.join([
+                '<li class="menuItem">',
+                '<button type="submit" name="action" value="deletePlugin" class="menuButton" ',
+                'title="Deletes the plugin folder and scheduled events">',
+                '<i class="md-icon" style="padding-right: 5px; font-size: 1.7em;">delete</i>',
+                'Delete Plugin',
+                '</button>',
+                '</li>'
+                ])
+        else:
+            # install
+            menu_list = ''.join([
+            '<li class="menuItem">',
+            '<button type="submit" name="action" value="installPlugin" class="menuButton" ',
+            'title="Download and install latest version of plugin, updates handler and schedule events">',
+            '<i class="md-icon" style="padding-right: 5px; font-size: 1.7em;">download</i>',
+            'Install Plugin',
+            '</button>',
+            '</li>'
+            ])
+        return menu_list
+
+    def get_menu_section(self, _plugin_defn):
+        pluginid = _plugin_defn['id']
+        repoid = _plugin_defn['repoid']
+
+        return ''.join([
+            '<div id="menuActionStatus"></div>',
+            '<form action="/api/pluginsform" method="post">'
+            '<input type="hidden" name="action" value="">',
+            '<input type="hidden" name="pluginId" value="',
+            pluginid, '">',
+            '<input type="hidden" name="repoId" value="',
+            repoid, '">',
+            '<div id="pluginActions" class="menuCanvas listItemHide">',
+            '<div class="menuPanel">',
+            self.get_menu_top_section(_plugin_defn),
+            '<ul class="menuList">',
+            self.get_menu_items(_plugin_defn),
+            '</ul>',
+            '</div>',
+            '</div></form>'])
+
+    def get_plugin_header(self, _plugin_defn):
+        instances = self.plugin_db.get_instances(_namespace=_plugin_defn['name'])
+        if instances:
+            # array of instance names
+            instances = instances[_plugin_defn['name']]
+        else:
+            instances = None
+        
+        if not _plugin_defn['version'].get('latest'):
+            _plugin_defn['version']['latest'] = None
+
+        html = ''.join([
+            '<div><div style="display: flex;"><div class="pluginIcon">',
+            '<a href="#" onclick=\'display_plugins()\'>',
+            '<div ><i class="md-icon">arrow_back</i></div></a></div>',
+            '<div class="pluginSectionName">',
+            str(_plugin_defn['name']), '</div></div>',
+
+            '<div>', str(_plugin_defn['summary']), '</div>',
+
+            '<div style="position: relative; padding-left: 0.5em;">',
+            '<img class="image-size" src="/api/manifest?plugin=',
+                _plugin_defn['name'], '&key=icon" alt="',
+                _plugin_defn['name'],'">',
+            '</div>',
+
+            '<div>',
+            str(_plugin_defn['description']),
+            '</div>',
+            '<div style="background: var(--docked-drawer-background);">'
+        ])
+        return html
+    
+    def get_plugin_section(self, _plugin_defn):
+        pluginid = _plugin_defn['id']
+        repoid = _plugin_defn['repoid']
+        instances = self.plugin_db.get_instances(_namespace=_plugin_defn['name'])
+        if instances:
+            # array of instance names
+            instances = instances[_plugin_defn['name']]
+        else:
+            instances = None
+        
+        if not _plugin_defn['version'].get('latest'):
+            _plugin_defn['version']['latest'] = None
+
+        latest_version = _plugin_defn['version']['latest']
+        upgrade_available = ''
+        if latest_version != _plugin_defn['version']['current'] and _plugin_defn['external']:
+            upgrade_available = ''.join([
+            
+                '<form action="/api/pluginsform" method="post">'
+                '<input type="hidden" name="action" value="">',
+                '<input type="hidden" name="pluginId" value="',
+                pluginid, '">',
+                '<input type="hidden" name="repoId" value="',
+                repoid, '">',
+                '<button class="menuIconButton" type="submit" name="action" value="upgradePlugin" style="margin-left:10px;">Upgrade to {}</button>' \
+                .format(latest_version),
+                '</form>'
+                ])
+
+        if _plugin_defn['version']['installed']:
+            version_installed_div = ''.join([
+                '<div class="pluginSection">',
+                '<div class="pluginSectionName">Version Installed: </div>',
+                '<div style="float:left; margin-top:3px;" class="pluginValue">',
+                str(_plugin_defn['version']['current']), '</div>',
+                upgrade_available,
+                '</div>',
+                ])
+        else:
+            version_installed_div = ''
+
+        if _plugin_defn.get('changelog'):
+            changelog_div = ''.join([
+                '<div class="pluginSection">',
+                '<div class="pluginSectionName">Change Log: </div>',
+                '<div style="float:left; margin-top:3px;" class="pluginValue">',
+                '<code>',
+                str(_plugin_defn['changelog']), '</code></div>',
+                '</div>',
+                ])
+        else:
+            changelog_div = ''
+            
+
+        html = ''.join([
+            '<button class="menuIconButton menuSection" type="button" onclick="show_menu(this, \'pluginActions\');">',
+            '<i class="md-icon" STYLE="font-size: 1.5em;">menu</i>',
+            '</button>',
+            version_installed_div,
+            '<div class="pluginSection">',
+            '<div class="pluginSectionName">Latest Version: </div>',
+            '<div class="pluginValue">',
+            str(_plugin_defn['version']['latest']),
+            '</div>',
+            '</div>',
+
+            changelog_div,
+
+            '<div class="pluginSection">',
+            '<div class="pluginSectionName">Dependencies: </div>',
+            '<div class="pluginValue">',
+            str(_plugin_defn['dependencies']), 
+            '</div>',
+            '</div>',
+
+            '<div class="pluginSection">',
+            '<div class="pluginSectionName">Source: </div>',
+            '<div class="pluginValue">',
+            str(_plugin_defn['source']),
+            '</div>',
+            '</div>',
+
+            '<div class="pluginSection">',
+            '<div class="pluginSectionName">License: </div>',
+            '<div class="pluginValue">',
+            str(_plugin_defn['license']),
+            '</div>',
+            '</div>',
+
+            '<div class="pluginSection">',
+            '<div class="pluginSectionName">Author: </div>',
+            '<div class="pluginValue">',
+            str(_plugin_defn['provider-name']),
+            '</div>',
+            '</div>',
+
+            '<div class="pluginSection">',
+            '<div class="pluginSectionName">Origin: </div>',
+            '<div class="pluginValue">',
+            'Cabernet Plugin Repository',
+            '</div>',
+            '</div>',
+
+            '<div class="pluginSection">',
+            '<div class="pluginSectionName">Category: </div>',
+            '<div class="pluginValue">',
+            str(_plugin_defn['category']),
+            '</div>',
+            '</div>',
+
+            '<div class="pluginSection">',
+            '<div class="pluginSectionName">Related Website: </div>',
+            '<div class="pluginValue">',
+            str(_plugin_defn['website']),
+            '</div>',
+            '</div>',
+
+            '<div class="pluginSection">',
+            '<div class="pluginSectionName">Instances: </div>',
+            '<div class="pluginValue">',
+            str(instances),
+            '</div>',
+            '</div>',
+
+            '</div>',
+            '</div>'
+        ])
+        return html
+
+    def form_plugins(self, _is_installed):
+        plugin_defns = self.plugin_db.get_plugins(
+            _is_installed, None, None)
+
+        if not plugin_defns:
+            if self.area == 'My_Plugins':
+                return ''.join([
+                    'No plugins are installed.  Go to Catalog and select a plugin to install.'
+                    ])
+            elif self.area == 'Catalog':
+                return ''.join([
+                    'All available plugins are installed'
+                    ])
+
+        plugins_list = ''
+        for plugin_defn in sorted(plugin_defns, key=lambda p: p['id']):
+            repo_id = plugin_defn['repoid']
+            plugin_id = plugin_defn['id']
+            plugin_name = plugin_defn['name']
+
+            img_size = self.lookup_config_size()
+
+            latest_version = plugin_defn['version']['latest']
+            upgrade_available = ''
+            if _is_installed and plugin_defn['external']:
+                if latest_version != plugin_defn['version']['current']:
+                    upgrade_available = '<div class="bottom-left">Upgrade to {}</div>' \
+                        .format(latest_version)
+                current_version = plugin_defn['version']['current']
+            elif not _is_installed:
+                current_version = plugin_defn['version']['latest']
+            else:
+                current_version = 'Internal'
+
+            plugins_list += ''.join([
+                '<button class="plugin_item" type="button"',
+                ' onclick=\'load_plugin_url("/api/pluginsform?',
+                'plugin=', plugin_id, 
+                '&repo=', repo_id,
+                '")\'>',
+                '<div>',
+                '<div style="position: relative;">',
+                '<img src="/api/manifest?plugin=',
+                plugin_name, '&key=icon" width="', str(img_size), '" alt="',
+                plugin_name,'">',
+                upgrade_available,
+                
+                '</div><div>', plugin_name,
+                '</div><div class="pluginText-secondary">',
+                str(current_version), '</div></div>',
+                '</button>'
+                ])
+        return plugins_list
+
+    @property
+    def header(self):
+        return ''.join([
+            '<html><head>',
+            '</head>'
+        ])
+
+    @property
+    def form(self):
+        if self.area == 'My_Plugins':
+            forms_html = ''.join([
+                '<div class="plugin_list">',
+                self.form_plugins(True), '</div>'])
+        elif self.area == 'Catalog':
+            forms_html = ''.join([
+                'Plugins Available To Install:'
+                '<div class="plugin_list">',
+                self.form_plugins(_is_installed=False), 
+                '</div>'])
+        else:
+            self.logger.warning('HTTP request: unknown area: {}'.format(self.area))
+            raise exceptions.CabernetException('Unknown Tab: {}'.format(self.area))
+        return forms_html
+
+    @property
+    def body(self):
+        return ''.join([
+            '<body>', self.form, '</body>'])
+
+    def lookup_config_size(self):
+        size_text = self.config['channels']['thumbnail_size']
+        if size_text == 'None':
+            return 0
+        elif size_text == 'Tiny(16)':
+            return 16
+        elif size_text == 'Small(48)':
+            return 48
+        elif size_text == 'Medium(128)':
+            return 128
+        elif size_text == 'Large(180)':
+            return 180
+        elif size_text == 'X-Large(270)':
+            return 270
+        elif size_text == 'Full-Size':
+            return None
+        else:
+            return None
+
diff --git a/lib/plugins/plugin_manager/plugins_html.py b/lib/plugins/plugin_manager/plugins_html.py
new file mode 100644
index 0000000..81d862e
--- /dev/null
+++ b/lib/plugins/plugin_manager/plugins_html.py
@@ -0,0 +1,110 @@
+"""
+MIT License
+
+Copyright (C) 2023 ROCKY4546
+https://github.com/rocky4546
+
+This file is part of Cabernet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the “Software”), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+"""
+
+from lib.common.decorators import getrequest
+
+
+@getrequest.route('/api/plugins')
+def get_plugins_html(_webserver):
+    plugins_html = PluginsHTML()
+    html = plugins_html.get()
+    _webserver.do_mime_response(200, 'text/html', html)
+
+
+class PluginsHTML:
+
+    def __init__(self):
+        self.config = None
+        self.active_tab_name = None
+        self.tab_names = None
+
+    def get(self):
+        self.tab_names = self.get_tabs()
+        return ''.join([self.header, self.body])
+
+    @property
+    def header(self):
+        return ''.join([
+            '<!DOCTYPE html><html><head>',
+            '<meta charset="utf-8"/><meta name="author" content="rocky4546">',
+            '<meta name="description" content="Cabernet Plugins">',
+            '<title>Plugins</title>',
+            '<meta name="viewport" content="width=device-width, ',
+            'minimum-scale=1.0, maximum-scale=1.0">',
+            '<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>',
+            '<link rel="stylesheet" type="text/css" href="/modules/tabs/tabs.css">',
+            '<link rel="stylesheet" type="text/css" href="/modules/pluginmgr/pluginmgrform.css">',
+            '<script src="/modules/tabs/tabs.js"></script>',
+            '<script src="/modules/pluginmgr/pluginmgr.js"></script></head>',
+            '<script src="/modules/pluginmgr/pluginmgrform.js"></script>'
+            '<script src="/modules/listview/menu.js"></script>'
+        ])
+
+    @property
+    def title(self):
+        return ''.join([
+            '<div class="container">',
+            '<h2>Plugins</h2>'
+        ])
+
+    @property
+    def tabs(self):
+        activeTab = 'activeTab'
+        tabs_html = ''.join([
+            '<ul class="tabs">'])
+        for name, icon in self.tab_names.items():
+            key = name.replace(' ', '_')
+            tabs_html = ''.join([
+                tabs_html,
+                '<li><a id="tab', name, '" class="form',
+                name, ' configTab ',
+                activeTab,
+                '" href="#" onclick=\'load_form_url("/api/pluginsform?area=',
+                key, '")\'>',
+                '<i class="md-icon tabIcon">',
+                icon,
+                '</i>',
+                name, '</a></li>'
+            ])
+            activeTab = ''
+            self.active_tab_name = name
+        tabs_html = ''.join([tabs_html, '</ul>'])
+        return tabs_html
+
+    @property
+    def body(self):
+        return ''.join([
+            '<body>',
+            self.title,
+            self.tabs,
+            '<div id="pluginscontent" class="pluginShow">',
+            '<script>load_form_url("/api/pluginsform?area=My_Plugins")</script></div>',
+            self.plugin_page
+        ])
+
+    @property
+    def plugin_page(self):
+        return ''.join([
+            '<div id="plugincontent" class="pluginHide"></div>'
+        ])
+
+
+
+    def get_tabs(self):
+        return {'My Plugins': 'extension', 'Catalog': 'add_shopping_cart'}
+
diff --git a/lib/plugins/plugin_obj.py b/lib/plugins/plugin_obj.py
index 5be238b..1c32deb 100644
--- a/lib/plugins/plugin_obj.py
+++ b/lib/plugins/plugin_obj.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -19,6 +19,7 @@
 import base64
 import binascii
 import datetime
+import httpx
 import logging
 import string
 import threading
@@ -34,6 +35,8 @@ class PluginObj:
     def __init__(self, _plugin):
         self.logger = logging.getLogger(__name__)
         self.plugin = _plugin
+        self.plugins = None
+        self.http_session = PluginObj.HttpSession()
         self.config_obj = _plugin.config_obj
         self.namespace = _plugin.namespace
         self.def_trans = ''.join([
@@ -41,21 +44,41 @@ def __init__(self, _plugin):
             string.ascii_lowercase,
             string.digits,
             '+/'
-            ]).encode()
+        ]).encode()
         self.instances = {}
         self.scheduler_db = DBScheduler(self.config_obj.data)
         self.scheduler_tasks()
         self.enabled = True
         self.logger.debug('Initializing plugin {}'.format(self.namespace))
 
+    def terminate(self):
+        """
+        Removes all has a object from the object and calls any subclasses to also terminate
+        Not calling inherited class at this time
+        """
+        self.enabled = False
+        for key, instance in self.instances.items():
+            return instance.terminate()
+        self.logger = None
+        self.plugin = None
+        self.plugins = None
+        self.http_session = None
+        self.config_obj = None
+        self.namespace = None
+        self.def_trans = None
+        self.instances = None
+        self.scheduler_db = None
+
+    
+
     # INTERFACE METHODS
     # Plugin may have the following methods
     # used to interface to the app.
 
     ##############################
-    ### EXTERNAL STREAM METHODS
+    # ## EXTERNAL STREAM METHODS
     ##############################
-    
+
     def is_time_to_refresh_ext(self, _last_refresh, _instance):
         """
         External request to determine if the m3u8 stream uri needs to 
@@ -74,7 +97,7 @@ def get_channel_uri_ext(self, _sid, _instance=None):
         return self.instances[_instance].get_channel_uri(_sid)
 
     ##############################
-    ### EXTERNAL EPG METHODS
+    # ## EXTERNAL EPG METHODS
     ##############################
 
     def get_channel_day_ext(self, _zone, _uid, _day, _instance='default'):
@@ -104,59 +127,80 @@ def get_channel_list_ext(self, _zone_id, _ch_ids=None, _instance='default'):
 
     # END OF INTERFACE METHODS
 
-
     def scheduler_tasks(self):
         """
         dummy routine that will be overridden by subclass
         """
         pass
 
-    def enable_instance(self, _namespace, _instance):
+    def enable_instance(self, _namespace, _instance, _instance_name='Instance'):
         """
         When one plugin is tied to another and requires it to be enabled,
         this method will enable the other instance and set this plugin to disabled until 
         everything is up
+        Also used to create a new instance if missing.  When _instance is None, 
+        will look for any instance, if not will create a default one.
         """
         name_config = _namespace.lower()
-        instance_config = name_config + '_' + _instance
+        # if _instance is None and config has no instance for namespace, add one
+        if _instance is None:
+            x = [ k for k in self.config_obj.data.keys() if k.startswith(name_config+'_')]
+            if len(x):
+                return
+            else:
+                _instance = 'Default'
+        instance_config = name_config + '_' + _instance.lower()
+        
         if self.config_obj.data.get(name_config):
             if self.config_obj.data.get(instance_config):
                 if not self.config_obj.data[instance_config]['enabled']:
-                    self.logger.notice('1. Enabling {}:{} plugin instance. Required by {}. Restart Required'
-                        .format(_namespace, _instance, self.namespace))
+                    self.logger.warning('1. Enabling {}:{} plugin instance. Required by {}. Restart Required'
+                                       .format(_namespace, _instance, self.namespace))
                     self.config_obj.write(
-                            instance_config, 'enabled', True)
+                        instance_config, 'enabled', True)
                     raise exceptions.CabernetException('{} plugin requested by {}.  Restart Required'
-                        .format(_namespace, self.namespace))
+                                                       .format(_namespace, self.namespace))
             else:
-                self.logger.notice('2. Enabling {}:{} plugin instance. Required by {}. Restart Required'
-                        .format(_namespace, _instance, self.namespace))
+                if _namespace != self.namespace:
+                    self.logger.warning('2. Enabling {}:{} plugin instance. Required by {}. Restart Required'
+                                       .format(_namespace, _instance, self.namespace))
+                else:
+                    self.logger.warning('3. Enabling {}:{} plugin instance. Restart Required'
+                                       .format(_namespace, _instance, self.namespace))
+                
                 self.config_obj.write(
-                        instance_config, 'Label', _namespace + ' Instance')
+                    instance_config, 'Label', _namespace + ' ' + _instance_name)
                 self.config_obj.write(
-                        instance_config, 'enabled', True)
+                    instance_config, 'enabled', True)
                 raise exceptions.CabernetException('{} plugin requested by {}.  Restart Required'
-                    .format(_namespace, self.namespace))
+                                                   .format(_namespace, self.namespace))
         else:
             self.logger.error('Requested Plugin {} by {} Missing'
-                .format(_namespace, self.namespace))
+                              .format(_namespace, self.namespace))
             raise exceptions.CabernetException('Requested Plugin {} by {} Missing'
-                .format(_namespace, self.namespace))
+                                               .format(_namespace, self.namespace))
+        if _namespace not in self.plugins.keys():
+            self.logger.warning('{}:{} not installed and requested by {} settings. Restart Required'
+                               .format(_namespace, _instance, self.namespace))
+            raise exceptions.CabernetException('{}:{} not enabled and requested by {} settings. Restart Required'
+                                               .format(_namespace, _instance, self.namespace))
+
         if not self.plugins[_namespace].enabled:
-            self.logger.notice('{}:{} not enabled and requested by {}. Restart Required'
-                .format(_namespace, _instance, self.namespace))
-            raise exceptions.CabernetException('{}:{} not enabled and requested by {}. Restart Required'
-                .format(_namespace, _instance, self.namespace))
+            self.logger.warning('{}:{} not enabled and requested by {} settings. Restart Required'
+                               .format(_namespace, _instance, self.namespace))
+            raise exceptions.CabernetException('{}:{} not enabled and requested by {} settings. Restart Required'
+                                               .format(_namespace, _instance, self.namespace))
 
     def refresh_obj(self, _topic, _task_name):
         if not self.enabled:
-            self.logger.debug('{} Plugin disabled, not refreshing {}' \
+            self.logger.debug(
+                '{} Plugin disabled, not refreshing {}'
                 .format(self.plugin.name, _topic))
             return
-        self.web_admin_url = 'http://localhost:' + \
-            str(self.config_obj.data['web']['web_admin_port'])
+        web_admin_url = 'http://localhost:' + \
+                        str(self.config_obj.data['web']['web_admin_port'])
         task = self.scheduler_db.get_tasks(_topic, _task_name)[0]
-        url = ( self.web_admin_url + '/api/scheduler?action=runtask&taskid={}'
+        url = (web_admin_url + '/api/scheduler?action=runtask&taskid={}'
                .format(task['taskid']))
         req = urllib.request.Request(url)
         with urllib.request.urlopen(req) as resp:
@@ -177,7 +221,6 @@ def refresh_channels(self, _instance=None):
         Called from the scheduler
         """
         return self.refresh_it('Channels', _instance)
-        
 
     def refresh_epg(self, _instance=None):
         """
@@ -191,20 +234,22 @@ def refresh_it(self, _what_to_refresh, _instance=None):
         """
         try:
             if not self.enabled:
-                self.logger.debug('{} Plugin disabled, not refreshing {}' \
+                self.logger.debug(
+                    '{} Plugin disabled, not refreshing {}'
                     .format(self.plugin.name, _what_to_refresh))
                 return False
             if _instance is None:
                 for key, instance in self.instances.items():
                     if _what_to_refresh == 'EPG':
-                        return instance.refresh_epg()
+                        instance.refresh_epg()
                     elif _what_to_refresh == 'Channels':
-                        return instance.refresh_channels()
+                        instance.refresh_channels()
             else:
                 if _what_to_refresh == 'EPG':
-                    return self.instances[_instance].refresh_epg()
+                    self.instances[_instance].refresh_epg()
                 elif _what_to_refresh == 'Channels':
-                    return self.instances[_instance].refresh_channels()
+                    self.instances[_instance].refresh_channels()
+            return True
         except exceptions.CabernetException:
             self.logger.debug('Setting plugin {} to disabled'.format(self.plugin.name))
             self.enabled = False
@@ -216,7 +261,7 @@ def utc_to_local_time(self, _hours):
         Used for scheduler on events
         """
         tz_delta = datetime.datetime.now() - datetime.datetime.utcnow()
-        tz_hours = round(tz_delta.total_seconds()/3610)
+        tz_hours = round(tz_delta.total_seconds() / 3610)
         local_hours = tz_hours + _hours
         if local_hours < 0:
             local_hours += 24
@@ -229,25 +274,24 @@ def compress(self, _data):
             _data = _data.encode()
         return base64.b64encode(_data).translate(
             _data.maketrans(self.def_trans,
-            self.config_obj.data['main']['plugin_data'].encode()))
+                            self.config_obj.data['main']['plugin_data'].encode()))
 
     def uncompress(self, _data):
         if type(_data) is str:
             _data = _data.encode()
-        a = self.config_obj.data['main']['plugin_data'].encode()
+        self.config_obj.data['main']['plugin_data'].encode()
         try:
             return base64.b64decode(_data.translate(_data.maketrans(
                 self.config_obj.data['main']['plugin_data']
                 .encode(), self.def_trans))) \
                 .decode()
-        except (binascii.Error, UnicodeDecodeError) as ex:
-            self.logger.error('Uncompression Error, invalid string {}' \
-                .format(_data))
+        except (binascii.Error, UnicodeDecodeError):
+            self.logger.error('Uncompression Error, invalid string {}'.format(_data))
             return None
 
     def check_logger_refresh(self):
         if not self.logger.isEnabledFor(40):
-            self.logger = logging.getLogger(__name__+str(threading.get_ident()))
+            self.logger = logging.getLogger(__name__ + str(threading.get_ident()))
             for inst, inst_obj in self.instances.items():
                 inst_obj.check_logger_refresh()
 
@@ -255,3 +299,21 @@ def check_logger_refresh(self):
     def name(self):
         return self.namespace
 
+    class HttpSession:
+        """
+        This class handles the management of the httpx session since
+        pickling of the httpx Client throws an exception.
+        """
+        def __init__(self):
+            self.http_session = None
+
+        def get(self, uri, headers=None, timeout=8):
+            if self.http_session is None:
+                self.http_session = httpx.Client(http2=True, verify=False, follow_redirects=True)
+            return self.http_session.get(uri, headers=headers, timeout=timeout)
+
+        def post(self, uri, headers=None, data=None, timeout=8):
+            if self.http_session is None:
+                self.http_session = httpx.Client(http2=True, verify=False, follow_redirects=True)
+            return self.http_session.post(uri, headers=headers, data=data, timeout=timeout)
+
diff --git a/lib/plugins/plugin_programs.py b/lib/plugins/plugin_programs.py
old mode 100755
new mode 100644
index b27cb23..4d607e7
--- a/lib/plugins/plugin_programs.py
+++ b/lib/plugins/plugin_programs.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -16,19 +16,15 @@
 substantial portions of the Software.
 """
 
-import datetime
 import json
 import logging
 import threading
-import urllib.request
 
 import lib.common.utils as utils
-from lib.db.db_epg import DBepg
 from lib.common.decorators import handle_url_except
 from lib.common.decorators import handle_json_except
 
 
-
 class PluginPrograms:
 
     def __init__(self, _instance_obj):
@@ -45,22 +41,30 @@ def get_program_info(self, _prog_id):
         """
         pass
 
-    @handle_url_except(timeout=10.0)
+    def terminate(self):
+        """
+        Removes all has a object from the object and calls any subclasses to also terminate
+        Not calling inherited class at this time
+        """
+        self.logger = None
+        self.instance_obj = None
+        self.config_obj = None
+        self.instance_key = None
+        self.plugin_obj = None
+        self.config_section = None
+
+    @handle_url_except()
     @handle_json_except
-    def get_uri_data(self, _uri, _header=None):
+    def get_uri_data(self, _uri, _retries, _header=None):
         if _header is None:
             header = {'User-agent': utils.DEFAULT_USER_AGENT}
         else:
             header = _header
-        req = urllib.request.Request(_uri, headers=header)
-        with urllib.request.urlopen(req, timeout=10.0) as resp:
-            x = json.load(resp)
+        resp = self.plugin_obj.http_session.get(_uri, headers=header, timeout=8)
+        x = resp.json()
+        resp.raise_for_status()
         return x
 
-
-
-
-
     def check_logger_refresh(self):
         if not self.logger.isEnabledFor(40):
-            self.logger = logging.getLogger(__name__+str(threading.get_ident()))
+            self.logger = logging.getLogger(__name__ + str(threading.get_ident()))
diff --git a/lib/plugins/repo_handler.py b/lib/plugins/repo_handler.py
new file mode 100644
index 0000000..9539838
--- /dev/null
+++ b/lib/plugins/repo_handler.py
@@ -0,0 +1,175 @@
+"""
+MIT License
+
+Copyright (C) 2023 ROCKY4546
+https://github.com/rocky4546
+
+This file is part of Cabernet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+"""
+
+import httpx
+import logging
+import json
+import importlib
+import importlib.resources
+import os
+import pathlib
+import urllib
+
+import lib.common.exceptions as exceptions
+import lib.common.utils as utils
+from lib.db.db_plugins import DBPlugins
+from lib.common.decorators import handle_url_except
+from lib.common.decorators import handle_json_except
+
+
+class RepoHandler:
+
+    http_session = httpx.Client(http2=True, verify=False, follow_redirects=True)
+    logger = None
+
+    def __init__(self, _config_obj):
+        self.config_obj = _config_obj
+        if RepoHandler.logger is None:
+            RepoHandler.logger = logging.getLogger(__name__)
+        self.plugin_db = DBPlugins(_config_obj.data)
+
+
+
+    def load_cabernet_repo(self):
+        """
+        Loads the manifest which points to the plugin.json list of plugins
+        Will update the database on the manifest and plugin list
+        If there is a plugin that is no longer in the list, will tag for
+        deletion. (don't know at this point if it is installed.)
+        """
+        repo_settings = self.import_cabernet_manifest()
+        self.save_repo(repo_settings)
+        self.update_plugins(repo_settings)
+
+    def import_cabernet_manifest(self):
+        """
+        Loads the manifest for cabernet repo
+        """
+        json_settings = importlib.resources.read_text(self.config_obj.data['paths']['resources_pkg'], utils.CABERNET_REPO)
+        settings = json.loads(json_settings)
+        if settings:
+            settings = settings['plugin']
+            settings['repo_url'] = utils.CABERNET_REPO
+            self.plugin_db.get_repos(utils.CABERNET_ID)
+        return settings
+
+    def save_repo(self, _repo):
+        """
+        Saves to DB the repo json settings
+        """
+        self.plugin_db.save_repo(_repo)
+
+
+    def cache_thumbnails(self, _plugin_defn):
+        """
+        Determine if the cache area has the thumbnail, if not
+        will download and store the thumbnail
+        """
+        # path = thumbnail cache path + plugin_id + icon or fanart path
+        thumbnail_path = self.config_obj.data['paths']['thumbnails_dir']
+        plugin_id = _plugin_defn['id']
+        icon_path = _plugin_defn['icon']
+        fanart_path = _plugin_defn['fanart']
+        
+        repoid = _plugin_defn['repoid']
+        repo_defn = self.plugin_db.get_repos(repoid)
+        if not repo_defn:
+            self.logger.notice('Repo not defined for plugin {}, unable to cache thumbnails'
+                .format(plugin_id))
+            return
+        datadir = repo_defn[0]['dir']['datadir']['url']
+        self.cache_thumbnail(datadir, plugin_id, icon_path, thumbnail_path)
+        self.cache_thumbnail(datadir, plugin_id, fanart_path, thumbnail_path)
+
+    def cache_thumbnail(self, _datadir, _plugin_id, _image_relpath, _thumbnail_path):
+        """
+        _datadir: datadir url from the repo definition
+        _plugin_id: plugin id which is also the folder name
+        _image_repath: relative path found in the plugin definition
+        _thumbnail_path: config setting to the thumbnail path area
+        """
+        full_repo = '/'.join([
+            _datadir, _plugin_id, _image_relpath])
+        full_cache = pathlib.Path(
+            _thumbnail_path, _plugin_id, _image_relpath)
+        if not full_cache.exists():
+            image = self.get_uri_data(full_repo, 2)
+            self.save_file(image, full_cache)
+
+    def update_plugins(self, _repo_settings):
+        """
+        Gets the list of plugins for this repo from [dir][info] and updates the db
+        """
+        uri = _repo_settings['dir']['info']
+        plugin_json = self.get_uri_json_data(uri)
+        if plugin_json:
+            plugin_json = plugin_json['plugins']
+            for plugin in plugin_json:
+                plugin = plugin['plugin']
+                if 'repository' in plugin['category']:
+                    continue
+                # pull the db item. merge them and then update the db with new data.
+                plugin_data = self.plugin_db.get_plugins(_installed=None, _repo_id=_repo_settings['id'], _plugin_id=plugin['id'])
+                if plugin_data:
+                    plugin_data = plugin_data[0]
+                    plugin['repoid'] = _repo_settings['id']
+                    plugin['version']['installed'] = plugin_data['version']['installed']
+                    plugin['version']['latest'] = plugin['version']['current']
+                    plugin['version']['current'] = plugin_data['version']['current']
+                    plugin['changelog'] = plugin.get('changelog')
+                    if plugin_data.get('external'):
+                        plugin['external'] = plugin_data['external']
+                    else:
+                        plugin['external'] = True
+                else:
+                    plugin['repoid'] = _repo_settings['id']
+                    plugin['version']['installed'] = False
+                    plugin['version']['latest'] = plugin['version']['current']
+                    plugin['version']['current'] = None
+                    plugin['external'] = True
+                self.cache_thumbnails(plugin)
+                self.plugin_db.save_plugin(plugin)
+
+    @handle_url_except()
+    def get_uri_data(self, _uri, _retries):
+        header = {
+            'User-agent': utils.DEFAULT_USER_AGENT}
+        resp = RepoHandler.http_session.get(_uri, headers=header, timeout=8)
+        x = resp.content
+        resp.raise_for_status()
+        return x
+
+    @handle_url_except()
+    @handle_json_except
+    def get_uri_json_data(self, _uri):
+        header = {
+            'Content-Type': 'application/json',
+            'User-agent': utils.DEFAULT_USER_AGENT}
+        req = urllib.request.Request(_uri, headers=header)
+        with urllib.request.urlopen(req, timeout=10.0) as resp:
+            return json.load(resp)
+
+
+    def save_file(self, _data, _file):
+        try:
+            os.makedirs(os.path.dirname(_file), exist_ok=True)
+            
+            open(os.path.join(_file), 'wb').write(_data)
+        except Exception as e:
+            self.logger.warning("An error occurred saving %s file\n%s" % (_file, e))
+            raise
diff --git a/lib/resources/config_defn/1-base.json b/lib/resources/config_defn/1-base.json
index e73c17c..ba042e7 100644
--- a/lib/resources/config_defn/1-base.json
+++ b/lib/resources/config_defn/1-base.json
@@ -19,7 +19,7 @@
                             "2-Expert", "3-Advanced"],
                         "level": 0,
                         "onDefnLoad": "lib.config.config_callbacks.set_theme_folders",
-                        "help": "Displays settings based on complexity"
+                        "help": "Default: 1-Standard. Displays settings based on complexity"
                     },
                     "theme":{
                         "label": "Theme",
@@ -30,14 +30,14 @@
                             "light", "light-blue", "light-pink", 
                             "light-purple", "light-red", "spring", "wmc"],
                         "level": 0,
-                        "help": "Changes the way the page appears"
+                        "help": "Default: spring. Changes the way the page appears"
                     },
                     "backgrounds":{
                         "label": "Background Folder",
                         "type": "path",
                         "default": null,
                         "level": 0,
-                        "help": "Uses the images in the folder for the background"
+                        "help": "Default: None. Uses the images in the folder for the background"
                     }
                 }
             },
@@ -62,21 +62,21 @@
                         "default": "stable",
                         "values": ["stable", "unstable"],
                         "level": 1,
-                        "help": "Version upgrade quality"
+                        "help": "Default: stable. Version upgrade quality"
                     },
                     "maintenance_mode":{
                         "label": "Maintenance Mode",
                         "type": "boolean",
                         "default": false,
                         "level": 1,
-                        "help": "Used during upgrades.  When enabled, causes the patch upgrades to be re-applied on a scheduler restart"
+                        "help": "Default: false. Used during upgrades.  When enabled, causes the patch upgrades to be re-applied on a scheduler restart"
                     },
                     "memory_usage":{
                         "label": "Memory Usage",
                         "type": "boolean",
                         "default": false,
                         "level": 2,
-                        "help": "Turn on and set logging to DEBUG. This will generate a memory profile after each web request or scheduler trigger."
+                        "help": "Default: false. Turn on and set logging to DEBUG. This will generate a memory profile after each web request or scheduler trigger."
                     },
                     "ostype":{
                         "label": "OS Type",
@@ -136,7 +136,7 @@
                         "default": false,
                         "level": 1,
                         "onChange": "lib.config.config_callbacks.check_encryption",
-                        "help": "Will encrypt the password using a self-generated key.  Use with only one user running service."
+                        "help": "Default: False. Will encrypt the password using a self-generated key.  Use with only one user running service."
                     },
                     "plugin_data":{
                         "label": "plugin data",
@@ -161,7 +161,7 @@
                         "values": ["None", "Tiny(16)", "Small(48)", "Medium(128)", 
                             "Large(180)", "X-Large(270)", "Full-Size"],
                         "level": 1,
-                        "help": "The default size of the thumbnails displayed in the Channel Editor"
+                        "help": "Default: Medium(128). The default size used throughout Cabernet (Channel Editor, Plugins, Config Plugin Icons)"
                     }
                 }
             }
diff --git a/lib/resources/config_defn/2-paths.json b/lib/resources/config_defn/2-paths.json
index 8bcfb87..dd919d0 100644
--- a/lib/resources/config_defn/2-paths.json
+++ b/lib/resources/config_defn/2-paths.json
@@ -50,6 +50,15 @@
                         "onInit": "lib.config.config_callbacks.set_logs_path",
                         "help": "Location of log files when set to be used"
                     },
+                    "thumbnails_dir":{
+                        "label": "Thumbnails Cache Path",
+                        "type": "path",
+                        "default": null,
+                        "level": 1,
+                        "writable": false,
+                        "onInit": "lib.config.config_callbacks.set_thumbnails_path",
+                        "help": "Location of where cached thumbnails are stored"
+                    },
                     "tmp_dir":{
                         "label": "TEMP Path",
                         "type": "path",
@@ -113,7 +122,7 @@
                         "default": null,
                         "level": 2,
                         "onInit": "lib.config.config_callbacks.set_ffmpeg_path",
-                        "help": "Only used with stream_type=ffmpegproxy"
+                        "help": "Used with stream_type=ffmpegproxy or when PTS Filtering or PTS/DTS Resync are enabled"
                     },
                     "ffprobe_path":{
                         "label": "ffprobe_path",
@@ -121,7 +130,15 @@
                         "default": null,
                         "level": 2,
                         "onInit": "lib.config.config_callbacks.set_ffprobe_path",
-                        "help": "Only used with stream_type=ffmpegproxy"
+                        "help": "Used when PTS Filter is enabled"
+                    },
+                    "streamlink_path":{
+                        "label": "streamlink_path",
+                        "type": "path",
+                        "default": null,
+                        "level": 2,
+                        "onInit": "lib.config.config_callbacks.set_streamlink_path",
+                        "help": "Used with stream_type=streamlinkproxy"
                     }
 
                 }
diff --git a/lib/resources/config_defn/3-logs.json b/lib/resources/config_defn/3-logs.json
index 7918c4e..d15619f 100644
--- a/lib/resources/config_defn/3-logs.json
+++ b/lib/resources/config_defn/3-logs.json
@@ -17,16 +17,16 @@
                         "default": true,
                         "level": 1,
                         "onChange": "lib.config.config_callbacks.logging_enable",
-                        "help": "Used to enable logging to the system logger"
+                        "help": "Default: Enabled. Used to enable logging to the system logger"
                     },
                     "level":{
                         "label": "Level",
                         "type": "list",
-                        "values": ["DEBUG", "INFO", "NOTICE", "WARNING", "ERROR", "CRITICAL"],
+                        "values": ["TRACE", "DEBUG", "INFO", "NOTICE", "WARNING", "ERROR", "CRITICAL"],
                         "default": "WARNING",
                         "level": 1,
                         "onChange": "lib.config.config_callbacks.logging_refresh",
-                        "help": "Log level for system logs. Default is WARNING"
+                        "help": "Default: WARNING. Log level for system logs. Default is WARNING"
                     },
                     "class":{
                         "label": "class",
@@ -59,7 +59,7 @@
                 "label": "File Log Handler",
                 "sort": "2",
                 "icon": "comment",
-                "description": "Python debug log settings",
+                "description": "Python local log file at data/logs/ log settings",
                 "settings":{
                     "enabled":{
                         "label": "Enabled",
@@ -72,7 +72,7 @@
                     "level":{
                         "label": "Level",
                         "type": "list",
-                        "values": ["DEBUG", "INFO", "NOTICE", "WARNING", "ERROR", "CRITICAL"],
+                        "values": ["TRACE", "DEBUG", "INFO", "NOTICE", "WARNING", "ERROR", "CRITICAL"],
                         "default": "INFO",
                         "level": 1,
                         "onChange": "lib.config.config_callbacks.logging_refresh",
@@ -163,12 +163,12 @@
                     "level":{
                         "label": "level",
                         "type": "list",
-                        "values": ["DEBUG", "INFO", "NOTICE", "WARNING", "ERROR", "CRITICAL"],
-                        "default": "DEBUG",
+                        "values": ["TRACE", "DEBUG", "INFO", "NOTICE", "WARNING", "ERROR", "CRITICAL"],
+                        "default": "TRACE",
                         "level": 4,
                         "writable": false,
                         "onChange": "lib.config.config_callbacks.logging_refresh",
-                        "help": "Default is WARNING"
+                        "help": "Default is TRACE"
                     },
                     "handlers":{
                         "label": "handlers",
diff --git a/lib/resources/config_defn/clients.json b/lib/resources/config_defn/clients.json
index e2cb783..1a140bc 100644
--- a/lib/resources/config_defn/clients.json
+++ b/lib/resources/config_defn/clients.json
@@ -17,7 +17,7 @@
                         "default": "0.0.0.0",
                         "level": 1,
                         "onInit": "lib.config.config_callbacks.set_ip",
-                        "help": "Use instead of plex_accessible_ip. 0.0.0.0 means bind to all IPs and use the main IP address for json data"
+                        "help": "Default: 0.0.0.0. Use instead of plex_accessible_ip. 0.0.0.0 means bind to all IPs and use the main IP address for json data"
                     },
                     "plex_accessible_ip":{
                         "label": "plex_accessible_ip",
@@ -39,28 +39,28 @@
                         "type": "integer",
                         "default": 5004,
                         "level": 1,
-                        "help": "Port used to stream. Default is 5004"
+                        "help": "Default: 5004. Port used to stream. Default is 5004"
                     },
                     "web_admin_port":{
                         "label": "web_admin_port",
                         "type": "integer",
                         "default": 6077,
                         "level": 1,
-                        "help": "Port for main web-site.  TVHeadend can use any port; however, others such as Plex and Emby need it on port 80 for full HDHR compatilibity"
+                        "help": "Default: 6077. Port for main web-site.  TVHeadend can use any port; however, others such as Plex and Emby need it on port 80 for full HDHR compatilibity"
                     },
                     "disable_web_config":{
                         "label": "disable_web_config",
                         "type": "boolean",
                         "default": false,
                         "level": 3,
-                        "help": "Security setting to disable the ability to edit the configuration remotely"
+                        "help": "Default: False. Security setting to disable the ability to edit the configuration remotely"
                     },
                     "concurrent_listeners":{
                         "label": "concurrent_listeners",
                         "type": "integer",
                         "default": 8,
-                        "level": 2,
-                        "help": "GUI Webadmin site only. Number of simultaneous HTTP requests at one time. If requests are exceeded, the request will hang until a listener becomes available."
+                        "level": 3,
+                        "help": "Default: 8. GUI Webadmin site only. Number of simultaneous HTTP requests at one time. If requests are exceeded, the request will hang until a listener becomes available."
                     }
                 }
             },
@@ -75,7 +75,21 @@
                         "type": "boolean",
                         "default": true,
                         "level": 2,
-                        "help": "Identifies the service name as the channel name to client. Recommend disabling unless running a Scan in the client to reduce overhead."
+                        "help": "Default: True. Identifies the service name as the channel name to client. Recommend disabling unless running a Scan in the client to reduce overhead."
+                    },
+                    "vod_retries":{
+                        "label": "VOD Retries",
+                        "type": "integer",
+                        "default": 2,
+                        "level": 3,
+                        "help": "Default: 2. Recommend leaving this as is. On VOD (with all streaming packets provided at one time), may improve timeout errors by changing the number of retries. Minimum Total Timeout = num * 12sec/timeout * 2 retries. Only applies to internalproxy."
+                    },
+                    "switch_channel_timeout":{
+                        "label": "Switch Channel Timeout",
+                        "type": "integer",
+                        "default": 2,
+                        "level": 3,
+                        "help": "Default: 2 seconds. Clients tend to timeout streams and request a reset. This value is the time in seconds it takes to request the stop followed by re-subscribing the channel. If it is too short, Cabernet will drop the current tuner and use a new one instead of reusing the current tuner."
                     }
                 }
             },
@@ -99,35 +113,49 @@
                         "default": "tvheadend",
                         "values": ["normal", "tvheadend"],
                         "level": 1,
-                        "help": "TVHeadend uses specific genre to get colors on tv guide"
+                        "help": "Default: tvheadend. TVHeadend uses specific genre to get colors on tv guide"
                     },
                     "epg_channel_number":{
                         "label": "Channel # in Name",
                         "type": "boolean",
                         "default": false,
                         "level": 2,
-                        "help": "When true will include the channel number in the channel name for the channel list and EPG"
+                        "help": "Default: False. When true will include the channel number in the channel name for the channel list and EPG"
+                    },
+                    "epg_use_channel_number":{
+                        "label": "Use Channel # for Channel ID",
+                        "type": "boolean",
+                        "default": false,
+                        "level": 2,
+                        "help": "Default: False. For clients like Plex and JellyFin, they use the channel id field in the xmltv.xml as the channel number"
+                    },
+                    "epg_add_plugin_to_channel_id":{
+                        "label": "Add Plugin name to Channel ID",
+                        "type": "boolean",
+                        "default": false,
+                        "level": 2,
+                        "help": "Default: False. For cases where the different provider have the same UID for channels"
                     },
                     "epg_channel_icon":{
                         "label": "EPG Channel Icon",
                         "type": "boolean",
                         "default": true,
                         "level": 2,
-                        "help": "When true will include the icon for each channel inside the xmltv.xml file"
+                        "help": "Default: True. When true will include the icon for each channel inside the xmltv.xml file"
                     },
                     "epg_program_icon":{
                         "label": "EPG Program Icon",
                         "type": "boolean",
                         "default": true,
                         "level": 2,
-                        "help": "When true will include the icon for each program inside the xmltv.xml file"
+                        "help": "Default: True. When true will include the icon for each program inside the xmltv.xml file"
                     },
                     "epg_prettyprint":{
                         "label": "EPG Pretty Print",
                         "type": "boolean",
-                        "default": true,
+                        "default": false,
                         "level": 1,
-                        "help": "If you are having memory issues, try turning this to false"
+                        "help": "Default: False. If you are having memory issues, try turning this to false"
                     }
                 }
             },
@@ -142,7 +170,7 @@
                         "type": "boolean",
                         "default": true,
                         "level": 2,
-                        "help": "Enables SSDP protocol on port 1900. Recommend keeping this disabled and use manual setup"
+                        "help": "Default: True. Enables SSDP protocol on port 1900. Recommend keeping this disabled and use manual setup"
                     },
                     "udp_netmask":{
                         "label": "udp_netmask",
@@ -166,7 +194,7 @@
                         "type": "boolean",
                         "default": true,
                         "level": 2,
-                        "help": "Enables HDHR protocol on port 65001. Recommend keeping this disabled and use manual setup"
+                        "help": "Default: True. Enables HDHR UDP discovery protocol on port 65001. Recommend keeping this disabled and use manual setup"
                     },
                     "hdhr_id":{
                         "label": "hdhr_id",
diff --git a/lib/resources/manifest.json b/lib/resources/manifest.json
index 00a702c..e4e7ad5 100644
--- a/lib/resources/manifest.json
+++ b/lib/resources/manifest.json
@@ -1,13 +1,44 @@
 {
-    "id": "cabernet",
-    "name": "Cabernet",
-    "github_repo_stable": "https://api.github.com/repos/cabernetwork/cabernet",
-    "github_repo_unstable": "https://api.github.com/repos/cabernetwork/cabernet",
-    "provider-name": "rocky4546",
-    "summary": "Cabernet allows control of IPTV streams",
-    "description": "Connect streams to your favorite media server. Cabernet is a modular-based appliance/platform that cleans, organizes and repackages IPTV streams to be compatible and digested by media clients.",
-    "license": "MIT License, Copyright (C) 2021 ROCKY4546",
-    "source": "https://github.com/cabernetwork/cabernet",
-    "forum": "https://tvheadend.org/boards/5/topics/43052",
-    "website": "https://cabernetwork.github.io/"
+    "plugin": {
+        "id": "cabernet",
+        "name": "Cabernet",
+        "version": {
+            "current": "0.1.0"
+        },
+        "requires": [{
+            "python": {
+                "name": "python",
+                "version": "3.7.0"
+            },
+            "python-lib": {
+                "name": "cryptography",
+                "version": "2.8"
+            },
+            "python-lib": {
+                "name": "streamlink",
+                "version": "5.3.1"
+            },
+            "python-lib": {
+                "name": "requests",
+                "version": "2.26.0"
+            }
+        }],
+        "category": ["repository"],
+        "provider-name": "rocky4546",
+        "summary": "Cabernet allows control of IPTV streams",
+        "description": "Connect streams to your favorite media server. Cabernet is a modular-based appliance/platform that cleans, organizes and repackages IPTV streams to be compatible and digested by media clients.",
+        "license": "MIT License, Copyright (C) 2021 ROCKY4546",
+        "source": "https://github.com/cabernetwork/cabernet",
+        "forum": "https://tvheadend.org/boards/5/topics/43052",
+        "website": "https://cabernetwork.github.io/",
+        "dir": {
+            "github_repo_stable": "https://api.github.com/repos/cabernetwork/cabernet",
+            "github_repo_unstable": "https://api.github.com/repos/cabernetwork/cabernet",
+            "info": "https://raw.githubusercontent.com/cabernetwork/Cabernet-Repository/main/plugin.json",
+            "checksum": "https://raw.githubusercontent.com/cabernetwork/Cabernet-Repository/main/plugin.json.sha2",
+            "datadir": {
+                "url": "https://raw.githubusercontent.com/cabernetwork/Cabernet-Repository/main/repo"
+            }
+        }
+    }
 }
diff --git a/lib/resources/plugins/__init__.py b/lib/resources/plugins/__init__.py
old mode 100755
new mode 100644
diff --git a/lib/resources/plugins/config_defn.json b/lib/resources/plugins/config_defn.json
old mode 100755
new mode 100644
diff --git a/lib/resources/plugins/instance_defn.json b/lib/resources/plugins/instance_defn.json
old mode 100755
new mode 100644
diff --git a/lib/resources/plugins/instance_defn_channel.json b/lib/resources/plugins/instance_defn_channel.json
old mode 100755
new mode 100644
diff --git a/lib/resources/plugins/instance_defn_epg.json b/lib/resources/plugins/instance_defn_epg.json
old mode 100755
new mode 100644
diff --git a/lib/resources/plugins/plugin_repo.json b/lib/resources/plugins/plugin_repo.json
old mode 100755
new mode 100644
diff --git a/lib/schedule/schedule_html.py b/lib/schedule/schedule_html.py
index 3ae1640..1e4ae80 100644
--- a/lib/schedule/schedule_html.py
+++ b/lib/schedule/schedule_html.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -17,7 +17,6 @@
 """
 
 import datetime
-import json
 import logging
 import time
 
@@ -36,7 +35,7 @@ def get_schedule_html(_webserver):
     elif 'deltask' in _webserver.query_data:
         schedule_html.del_task(_webserver.query_data['task'])
         time.sleep(0.05)
-        html = schedule_html.get(_webserver.query_data)        
+        html = schedule_html.get(_webserver.query_data)
     elif 'delete' in _webserver.query_data:
         schedule_html.del_trigger(_webserver.query_data['trigger'])
         time.sleep(0.05)
@@ -86,10 +85,9 @@ def header(self):
 
     @property
     def body(self):
-        return ''.join(['<body>', self.title, self.schedule_tasks, self.task,
-            '</body>'
-            ])
-    
+        return ''.join(['<body>', self.title, self.schedule_tasks,
+                        self.task, '</body>'])
+
     @property
     def title(self):
         return ''.join([
@@ -108,22 +106,24 @@ def schedule_tasks(self):
         ])
         i = 0
         for task_dict in tasks:
-            i +=1
+            i += 1
             if task_dict['area'] != current_area:
                 if i > 1:
                     html = ''.join([html,
-                        '</div></div></div></td></tr>'
-                        ])
+                                    '</div></div></div></td></tr>'
+                                    ])
                 current_area = task_dict['area']
                 if current_area in self.query_data:
                     checked = "checked"
                 else:
                     checked = ""
-                html = ''.join([html,
+                html = ''.join([
+                    html,
                     '<tr><td colspan=3>',
                     '<div>',
-                    '<input id="schedcoll',str(i),'" class="toggle" type="checkbox" ', checked ,'>',
-                    '<label for="schedcoll',str(i),'" class="label-toggle navDrawerCollapseButton navCollapsibleButton navButton schedSection">',
+                    '<input id="schedcoll', str(i), '" class="toggle" type="checkbox" ', checked, '>',
+                    '<label for="schedcoll', str(i),
+                    '" class="label-toggle navDrawerCollapseButton navCollapsibleButton navButton schedSection">',
                     current_area, '<span id="', current_area,
                     '_sect" style="max-width: 20%; margin-left: 1em;" class=""></span></label>',
                     '<div class="collapsible-content">',
@@ -160,53 +160,53 @@ def schedule_tasks(self):
                 else:
                     dur_delta = str(task_dict['duration']) + ' seconds'
             html = ''.join([html,
-                '<div style="display: flex;" title="', task_dict['title'], '">',
-                '<div class="schedIcon">',
-                '<a href="#" onclick=\'load_task_url("/api/schedulehtml?task=', 
-                task_dict['taskid'], '")\'>',
-                '<i class="md-icon">schedule</i></a></div>',
-                '<div class="schedTask">',
-                '<a href="#" onclick=\'load_task_url("/api/schedulehtml?task=',
-                task_dict['taskid'], '")\'>',
-                '<div class="schedTitle">', task_dict['title'], '</div>',
-                '<div>Plugin: ', task_dict['namespace']
-            ])
+                            '<div style="display: flex;" title="', task_dict['title'], '">',
+                            '<div class="schedIcon">',
+                            '<a href="#" onclick=\'load_task_url("/api/schedulehtml?task=',
+                            task_dict['taskid'], '")\'>',
+                            '<i class="md-icon">schedule</i></a></div>',
+                            '<div class="schedTask">',
+                            '<a href="#" onclick=\'load_task_url("/api/schedulehtml?task=',
+                            task_dict['taskid'], '")\'>',
+                            '<div class="schedTitle">', task_dict['title'], '</div>',
+                            '<div>Plugin: ', task_dict['namespace']
+                            ])
             if task_dict['active']:
                 html = ''.join([html,
-                    ' -- Currently Running</div><div class="progress-line"></div>'
-                ])
+                                ' -- Currently Running</div><div class="progress-line"></div>'
+                                ])
                 play_name = ''
                 play_icon = ''
                 delete_icon = ''
                 delete_name = ''
             else:
                 html = ''.join([html,
-                    ' -- Last ran ', lastran_delta, ' ago, taking ', 
-                    dur_delta, '</div><div class=""></div>'
-                ])
+                                ' -- Last ran ', lastran_delta, ' ago, taking ',
+                                dur_delta, '</div><div class=""></div>'
+                                ])
                 play_name = '&run=1'
                 play_icon = 'play_arrow'
                 delete_icon = 'delete_forever'
                 delete_name = '&deltask=1'
 
             html = ''.join([html,
-                '</a></div><div class="schedIcon">',
-                '<a href="#" onclick=\'load_sched_url("/api/schedulehtml?task=',
-                task_dict['taskid'], play_name, '")\'>',
-                '<i class="md-icon">', play_icon, '</i></a>',
-                '<br>',
-                '<a href="#" title="After deleting, restart app to restore tasks to default" ', 
-                'onclick=\'load_sched_url("/api/schedulehtml?task=',
-                task_dict['taskid'], delete_name, '")\'>',
-                '<i class="md-icon">', delete_icon, '</i></a>',
-                '</div></div><hr style="margin-top: 0;">'
-            ])
+                            '</a></div><div class="schedIcon">',
+                            '<a href="#" onclick=\'load_sched_url("/api/schedulehtml?task=',
+                            task_dict['taskid'], play_name, '")\'>',
+                            '<i class="md-icon">', play_icon, '</i></a>',
+                            '<br>',
+                            '<a href="#" title="After deleting, restart app to restore tasks to default" ',
+                            'onclick=\'load_sched_url("/api/schedulehtml?task=',
+                            task_dict['taskid'], delete_name, '")\'>',
+                            '<i class="md-icon">', delete_icon, '</i></a>',
+                            '</div></div><hr style="margin-top: 0;">'
+                            ])
         html = ''.join([html,
-            '</div></div></div></td></tr></table></div>'
-            ])
+                        '</div></div></div></td></tr></table></div>'
+                        ])
         return html
- 
-    @property 
+
+    @property
     def task(self):
         return ''.join([
             '<div id="schedtask" class="schedTable schedHide"></div>'
@@ -230,12 +230,12 @@ def get_task(self, _id):
             '<tr>',
             '<td class="schedIcon"></td>',
             '<td colspan=2>', str(task_dict['description']), '</div></td>'
-            '</tr>',
+                                                             '</tr>',
             '<td class="schedIcon"></td>',
-            '<td colspan=2><b>Namespace:</b> ', str(task_dict['namespace']), 
+            '<td colspan=2><b>Namespace:</b> ', str(task_dict['namespace']),
             ' &nbsp; <b>Instance:</b> ', str(task_dict['instance']),
-            ' &nbsp; <b>Priority:</b> ', str(task_dict['priority']), 
-            ' &nbsp; <b>Thread Type:</b> ', str(task_dict['threadtype']), 
+            ' &nbsp; <b>Priority:</b> ', str(task_dict['priority']),
+            ' &nbsp; <b>Thread Type:</b> ', str(task_dict['threadtype']),
             '</div></td>',
             '<tr>',
             '<tr><td>&nbsp;</td></tr>',
@@ -245,7 +245,7 @@ def get_task(self, _id):
             '<i class="schedIcon md-icon" style="padding-left: 1px; text-align: left;">add</i></button>',
             '</div></td>',
             '</tr>',
-            ])
+        ])
 
         trigger_array = self.scheduler_db.get_triggers(_id)
         for trigger_dict in trigger_array:
@@ -257,7 +257,7 @@ def get_task(self, _id):
                 trigger_str = ''.join([
                     'Every ', trigger_dict['dayofweek'],
                     ' at ', trigger_dict['timeofday']
-                    ])
+                ])
             elif trigger_dict['timetype'] == 'interval':
                 interval_mins = trigger_dict['interval']
                 remainder_hrs = interval_mins % 60
@@ -269,10 +269,10 @@ def get_task(self, _id):
                 trigger_str = 'Every ' + interval_str
                 if trigger_dict['randdur'] != -1:
                     trigger_str += ' with random maximum added time of ' + str(trigger_dict['randdur']) + ' minutes'
-                
+
             else:
                 trigger_str = 'UNKNOWN'
-        
+
             html = ''.join([
                 html,
                 '<tr>',
@@ -282,16 +282,16 @@ def get_task(self, _id):
                 trigger_str,
                 '</td>',
                 '<td class="schedIcon">',
-                '<a href="#" onclick=\'load_task_url("/api/schedulehtml?task=', _id, 
+                '<a href="#" onclick=\'load_task_url("/api/schedulehtml?task=', _id,
                 '&trigger=', trigger_dict['uuid'], '&delete=1")\'>',
                 '<i class="md-icon">delete_forever</i></a></td>',
                 '</tr>'
-                ])
+            ])
 
         return ''.join([
             html,
             '</table>'
-            ])
+        ])
 
     def get_trigger(self, _id):
         task_dict = self.scheduler_db.get_task(_id)
@@ -306,7 +306,7 @@ def get_trigger(self, _id):
             instance = ""
         else:
             instance = task_dict['instance']
-            
+
         return "".join([
             '<script src="/modules/scheduler/trigger.js"></script>',
             '<form id="triggerform" action="/api/schedulehtml" method="post">',
@@ -322,7 +322,7 @@ def get_trigger(self, _id):
             'Add Trigger</div></td>'
             '</tr>',
             '<tr>',
-            '<td><b>Task: ', task_dict['title'], 
+            '<td><b>Task: ', task_dict['title'],
             '<input type="hidden" name="title" value="', task_dict['title'], '" >',
             '</b><br><br></td>'
             '</tr>',
@@ -392,7 +392,7 @@ def get_trigger(self, _id):
             '<option value="45">45 min</option>',
             '<option value="50">50 min</option>',
             '<option value="55">55 min</option>',
-            '</select>','<br><br>',
+            '</select>', '<br><br>',
             '</td></tr>',
             '<tr><td><div id="divINTL" class="schedHide">Every: &nbsp; ',
             '<select name="interval"</select>',
@@ -444,7 +444,8 @@ def get_trigger(self, _id):
             '</select><br><br>',
             '</td></tr>',
             '<tr><td><button type="submit">Add</button>',
-            ' &nbsp; <button onclick=\'load_task_url("/api/schedulehtml?task=', _id, '"); return false;\' >Cancel</button>',
+            ' &nbsp; <button onclick=\'load_task_url("/api/schedulehtml?task=', _id,
+            '"); return false;\' >Cancel</button>',
             '<tr><td>&nbsp;</td></tr>',
             '</table></form>',
             '<section id="status"></section>'
@@ -467,7 +468,7 @@ def post_add_trigger(self, query_data):
                 'area': query_data['area'][0],
                 'title': query_data['title'][0],
                 'timetype': query_data['timetype'][0],
-                'timeofday': query_data['timeofdayhr'][0]+':'+query_data['timeofdaymin'][0]
+                'timeofday': query_data['timeofdayhr'][0] + ':' + query_data['timeofdaymin'][0]
             }})
             time.sleep(0.05)
             return 'Daily Trigger added'
@@ -481,7 +482,7 @@ def post_add_trigger(self, query_data):
                 'area': query_data['area'][0],
                 'title': query_data['title'][0],
                 'timetype': query_data['timetype'][0],
-                'timeofday': query_data['timeofdayhr'][0]+':'+query_data['timeofdaymin'][0],
+                'timeofday': query_data['timeofdayhr'][0] + ':' + query_data['timeofdaymin'][0],
                 'dayofweek': query_data['dayofweek'][0]
             }})
             time.sleep(0.05)
@@ -500,20 +501,18 @@ def post_add_trigger(self, query_data):
             time.sleep(0.05)
             return 'Interval Trigger added'
         return 'UNKNOWN'
-        
+
     def del_trigger(self, _uuid):
         if self.scheduler_db.get_trigger(_uuid) is None:
             return None
-        self.queue.put({'cmd': 'del', 'uuid': _uuid })
+        self.queue.put({'cmd': 'del', 'uuid': _uuid})
         time.sleep(0.05)
         return 'Interval Trigger deleted'
 
     def run_task(self, _taskid):
-        self.queue.put({'cmd': 'runtask', 'taskid': _taskid })
+        self.queue.put({'cmd': 'runtask', 'taskid': _taskid})
         return None
 
-
     def del_task(self, _taskid):
-        self.queue.put({'cmd': 'deltask', 'taskid': _taskid })
+        self.queue.put({'cmd': 'deltask', 'taskid': _taskid})
         return None
-
diff --git a/lib/schedule/scheduler.py b/lib/schedule/scheduler.py
index 6b8d1fd..b119efc 100644
--- a/lib/schedule/scheduler.py
+++ b/lib/schedule/scheduler.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -18,12 +18,10 @@
 
 import importlib
 import logging
-import urllib.request
 import time
 from multiprocessing import Process
 from threading import Thread
 
-import lib.main as main
 import lib.schedule.schedule
 import lib.common.exceptions as exceptions
 from lib.common.decorators import getrequest
@@ -34,18 +32,20 @@
 @getrequest.route('/api/scheduler')
 def get_scheduler(_webserver):
     try:
-        if _webserver.query_data['action'] == 'runtask':
-            _webserver.sched_queue.put({'cmd': 'runtask', 'taskid': _webserver.query_data['taskid'] })
+        if _webserver.query_data.get('action') == 'runtask':
+            _webserver.sched_queue.put({'cmd': 'runtask', 'taskid': _webserver.query_data.get('taskid')})
             time.sleep(0.1)
-            _webserver.do_mime_response(200, 'text/html', 'action is ' + _webserver.query_data['action'])
+            _webserver.do_mime_response(200, 'text/html', 'action executed: ' + _webserver.query_data['action'])
             return
         else:
-            _webserver.do_mime_response(501, 'text/html',
+            _webserver.do_mime_response(
+                501, 'text/html',
                 web_templates['htmlError'].format('501 - Unknown action'))
     except KeyError:
-        _webserver.do_mime_response(501, 'text/html', 
+        _webserver.do_mime_response(
+            501, 'text/html',
             web_templates['htmlError'].format('501 - Badly formed request'))
-    
+
 
 class Scheduler(Thread):
     """
@@ -59,7 +59,6 @@ class Scheduler(Thread):
     """
     scheduler_obj = None
 
-
     def __init__(self, _plugins, _queue):
         Thread.__init__(self)
         self.logger = logging.getLogger(__name__)
@@ -77,6 +76,7 @@ def _queue_thread():
             while not self.stop_thread:
                 queue_item = self.queue.get(True)
                 self.process_queue(queue_item)
+
         _q_thread = Thread(target=_queue_thread, args=())
         _q_thread.start()
         self.start()
@@ -132,7 +132,6 @@ def call_trigger(self, _trigger):
         """
         Calls the trigger function and times the result
         """
-        results = None
         start = time.time()
         try:
             if _trigger['namespace'] == 'internal':
@@ -142,22 +141,30 @@ def call_trigger(self, _trigger):
                 results = call_f(self.plugins)
             else:
                 if _trigger['namespace'] not in self.plugins.plugins:
-                    self.logger.debug('{} scheduled tasks ignored. plugin missing' \
+                    self.logger.debug(
+                        '{} scheduled tasks ignored. plugin missing'
                         .format(_trigger['namespace']))
                     results = False
                 else:
                     plugin_obj = self.plugins.plugins[_trigger['namespace']].plugin_obj
                     if plugin_obj is None:
-                        self.logger.debug('{} scheduled tasks ignored. plugin disabled' \
+                        self.logger.debug(
+                            '{} scheduled tasks ignored. plugin disabled'
                             .format(_trigger['namespace']))
                         results = False
                     elif _trigger['instance'] is None:
                         call_f = getattr(plugin_obj, _trigger['funccall'])
                         results = call_f()
-                    else:
-                        call_f = getattr(plugin_obj.instances[_trigger['instance']], 
-                            _trigger['funccall'])
+                    elif plugin_obj.instances.get(_trigger['instance']):
+                        call_f = getattr(plugin_obj.instances[_trigger['instance']],
+                                         _trigger['funccall'])
                         results = call_f()
+                    else:
+                        self.logger.debug(
+                            '{}:{} scheduled tasks ignored. instance missing'
+                            .format(_trigger['namespace'], _trigger['instance']))
+                        results = False
+
         except exceptions.CabernetException as ex:
             self.logger.warning('{}'.format(str(ex)))
             results = False
@@ -166,7 +173,7 @@ def call_trigger(self, _trigger):
                 'UNEXPECTED EXCEPTION on GET=', ex))
             results = False
         if results is None:
-            results == True
+            results = True
         end = time.time()
         duration = int(end - start)
         if results:
@@ -196,7 +203,7 @@ def add_job(self, _trigger):
         """
         Adds a job to the schedule object using the trigger dict from the database
         """
-        if  _trigger['timetype'] == 'daily':
+        if _trigger['timetype'] == 'daily':
             self.schedule.every().day.at(_trigger['timeofday']).do(
                 self.exec_trigger, _trigger) \
                 .tag(_trigger['uuid'])
@@ -206,7 +213,7 @@ def add_job(self, _trigger):
                 self.exec_trigger, _trigger) \
                 .tag(_trigger['uuid'])
         elif _trigger['timetype'] == 'interval':
-            if  _trigger['randdur'] < 0:
+            if _trigger['randdur'] < 0:
                 self.schedule.every(_trigger['interval']).minutes.do(
                     self.exec_trigger, _trigger) \
                     .tag(_trigger['uuid'])
@@ -239,6 +246,8 @@ def process_queue(self, _queue_item):
                 self.run_task(_queue_item['taskid'])
             elif _queue_item['cmd'] == 'deltask':
                 self.delete_task(_queue_item['taskid'])
+            elif _queue_item['cmd'] == 'delinstance':
+                self.delete_instance(_queue_item['name'], _queue_item['instance'])
             elif _queue_item['cmd'] == 'del':
                 self.delete_trigger(_queue_item['uuid'])
             elif _queue_item['cmd'] == 'add':
@@ -249,9 +258,9 @@ def process_queue(self, _queue_item):
                 self.logger.warning('UNKNOWN Scheduler cmd from queue: {}'.format(_queue_item))
         except KeyError as e:
             self.logger.warning('Badly formed scheduled request {} {}'.format(_queue_item, repr(e)))
-        
+
     def delete_trigger(self, _uuid):
-        self.logger.notice('Deleting trigger {}'.format(_uuid))
+        self.logger.debug('Deleting trigger {}'.format(_uuid))
         jobs = self.schedule.get_jobs(_uuid)
         for job in jobs:
             self.schedule.cancel_job(job)
@@ -268,42 +277,55 @@ def run_trigger(self, _uuid):
     def add_trigger(self, trigger):
         if trigger['timetype'] == 'startup':
             self.create_trigger(trigger['area'], trigger['title'],
-                trigger['timetype'])
+                                trigger['timetype'])
         elif trigger['timetype'] == 'daily':
             self.create_trigger(trigger['area'], trigger['title'],
-                trigger['timetype'],
-                timeofday=trigger['timeofday']
-                )
+                                trigger['timetype'],
+                                timeofday=trigger['timeofday']
+                                )
         elif trigger['timetype'] == 'daily':
             self.create_trigger(trigger['area'], trigger['title'],
-                trigger['timetype'],
-                timeofday=trigger['timeofday']
-                )
+                                trigger['timetype'],
+                                timeofday=trigger['timeofday']
+                                )
         elif trigger['timetype'] == 'weekly':
             self.create_trigger(trigger['area'], trigger['title'],
-                trigger['timetype'],
-                timeofday=trigger['timeofday'],
-                dayofweek=trigger['dayofweek']
-                )
+                                trigger['timetype'],
+                                timeofday=trigger['timeofday'],
+                                dayofweek=trigger['dayofweek']
+                                )
         elif trigger['timetype'] == 'interval':
             self.create_trigger(trigger['area'], trigger['title'],
-                trigger['timetype'],
-                interval=trigger['interval'],
-                randdur=trigger['randdur']
-                )
+                                trigger['timetype'],
+                                interval=trigger['interval'],
+                                randdur=trigger['randdur']
+                                )
 
-    def create_trigger(self, _area, _title, _timetype, timeofday=None, 
-            dayofweek=None, interval=-1, timelimit=-1, randdur=-1):
+    def create_trigger(self, _area, _title, _timetype, timeofday=None,
+                       dayofweek=None, interval=-1, timelimit=-1, randdur=-1):
         self.logger.notice('Creating trigger {}:{}:{}'.format(_area, _title, _timetype))
-        uuid = self.scheduler_db.save_trigger(_area, _title, _timetype, timeofday, 
-            dayofweek, interval, timelimit, randdur)
+        uuid = self.scheduler_db.save_trigger(_area, _title, _timetype, timeofday,
+                                              dayofweek, interval, timelimit, randdur)
         trigger = self.scheduler_db.get_trigger(uuid)
         self.add_job(trigger)
 
+    def delete_instance(self, _name, _instance):
+        tasks = self.scheduler_db.get_tasks_by_name(_name, _instance)
+        for task in tasks:
+            self.logger.warning('deleting task {}'.format(task['taskid']))
+            self.delete_task(task['taskid'])
+
     def delete_task(self, _taskid):
         task = self.scheduler_db.get_task(_taskid)
-        if task is not None:
-            self.scheduler_db.del_task(task['area'], task['title'])
+        if task is None:
+            self.logger.notice('Task to delete missing: {}'.format(_taskid))
+            return
+        
+        triggers = self.scheduler_db.get_triggers(_taskid)
+        for trigger in triggers:
+            self.delete_trigger(trigger['uuid'])
+        self.logger.debug('Deleting schedule task: {}'.format(_taskid))
+        self.scheduler_db.del_task(task['area'], task['title'])
 
     def run_task(self, _taskid):
         triggers = self.scheduler_db.get_triggers(_taskid)
@@ -318,18 +340,19 @@ def run_task(self, _taskid):
 
         is_run = False
         default_trigger = None
+        trigger = None
         for trigger in triggers:
             if trigger['timetype'] == 'startup':
                 continue
             elif trigger['timetype'] == 'interval':
-                self.queue.put({'cmd': 'run', 'uuid': trigger['uuid'] })
+                self.queue.put({'cmd': 'run', 'uuid': trigger['uuid']})
                 is_run = True
                 break
             else:
                 default_trigger = trigger
         if not is_run:
             if default_trigger is not None:
-                self.queue.put({'cmd': 'run', 'uuid': trigger['uuid'] })
+                self.queue.put({'cmd': 'run', 'uuid': trigger['uuid']})
             else:
                 task = self.scheduler_db.get_task(_taskid)
                 if task is not None:
diff --git a/lib/streams/atsc.py b/lib/streams/atsc.py
index 97df308..fad3dc8 100644
--- a/lib/streams/atsc.py
+++ b/lib/streams/atsc.py
@@ -42,7 +42,6 @@
 class ATSCMsg:
     # class that generates most of the ATSC UDP protocol messages
 
-    msg_counter = {}
 
     # UDP msgs for ATSC
     # https://www.atsc.org/wp-content/uploads/2015/03/Program-System-Information-Protocol-for-Terrestrial-Broadcast-and-Cable-1.pdf
@@ -60,6 +59,7 @@ def __init__(self):
         self.crc_table_idx_width = 8
         self.atsc_blank_section = b'\x47\x1f\xff\x10\x00'.ljust(ATSC_MSG_LEN, b'\xff')
         self.type_strings = []
+        self.msg_counter = {}
 
     def gen_crc_mpeg(self, _msg):
         alg = Crc(
@@ -144,7 +144,7 @@ def gen_pid(self, _prog_number):
         # Video Stream Element = Base_PID + 1 with the 12th bit set
         # Audio Stream Elements = Vide Stream PID + 4 with the 12th bit set, then +1 for each additional lang
         pid_lookup = [0x00, 0x30, 0x40, 0x50, 0x60, 0x70, 0x80, 0x90,
-            0x130, 0x140, 0x150, 0x160, 0x170, 0x180, 0x190, 0x230, 0x240]
+                      0x130, 0x140, 0x150, 0x160, 0x170, 0x180, 0x190, 0x230, 0x240]
         return pid_lookup[_prog_number]
 
     def gen_lang(self, _name):
@@ -157,9 +157,9 @@ def update_sdt_names(self, _video, _service_provider, _service_name):
         video_len = len(_video.data)
         msg = None
         while True:
-            if i+ATSC_MSG_LEN > video_len: 
+            if i + ATSC_MSG_LEN > video_len:
                 break
-            packet = _video.data[i:i+ATSC_MSG_LEN]
+            packet = _video.data[i:i + ATSC_MSG_LEN]
             program_fields = self.decode_ts_packet(packet)
             if program_fields is None:
                 i += ATSC_MSG_LEN
@@ -181,14 +181,14 @@ def update_sdt_names(self, _video, _service_provider, _service_name):
                 _video.data = b''.join([
                     _video.data[:i],
                     msg,
-                    _video.data[i+ATSC_MSG_LEN:]
-                    ])
+                    _video.data[i + ATSC_MSG_LEN:]
+                ])
             i += ATSC_MSG_LEN
         if msg is None:
             self.logger.debug('Missing ATSC SDT Msg in stream, unable to update provider and service name')
         else:
             self.logger.debug('Updating ATSC SDT with service info {} {}' \
-                .format(_service_provider, _service_name))
+                              .format(_service_provider, _service_name))
 
     def gen_sld(self, _base_pid, _elements):
         # Table 6.29 Service Location Descriptor
@@ -222,7 +222,7 @@ def gen_sld(self, _base_pid, _elements):
             audio_pid_int += 1
             audio_pid = utils.set_u16(audio_pid_int)
             lang_msg = struct.pack('%ds' % (len(lang)),
-                lang.encode())
+                                   lang.encode())
             msg += stream_type + audio_pid + lang_msg
         msg = video_pid + elem_len + msg
         length = utils.set_u8(len(msg))
@@ -380,14 +380,14 @@ def gen_stt(self):
         ver_sect_proto = b'\xc1\x00\x00\x00'
 
         time_gps = datetime.datetime.utcnow() - datetime.datetime(1980, 1, 6) \
-            - datetime.timedelta(seconds=LEAP_SECONDS_2021 - LEAP_SECONDS_1980)
+                   - datetime.timedelta(seconds=LEAP_SECONDS_2021 - LEAP_SECONDS_1980)
         time_gps_sec = int(time_gps.total_seconds())
         system_time = utils.set_u32(time_gps_sec)
         delta_time = utils.set_u8(LEAP_SECONDS_2021 - LEAP_SECONDS_1980)
         daylight_savings = b'\x60'
 
         msg = table_id_ext + ver_sect_proto + system_time + \
-            delta_time + daylight_savings + b'\x00'
+              delta_time + daylight_savings + b'\x00'
         length = utils.set_u16(len(msg) + 4 + 0xF000)
         msg = MPEG2_PROGRAM_SYSTEM_TIME_TABLE_TAG + length + msg
         crc = self.gen_crc_mpeg(msg)
@@ -482,6 +482,29 @@ def gen_cat(self):
         # search 0x0020.*0001  ...
         return b'\x00\x01\xb0\x09\xff\xff\xc3\x00\x00\xd5\xdc\xfb\x4c'
 
+    def update_continuity_counter(self, section):
+        pid = self.get_pid(section)
+        if pid is None:
+            return section
+
+        if pid not in self.msg_counter.keys():
+            self.msg_counter[pid] = 0
+
+        s_int = section[3]
+        s_top = s_int & 0xf0
+
+        s_int = s_top + self.msg_counter[pid]
+        sect_ba = bytearray(section)
+        sect_ba[3] = s_int
+        sect_bytes = bytes(sect_ba)
+
+        self.msg_counter[pid] += 1
+        if self.msg_counter[pid] > 15:
+            self.msg_counter[pid] = 0
+
+        return sect_bytes
+
+
     def format_video_packets(self, _msgs=None):
         # atsc packets are 1316 in length with 7 188 sections
         # each section has a 471f ff10 00 when no data is present
@@ -497,18 +520,18 @@ def format_video_packets(self, _msgs=None):
         #       CAT 1
         # 7 sections per packet
         sections = [
-            self.atsc_blank_section,
-            self.atsc_blank_section,
-            self.atsc_blank_section,
-            self.atsc_blank_section,
-            self.atsc_blank_section,
-            self.atsc_blank_section,
-            self.atsc_blank_section,
+            self.update_continuity_counter(self.atsc_blank_section),
+            self.update_continuity_counter(self.atsc_blank_section),
+            self.update_continuity_counter(self.atsc_blank_section),
+            self.update_continuity_counter(self.atsc_blank_section),
+            self.update_continuity_counter(self.atsc_blank_section),
+            self.update_continuity_counter(self.atsc_blank_section),
+            self.update_continuity_counter(self.atsc_blank_section),
         ]
 
         if _msgs is None:
             return b''.join(sections)
-        
+
         # for now assume the msgs are less than 1316
         if len(_msgs) > 7:
             self.logger.error('ATSC: TOO MANY MESSAGES={}'.format(len(_msgs)))
@@ -518,7 +541,7 @@ def format_video_packets(self, _msgs=None):
                 self.logger.error('ATSC: MESSAGE LENGTH TOO LONG={}'.format(len(_msgs[i])))
                 return None
             else:
-                sections[i] = _msgs[i].ljust(ATSC_MSG_LEN, b'\xff')
+                sections[i] = self.update_continuity_counter(_msgs[i].ljust(ATSC_MSG_LEN, b'\xff'))
 
         return b''.join(sections)
         # TBD need to handle large msg and more than 7 msgs
@@ -534,57 +557,62 @@ def extract_psip(self, _video_data):
         pat_found = False
         pmt_found = False
         seg_counter = 0
-        
-        #print('writing out segment')
-        #f = open('/tmp/data/segment.ts', 'wb')
-        #f.write(_video_data)
-        #f.close()
-        
+
         while True:
-            if i+ATSC_MSG_LEN > video_len: 
+            if i + ATSC_MSG_LEN > video_len:
                 break
-            packet = _video_data[i:i+ATSC_MSG_LEN]
+            packet = _video_data[i:i + ATSC_MSG_LEN]
             i += ATSC_MSG_LEN
             program_fields = self.decode_ts_packet(packet)
 
             seg_counter += 1
             if seg_counter > 7:
-                #self.logger.debug('###### SENDING BACK {} PACKETS'.format(len(packet_list)))
+                # self.logger.debug('###### SENDING BACK {} PACKETS'.format(len(packet_list)))
                 break
-            else:
-                packet_list.append(packet)
-                continue
 
             if program_fields is None:
                 continue
             if program_fields['transport_error_indicator']:
                 continue
 
+            # SDT: 17, PAT: 0, Private data: 4096 (audio/video meta)
+            if program_fields['pid'] == 0 \
+                    or program_fields['pid'] == 4096:
+                packet_list.append(packet)
+
+                seg_counter += 1
+                if seg_counter > 7:
+                    # self.logger.debug('###### SENDING BACK {} PACKETS'.format(len(packet_list)))
+                    break
+
+                continue
+
+
             if program_fields['pid'] == 0x0000:
                 pmt_pids = self.decode_pat(program_fields['payload'])
-                #self.logger.debug('###### EXPECTED PMT PIDS: {}'.format(pmt_pids))
+                # self.logger.debug('###### EXPECTED PMT PIDS: {}'.format(pmt_pids))
                 if not pat_found:
                     packet_list.append(packet)
                     pat_found = True
-            if pmt_pids and program_fields['pid'] in pmt_pids.keys():
-                program = pmt_pids[program_fields['pid']]
-                self.decode_pmt(program_fields['pid'], program, program_fields['payload'])
-                if not pmt_found:
-                    #self.logger.debug('###### FOUND PMT PID: {}'.format(program_fields['pid']))
-                    packet_list.append(packet)
-                    pmt_found = True
-                continue
-            elif program_fields['pid'] == 0x1ffb:
-                self.logger.info('Packet Table indicator 0x1ffb, not implemented {}'.format(i))
-                continue
-            #elif program_fields['pid'] == 0x0011:
+            #if pmt_pids and program_fields['pid'] in pmt_pids.keys():
+            #    program = pmt_pids[program_fields['pid']]
+            #    self.decode_pmt(program_fields['pid'], program, program_fields['payload'])
+            #    if not pmt_found:
+            #        # self.logger.debug('###### FOUND PMT PID: {}'.format(program_fields['pid']))
+            #        packet_list.append(packet)
+            #        pmt_found = True
+            #    continue
+            #elif program_fields['pid'] == 0x1ffb:
+            #    self.logger.info('Packet Table indicator 0x1ffb, not implemented {}'.format(i))
+            #    continue
+            # elif program_fields['pid'] == 0x0011:
             #    self.logger.info('Service Description Table (SDT) 0x0011, not implemented {}'.format(i))
             #    continue
-            #elif program_fields['pid'] == 0x0000 or \
+            # elif program_fields['pid'] == 0x0000 or \
             #        program_fields['pid'] == 0x0100 or \
             #        program_fields['pid'] == 0x0101:
             #    continue
-            #else:
+            # else:
             #    self.logger.info('Unknown PID {}'.format(program_fields['pid']))                
             prev_pid = program_fields['pid']
         return packet_list
@@ -604,22 +632,22 @@ def sync_audio_video(self, _video_data):
         pat_found = False
         pmt_found = False
         seg_counter = 0
-        
-        #print('writing out segment')
-        #f = open('/tmp/data/segment.ts', 'wb')
-        #f.write(_video_data)
-        #f.close()
-        
+
+        # print('writing out segment')
+        # f = open('/tmp/data/segment.ts', 'wb')
+        # f.write(_video_data)
+        # f.close()
+
         while True:
-            if i+ATSC_MSG_LEN > video_len: 
+            if i + ATSC_MSG_LEN > video_len:
                 break
-            packet = _video_data[i:i+ATSC_MSG_LEN]
+            packet = _video_data[i:i + ATSC_MSG_LEN]
             i += ATSC_MSG_LEN
             program_fields = self.decode_ts_packet(packet)
 
             seg_counter += 1
             if seg_counter > 7:
-                #self.logger.debug('###### SENDING BACK {} PACKETS'.format(len(packet_list)))
+                # self.logger.debug('###### SENDING BACK {} PACKETS'.format(len(packet_list)))
                 break
             else:
                 packet_list.append(packet)
@@ -632,7 +660,7 @@ def sync_audio_video(self, _video_data):
 
             if program_fields['pid'] == 0x0000:
                 pmt_pids = self.decode_pat(program_fields['payload'])
-                #self.logger.debug('###### EXPECTED PMT PIDS: {}'.format(pmt_pids))
+                # self.logger.debug('###### EXPECTED PMT PIDS: {}'.format(pmt_pids))
                 if not pat_found:
                     packet_list.append(packet)
                     pat_found = True
@@ -640,25 +668,36 @@ def sync_audio_video(self, _video_data):
                 program = pmt_pids[program_fields['pid']]
                 self.decode_pmt(program_fields['pid'], program, program_fields['payload'])
                 if not pmt_found:
-                    #self.logger.debug('###### FOUND PMT PID: {}'.format(program_fields['pid']))
+                    # self.logger.debug('###### FOUND PMT PID: {}'.format(program_fields['pid']))
                     packet_list.append(packet)
                     pmt_found = True
                 continue
             elif program_fields['pid'] == 0x1ffb:
                 self.logger.info('Packet Table indicator 0x1ffb, not implemented {}'.format(i))
                 continue
-            #elif program_fields['pid'] == 0x0011:
+            # elif program_fields['pid'] == 0x0011:
             #    self.logger.info('Service Description Table (SDT) 0x0011, not implemented {}'.format(i))
             #    continue
-            #elif program_fields['pid'] == 0x0000 or \
+            # elif program_fields['pid'] == 0x0000 or \
             #        program_fields['pid'] == 0x0100 or \
             #        program_fields['pid'] == 0x0101:
             #    continue
-            #else:
+            # else:
             #    self.logger.info('Unknown PID {}'.format(program_fields['pid']))                
             prev_pid = program_fields['pid']
         return packet_list
-        
+
+
+    def get_pid(self, _packet_188):
+        word = struct.unpack('!I', _packet_188[0:4])[0]
+        sync = (word & 0xff000000) >> 24
+        if sync != 0x47:
+            return None
+
+        # Packet Identifier, describing the payload data.
+        pid = (word & 0x1fff00) >> 8
+        return pid
+
     def decode_ts_packet(self, _packet_188):
         fields = {}
         word = struct.unpack('!I', _packet_188[0:4])[0]
@@ -741,9 +780,8 @@ def decode_pmt(self, pid, program, payload):
         reserved = (pcr_pid & 0xe000) >> 13
         pcr_pid &= 0x1fff
         desc1 = payload[12:]
-        #self.logger.debug('###### PMT DESCR {} {}'.format(pcr_pid, desc1))
-        #descriptors = decode_descriptors(desc1)
-
+        # self.logger.debug('###### PMT DESCR {} {}'.format(pcr_pid, desc1))
+        # descriptors = decode_descriptors(desc1)
 
     def decode_pat(self, payload):
         t = binascii.b2a_hex(payload)
@@ -759,18 +797,13 @@ def decode_pat(self, payload):
         program_count = (section_length - 5) / 4 - 1
 
         if section_length > 20:
-            #print(section_length, program_count, len(payload))
-            #self.logger.warning('{} {} {}'.format(section_length, program_count, len(payload)))
-            # log for corrupted atsc msg
             return program_map_pids
 
-
         for i in range(0, int(program_count)):
             at = 8 + (i * 4)  # skip headers, just get to the program numbers table
             program_number = struct.unpack("!H", payload[at:at + 2])[0]
             if at + 2 > len(payload):
                 break
-            #print(len(payload), at)
             program_map_pid = struct.unpack("!H", payload[at + 2:at + 2 + 2])[0]
 
             # the pid is only 13 bits, upper 3 bits of this field are 'reserved' (I see 0b111)
@@ -780,4 +813,3 @@ def decode_pat(self, payload):
             program_map_pids[program_map_pid] = program_number
             i += 1
         return program_map_pids
-
diff --git a/lib/streams/ffmpeg_proxy.py b/lib/streams/ffmpeg_proxy.py
index 95ad098..2fc3741 100644
--- a/lib/streams/ffmpeg_proxy.py
+++ b/lib/streams/ffmpeg_proxy.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -27,6 +27,8 @@
 from .stream_queue import StreamQueue
 from .pts_validation import PTSValidation
 
+MAX_IDLE_TIMER = 59
+
 
 class FFMpegProxy(Stream):
 
@@ -45,68 +47,79 @@ def __init__(self, _plugins, _hdhr_queue):
         self.write_buffer = None
         self.stream_queue = None
         self.pts_validation = None
+        self.tuner_no = -1
         super().__init__(_plugins, _hdhr_queue)
-        self.config = self.plugins.config_obj.data
         self.db_configdefn = DBConfigDefn(self.config)
         self.video = Video(self.config)
 
     def update_tuner_status(self, _status):
-        ch_num = self.channel_dict['number']
+        ch_num = self.channel_dict['display_number']
         namespace = self.channel_dict['namespace']
         scan_list = WebHTTPHandler.rmg_station_scans[namespace]
-        for i, tuner in enumerate(scan_list):
-            if type(tuner) == dict and tuner['ch'] == ch_num:
-                WebHTTPHandler.rmg_station_scans[namespace][i]['status'] = _status
-
-    def stream(self, _channel_dict, _write_buffer):
+        tuner = scan_list[self.tuner_no]
+        if type(tuner) == dict and tuner['ch'] == ch_num:
+            WebHTTPHandler.rmg_station_scans[namespace][self.tuner_no]['status'] = _status
+
+    def stream(self, _channel_dict, _write_buffer, _tuner_no):
+        global MAX_IDLE_TIMER
+        self.logger.info('Using ffmpeg_proxy for channel {}'.format(_channel_dict['uid']))
+        self.tuner_no = _tuner_no
         self.channel_dict = _channel_dict
         self.write_buffer = _write_buffer
         self.config = self.db_configdefn.get_config()
+        MAX_IDLE_TIMER = self.config[self.namespace.lower()]['stream-g_stream_timeout']
+
         self.pts_validation = PTSValidation(self.config, self.channel_dict)
         channel_uri = self.get_stream_uri(self.channel_dict)
         if not channel_uri:
-            self.logger.warning('Unknown Channel')
+            self.logger.warning('Unknown Channel {}'.format(_channel_dict['uid']))
             return
         self.ffmpeg_proc = self.open_ffmpeg_proc(channel_uri)
         time.sleep(0.01)
         self.last_refresh = time.time()
         self.block_prev_time = self.last_refresh
         self.buffer_prev_time = self.last_refresh
-        self.video.data = self.read_buffer()
+        self.read_buffer()
         while True:
             if not self.video.data:
-                self.logger.debug('No Video Data, refreshing stream')
+                self.logger.info(
+                    'No Video Data, refreshing stream {} {}'
+                    .format(_channel_dict['uid'], self.ffmpeg_proc.pid))
                 self.ffmpeg_proc = self.refresh_stream()
             else:
                 try:
-                    self.validate_stream(self.video)
+                    self.validate_stream()
                     self.update_tuner_status('Streaming')
+                    start_ttw = time.time()
                     self.write_buffer.write(self.video.data)
+                    delta_ttw = time.time() - start_ttw
+                    self.logger.info(
+                        'Serving {} {} ({}B) ttw:{:.2f}s'
+                        .format(self.ffmpeg_proc.pid, _channel_dict['uid'],
+                                len(self.video.data), delta_ttw))
                 except IOError as e:
                     if e.errno in [errno.EPIPE, errno.ECONNABORTED, errno.ECONNRESET, errno.ECONNREFUSED]:
-                        self.logger.info('1. Connection dropped by end device')
+                        self.logger.info('1. Connection dropped by end device {}'.format(self.ffmpeg_proc.pid))
                         break
                     else:
                         self.logger.error('{}{}'.format(
-                            '1 ################ UNEXPECTED EXCEPTION=', e))
+                            '1 UNEXPECTED EXCEPTION=', e))
                         raise
             try:
-                self.video.data = self.read_buffer()
+                self.read_buffer()
+            except exceptions.CabernetException as ex:
+                self.logger.info('{} {}'.format(ex, self.ffmpeg_proc.pid))
+                break
             except Exception as e:
                 self.logger.error('{}{}'.format(
-                    '2 ################ UNEXPECTED EXCEPTION=', e))
-                raise
-        self.logger.debug('Terminating ffmpeg stream')
-        self.ffmpeg_proc.terminate()
-        try:
-            self.ffmpeg_proc.communicate()
-        except ValueError:
-            pass
+                    '2 UNEXPECTED EXCEPTION=', e))
+                break
+        self.terminate_stream()
 
     def validate_stream(self):
-        if not self.config[self.channel_dict['namespace'].lower()]['player-enable_pts_filter']:
+        if not self.config[self.config_section]['player-enable_pts_filter']:
             return
-            
+
         has_changed = True
         while has_changed:
             has_changed = False
@@ -119,42 +132,51 @@ def validate_stream(self):
                 has_changed = True
             if results['refresh_stream']:
                 self.ffmpeg_proc = self.refresh_stream()
-                self.video.data = self.read_buffer()
+                self.read_buffer()
                 has_changed = True
             if results['reread_buffer']:
-                self.video.data = self.read_buffer()
+                self.read_buffer()
                 has_changed = True
-        return 
+        return
 
     def read_buffer(self):
+        global MAX_IDLE_TIMER
         data_found = False
         self.video.data = None
-        idle_timer = 2
+        idle_timer = MAX_IDLE_TIMER  # time slice segments are less than 10 seconds
         while not data_found:
             self.video.data = self.stream_queue.read()
             if self.video.data:
                 data_found = True
             else:
-                time.sleep(0.2)
+                time.sleep(1)
                 idle_timer -= 1
-                if idle_timer == 0:
-                    if self.plugins.plugins[self.channel_dict['namespace']].plugin_obj \
-                            .is_time_to_refresh_ext(self.last_refresh, self.channel_dict['instance']):
-                        self.ffmpeg_proc = self.refresh_stream()
+                if idle_timer < 1:
+                    idle_timer = MAX_IDLE_TIMER  # time slice segments are less than 10 seconds
+                    self.logger.info(
+                        'No Video Data, refreshing stream {}'
+                        .format(self.ffmpeg_proc.pid))
+                    self.ffmpeg_proc = self.refresh_stream()
+                elif int(MAX_IDLE_TIMER / 2) == idle_timer:
+                    self.update_tuner_status('No Reply')
         return
 
+    def terminate_stream(self):
+        self.logger.debug('Terminating ffmpeg stream {}'.format(self.ffmpeg_proc.pid))
+        while True:
+            try:
+                self.ffmpeg_proc.terminate()
+                self.ffmpeg_proc.wait(timeout=1.5)
+                break
+            except ValueError:
+                pass
+            except subprocess.TimeoutExpired:
+                time.sleep(0.01)
+
     def refresh_stream(self):
         self.last_refresh = time.time()
         channel_uri = self.get_stream_uri(self.channel_dict)
-        try:
-            self.ffmpeg_proc.terminate()
-            self.ffmpeg_proc.wait(timeout=0.1)
-            self.logger.debug('Previous ffmpeg terminated')
-        except ValueError:
-            pass
-        except subprocess.TimeoutExpired:
-            self.ffmpeg_proc.terminate()
-            time.sleep(0.01)
+        self.terminate_stream()
 
         self.logger.debug('{}{}'.format(
             'Refresh Stream channelUri=', channel_uri))
@@ -170,7 +192,8 @@ def open_ffmpeg_proc_locast(self, _channel_uri):
         visible by looking at the video packets for a 6 second window being 171
         instead of 180.  Following the first read, the packets increase to 180.
         """
-        ffmpeg_command = [self.config['paths']['ffmpeg_path'],
+        ffmpeg_command = [
+            self.config['paths']['ffmpeg_path'],
             '-i', str(_channel_uri),
             '-f', 'mpegts',
             '-nostats',
@@ -178,7 +201,8 @@ def open_ffmpeg_proc_locast(self, _channel_uri):
             '-loglevel', 'warning',
             '-copyts',
             'pipe:1']
-        ffmpeg_process = subprocess.Popen(ffmpeg_command,
+        ffmpeg_process = subprocess.Popen(
+            ffmpeg_command,
             stdout=subprocess.PIPE,
             bufsize=-1)
         self.stream_queue = StreamQueue(188, ffmpeg_process, self.channel_dict['uid'])
@@ -192,18 +216,38 @@ def open_ffmpeg_proc(self, _channel_uri):
         visible by looking at the video packets for a 6 second window being 171
         instead of 180.  Following the first read, the packets increase to 180.
         """
-        ffmpeg_command = [self.config['paths']['ffmpeg_path'],
+        header = self.channel_dict['json'].get('Header')
+        str_array = []
+        if header:
+            str_array.append('-headers')
+            header_value = ''
+            for key, value in header.items():
+                header_value += key+': '+value+'\r\n'
+                if key == 'Referer':
+                    self.logger.debug('Using HTTP Referer: {}  Channel: {}'.format(value, self.channel_dict['uid']))
+            str_array.append(header_value)
+
+        ffmpeg_options = [
             '-i', str(_channel_uri),
             '-nostats',
             '-hide_banner',
             '-fflags', '+genpts',
             '-threads', '2',
-            '-loglevel', 'fatal',
+            '-loglevel', 'quiet',
             '-c', 'copy',
             '-f', 'mpegts',
             '-c', 'copy',
             'pipe:1']
-        ffmpeg_process = subprocess.Popen(ffmpeg_command,
+
+        ffmpeg_command = [
+            self.config['paths']['ffmpeg_path']
+            ]
+        # Header option must come first in the options list
+        if str_array:
+            ffmpeg_command.extend(str_array)
+        ffmpeg_command.extend(ffmpeg_options)
+        ffmpeg_process = subprocess.Popen(
+            ffmpeg_command,
             stdout=subprocess.PIPE,
             bufsize=-1)
         self.stream_queue = StreamQueue(188, ffmpeg_process, self.channel_dict['uid'])
diff --git a/lib/streams/internal_proxy.py b/lib/streams/internal_proxy.py
index 8795e1a..9be2738 100644
--- a/lib/streams/internal_proxy.py
+++ b/lib/streams/internal_proxy.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -18,37 +18,31 @@
 
 import datetime
 import errno
-import http
 import os
+import queue
 import re
-import signal
 import socket
 import threading
 import time
-import urllib.request
-from collections import OrderedDict
-from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-from cryptography.hazmat.backends import default_backend
+import urllib.parse
 from multiprocessing import Queue, Process
-from queue import Empty
-from threading import Thread
 
 import lib.common.exceptions as exceptions
 import lib.common.utils as utils
 import lib.m3u8 as m3u8
 import lib.streams.m3u8_queue as m3u8_queue
-from lib.common.decorators import handle_url_except
-from lib.common.decorators import handle_json_except
 from lib.streams.video import Video
 from lib.streams.atsc import ATSCMsg
+from lib.streams.thread_queue import ThreadQueue
 from lib.db.db_config_defn import DBConfigDefn
 from lib.db.db_channels import DBChannels
 from lib.clients.web_handler import WebHTTPHandler
 from .stream import Stream
 
-MAX_OUT_QUEUE_SIZE = 6
-IDLE_COUNTER_MAX = 120
-
+MAX_OUT_QUEUE_SIZE = 30
+IDLE_COUNTER_MAX = 110    # four times the timeout * retries to terminate the stream in seconds set in config!
+STARTUP_IDLE_COUNTER = 40 # time to wait for an initial stream
+# code assumes a timeout response in TVH of 15 or higher.
 
 class InternalProxy(Stream):
 
@@ -61,79 +55,91 @@ def __init__(self, _plugins, _hdhr_queue):
         self.wfile = None
         self.file_filter = None
         self.t_m3u8 = None
+        self.t_m3u8_pid = None
         self.duration = 6
         self.last_ts_filename = ''
         super().__init__(_plugins, _hdhr_queue)
-        self.config = self.plugins.config_obj.data
         self.db_configdefn = DBConfigDefn(self.config)
         self.db_channels = DBChannels(self.config)
         self.video = Video(self.config)
         self.atsc = ATSCMsg()
         self.initialized_psi = False
         self.in_queue = Queue()
-        self.out_queue = Queue(maxsize=MAX_OUT_QUEUE_SIZE)
+        self.t_queue = None
+        self.out_queue = queue.Queue(maxsize=MAX_OUT_QUEUE_SIZE)
         self.terminate_queue = None
-        self.tc_match = re.compile( r'^.+[^\d]+(\d*)\.ts' )
+        self.tc_match = re.compile(r'^.+\D+(\d*)\.ts')
         self.idle_counter = 0
+        self.tuner_no = -1
+        # last time the idle counter was reset
+        self.last_reset_time = datetime.datetime.now()
+        self.last_atsc_msg = 0
+        self.filter_counter = 0
         self.is_starting = True
         self.cue = False
-        
+
     def terminate(self, *args):
-        try:
-            while not self.in_queue.empty():
-                self.in_queue.get()
-        except (Empty, EOFError):
-            pass
-        self.in_queue.put({'uri': 'terminate'})
-        time.sleep(0.2)
-        # since t_m3u8 has been told to terminate, clear the out queue and then wait for t_m3u8  so it can cleanup ffmpeg
-        self.t_m3u8.join(timeout=15)
-        if self.t_m3u8.is_alive():
-            # this is not likely but if t_m3u8 does not self terminate then force it to terminate
-            self.logger.debug('t_m3u8 failed to self terminate. Forcing it to terminate {}' \
-                .format(self.t_m3u8.pid))
-            self.t_m3u8.terminate()
-        time.sleep(0.5)
+        self.t_queue.del_thread(threading.get_ident())
+        time.sleep(0.01)
+        self.in_queue.put({'thread_id': threading.get_ident(), 'uri': 'terminate'})
+        time.sleep(0.01)
+        
+        # since t_m3u8 has been told to terminate, clear the
+        # out queue and then wait for t_m3u8, so it can clean up ffmpeg
+
+        # queue is not guaranteed to have terminate, so let t_queue know this thread is ending
+        count = 10
+        while str(self.t_queue) == '0' and self.t_queue.is_alive() and count > 0:
+            time.sleep(1.0)
+            count -= 1
+        
+        if not self.t_queue.is_alive():
+            self.t_m3u8.join(timeout=15)
+            if self.t_m3u8.is_alive():
+                # this is not likely but if t_m3u8 does not self terminate then force it to terminate
+                self.logger.debug(
+                    'm3u8 queue failed to self terminate. Forcing it to terminate {}'
+                    .format(self.t_m3u8_pid))
+                self.clear_queues()
+                self.t_m3u8.terminate()
         self.t_m3u8 = None
         self.clear_queues()
 
-    @handle_url_except(timeout=None)
-    @handle_json_except
-    def get_m3u8_data(self, _uri):
-        # it sticks here.  Need to find a work around for the socket.timeout per process
-        return m3u8.load(_uri,
-            headers={'User-agent': utils.DEFAULT_USER_AGENT})
-
-    def stream(self, _channel_dict, _wfile, _terminate_queue):
+    def stream(self, _channel_dict, _wfile, _terminate_queue, _tuner_no):
         """
         Processes m3u8 interface without using ffmpeg
         """
+        global IDLE_COUNTER_MAX
+        self.tuner_no = _tuner_no
         self.config = self.db_configdefn.get_config()
+        IDLE_COUNTER_MAX = self.config[self.namespace.lower()]['stream-g_stream_timeout']
+        
         self.channel_dict = _channel_dict
         if not self.start_m3u8_queue_process():
             self.terminate()
-            return        
+            return
         self.wfile = _wfile
         self.terminate_queue = _terminate_queue
         while True:
             try:
                 self.check_termination()
                 self.play_queue()
-                if not self.t_m3u8.is_alive():
+                if self.t_m3u8 and not self.t_m3u8.is_alive():
                     break
             except IOError as ex:
                 # Check we hit a broken pipe when trying to write back to the client
                 if ex.errno in [errno.EPIPE, errno.ECONNABORTED, errno.ECONNRESET, errno.ECONNREFUSED]:
                     # Normal process.  Client request end of stream
-                    self.logger.info('Connection dropped by end device {} {}' \
-                        .format(ex, self.t_m3u8.pid))
+                    self.logger.info(
+                        'Connection dropped by end device {} {}'
+                        .format(ex, self.t_m3u8_pid))
                     break
                 else:
                     self.logger.error('{}{} {} {}'.format(
-                        'UNEXPECTED EXCEPTION=', ex, self.t_m3u8.pid, socket.getdefaulttimeout()))
+                        'UNEXPECTED EXCEPTION=', ex, self.t_m3u8_pid, socket.getdefaulttimeout()))
                     raise
             except exceptions.CabernetException as ex:
-                self.logger.info('{} {}'.format(ex, self.t_m3u8.pid))
+                self.logger.info('{} {}'.format(ex, self.t_m3u8_pid))
                 break
         self.terminate()
 
@@ -142,34 +148,74 @@ def check_termination(self):
             raise exceptions.CabernetException("Termination Requested")
 
     def clear_queues(self):
-        self.in_queue.close()
-        self.out_queue.close()
+        """
+        out_queue cannot be closed since it is a normal queue.
+        The others are handled elsewhere
+        """
+        pass
 
     def play_queue(self):
         global MAX_OUT_QUEUE_SIZE
         global IDLE_COUNTER_MAX
+
         if not self.cue:
-            self.idle_counter += 1
-        if self.idle_counter > IDLE_COUNTER_MAX:
+            self.update_idle_counter()
+        if self.is_starting and self.idle_counter > STARTUP_IDLE_COUNTER:
+            # we need to terminate this feed.  Some providers require a 
+            # retry in order to make it work.
+            self.idle_counter = 0
+            self.last_reset_time = datetime.datetime.now()
+            self.last_atsc_msg = 0
+            self.logger.info(
+                '1 Provider has not started playing the stream. Terminating the connection {}'
+                .format(self.t_m3u8_pid))
+            raise exceptions.CabernetException(
+                '2 Provider has not started playing the stream. Terminating the connection {}'
+                .format(self.t_m3u8_pid))
+        elif self.idle_counter > self.filter_counter + IDLE_COUNTER_MAX:
             self.idle_counter = 0
-            self.logger.info('Provider has stop playing the stream. Terminating the connection {}' \
-                .format(self.t_m3u8.pid))
-            raise exceptions.CabernetException('Provider has stop playing the stream. Terminating the connection {}' \
-                .format(self.t_m3u8.pid))
-        elif self.idle_counter % 6 == 0 and self.is_starting:
-            self.write_atsc_msg()
-        while not self.out_queue.empty():
-            out_queue_item = self.out_queue.get()
+            self.last_atsc_msg = 0
+            self.last_reset_time = datetime.datetime.now()
+            self.filter_counter = 0
+            self.logger.info(
+                '1 Provider has stop playing the stream. Terminating the connection {}'
+                .format(self.t_m3u8_pid))
+            raise exceptions.CabernetException(
+                '2 Provider has stop playing the stream. Terminating the connection {}'
+                .format(self.t_m3u8_pid))
+        elif self.idle_counter > self.last_atsc_msg+6 \
+            and self.is_starting:
+                self.last_atsc_msg = self.idle_counter
+                self.write_atsc_msg()
+        elif self.idle_counter > self.last_atsc_msg+14:
+            self.last_atsc_msg = self.idle_counter
+            self.update_tuner_status('No Reply')
+            self.logger.debug('1 Requesting status from m3u8_queue {}'.format(self.t_m3u8_pid))
+            self.in_queue.put({'thread_id': threading.get_ident(), 'uri': 'status'})
+            if not self.is_starting \
+                    and self.config[self.channel_dict['namespace'].lower()] \
+                    ['player-send_atsc_keepalive']:
+                self.write_atsc_msg()
+        while True:
+            try:
+                out_queue_item = self.out_queue.get(timeout=1)
+            except queue.Empty:
+                break
             if out_queue_item['atsc'] is not None:
                 self.channel_dict['atsc'] = out_queue_item['atsc']
-                #self.logger.debug('SAVING TO DB {}'.format(len(out_queue_item['atsc'])))
                 self.db_channels.update_channel_atsc(
                     self.channel_dict)
             uri = out_queue_item['uri']
             if uri == 'terminate':
-                raise exceptions.CabernetException('m3u8 queue termination requested, aborting stream {}' \
-                    .format(self.t_m3u8.pid))
+                raise exceptions.CabernetException(
+                    'm3u8 queue termination requested, aborting stream {} {}'
+                    .format(self.t_m3u8_pid, threading.get_ident()))
             elif uri == 'running':
+                self.logger.debug('1 Status of Running returned from m3u8_queue {}'.format(self.t_m3u8_pid))
+                continue
+            elif uri == 'extend':
+                self.logger.debug('Extending the idle timeout to {} seconds'.format(self.idle_counter+IDLE_COUNTER_MAX))
+                self.filter_counter = self.idle_counter
                 continue
             data = out_queue_item['data']
             if data['cue'] == 'in':
@@ -179,70 +225,113 @@ def play_queue(self):
                 self.cue = True
                 self.logger.debug('Turning M3U8 cue to True')
             if data['filtered']:
-                self.idle_counter = 0
-                self.logger.info('Filtered Msg {} {}'.format(self.t_m3u8.pid, urllib.parse.unquote(uri)))
+                self.last_atsc_msg = self.idle_counter
+                self.filter_counter = self.idle_counter
+                self.logger.info('Filtered Msg {} {}'.format(self.t_m3u8_pid, urllib.parse.unquote(uri)))
                 self.update_tuner_status('Filtered')
-                #self.write_buffer(out_queue_item['stream'])
+                # self.write_buffer(out_queue_item['stream'])
                 if self.is_starting:
                     self.is_starting = False
                     self.write_atsc_msg()
+                    self.logger.debug('2 Requesting Status from m3u8_queue {}'.format(self.t_m3u8_pid))
+                    self.in_queue.put({'thread_id': threading.get_ident(), 'uri': 'status'})
                 time.sleep(0.5)
             else:
                 self.video.data = out_queue_item['stream']
                 if self.video.data is not None:
                     self.idle_counter = 0
+                    self.last_atsc_msg = 0
+                    self.last_reset_time = datetime.datetime.now()
+                    self.filter_counter = 0
                     if self.config['stream']['update_sdt']:
                         self.atsc.update_sdt_names(self.video,
-                            self.channel_dict['namespace'].encode(),
-                            self.set_service_name(self.channel_dict).encode())
+                                                   self.channel_dict['namespace'].encode(),
+                                                   self.set_service_name(self.channel_dict).encode())
                     self.duration = data['duration']
                     uri_decoded = urllib.parse.unquote(uri)
                     if self.check_ts_counter(uri_decoded):
-                        start_ttw = time.time()
-                        self.write_buffer(self.video.data)
-                        delta_ttw = time.time() - start_ttw
-                        self.logger.info('Serving {} {} ({})s ({}B) ttw:{:.2f}s' \
-                            .format(self.t_m3u8.pid, uri_decoded, self.duration, len(self.video.data), delta_ttw))
-                        self.is_starting = False
-                        self.update_tuner_status('Streaming')
-                        time.sleep(0.1)
+                        # if the length of the video is tiny, then print the string out
+                        if len(self.video.data) < 2000 and len(self.video.data) % 188 != 0  or self.video.data.startswith(b'<'):
+                            self.logger.info('{} {} Not a Video packet, restarting HTTP Session, data: {} {}'
+                                .format(self.t_m3u8_pid, uri_decoded, len(self.video.data), self.video.data))
+                            self.update_tuner_status('Bad Data')
+                            self.in_queue.put({'thread_id': threading.get_ident(), 'uri': 'restart_http'})
+                        else:
+                            start_ttw = time.time()
+                            self.write_buffer(self.video.data)
+                            delta_ttw = time.time() - start_ttw
+                            self.update_tuner_status('Streaming')
+                            self.logger.info(
+                                'Serving {} {} ({})s ({}B) ttw:{:.2f}s {}'
+                                .format(self.t_m3u8_pid, uri_decoded, self.duration,
+                                        len(self.video.data), delta_ttw, threading.get_ident()))
+                            self.is_starting = False
+                            time.sleep(0.1)
                 else:
                     if not self.is_starting:
                         self.update_tuner_status('No Reply')
                     uri_decoded = urllib.parse.unquote(uri)
-                    self.logger.debug('No Video Stream from Provider {} {}' \
-                        .format(self.t_m3u8.pid, uri_decoded))
+                    self.logger.debug(
+                        'No Video Stream from Provider {} {}'
+                        .format(self.t_m3u8_pid, uri_decoded))
             self.check_termination()
             time.sleep(0.01)
-        time.sleep(1)
         self.video.terminate()
 
     def write_buffer(self, _data):
+        """
+        Plan is to slowly push out bytes until something is
+        added to the queue to process.  This should stop the
+        clients from terminating the data stream due to lack of data for 
+        a short.  It is currently set to at least 20 seconds of data 
+        before it stops transmitting
+        """
         try:
-            self.wfile.flush()
-            # Do not use chunk writes! Just send data.
-            #x = self.wfile.write('{}\r\n'.format(len(_data)).encode())
-            x = self.wfile.write(_data)
-            #x = self.wfile.write('\r\n'.encode())
-            self.wfile.flush()
-        except socket.timeout as ex:
+            bytes_written = 0
+            count = 0
+            bytes_per_write = int(len(_data)/20)  # number of seconds to keep transmitting
+            while self.out_queue.qsize() == 0:
+                self.wfile.flush()
+                # Do not use chunk writes! Just send data.
+                # x = self.wfile.write('{}\r\n'.format(len(_data)).encode())
+                next_buffer_write = bytes_written + bytes_per_write
+                if next_buffer_write >= len(_data):
+                    x = self.wfile.write(_data[bytes_written:])
+                    bytes_written = len(_data)
+                    self.wfile.flush()
+                    break
+                else:
+                    count += 1
+                    if count > 13:
+                        self.update_tuner_status('No Reply')
+                    x = self.wfile.write(_data[bytes_written:next_buffer_write])
+                    bytes_written = next_buffer_write
+                    # x = self.wfile.write('\r\n'.encode())
+                    self.wfile.flush()
+                time.sleep(1.0)
+            if bytes_written != len(_data):
+                x = self.wfile.write(_data[bytes_written:])
+                self.wfile.flush()
+        except socket.timeout:
             raise
-        except IOError as e:
+        except IOError:
             raise
         return x
 
     def write_atsc_msg(self):
-        if self.channel_dict['atsc'] is None:
-            self.logger.debug('No video data, Sending Empty ATSC Msg {}' \
-                .format(self.t_m3u8.pid))
+        if not self.channel_dict['atsc']:
+            self.logger.debug(
+                'No video data, Sending Empty ATSC Msg {}'
+                .format(self.t_m3u8_pid))
             self.write_buffer(
                 self.atsc.format_video_packets())
         else:
-            self.logger.debug('No video data, Sending Default ATSC Msg for channel {}' \
-                .format(self.t_m3u8.pid))
+            self.logger.debug(
+                'No video data, Sending Default ATSC Msg for channel {}'
+                .format(self.t_m3u8_pid))
             self.write_buffer(
                 self.atsc.format_video_packets(
-                self.channel_dict['atsc']))
+                    self.channel_dict['atsc']))
 
     def get_ts_counter(self, _uri):
         m = self.tc_match.findall(_uri)
@@ -250,7 +339,7 @@ def get_ts_counter(self, _uri):
             return '', 0
         else:
             self.logger.debug('ts_counter {} {}'.format(m, _uri))
-            x_tuple = m[len(m)-1]
+            x_tuple = m[len(m) - 1]
             if len(x_tuple) == 0:
                 x_tuple = (_uri, '0')
             else:
@@ -258,28 +347,37 @@ def get_ts_counter(self, _uri):
             return x_tuple
 
     def update_tuner_status(self, _status):
-        ch_num = self.channel_dict['number']
+        ch_num = self.channel_dict['display_number']
         namespace = self.channel_dict['namespace']
         scan_list = WebHTTPHandler.rmg_station_scans[namespace]
-        for i, tuner in enumerate(scan_list):
-            if type(tuner) == dict and tuner['ch'] == ch_num:
-                WebHTTPHandler.rmg_station_scans[namespace][i]['status'] = _status
+        tuner = scan_list[self.tuner_no]
+        if type(tuner) == dict and tuner['ch'] == ch_num:
+            WebHTTPHandler.rmg_station_scans[namespace][self.tuner_no]['status'] = _status
 
+    def update_idle_counter(self):
+        """
+        Updates the idle_counter to the nearest int in seconds
+        based on when it was last reset
+        """
+        current_time = datetime.datetime.now()
+        delta_time = current_time - self.last_reset_time
+        self.idle_counter = int(delta_time.total_seconds())
 
     def check_ts_counter(self, _uri):
         """
         Providers sometime add the same stream section back into the list.
         This methods catches this and informs the caller that it should be ignored.
-        """            
+        """
         # counter = self.tc_match.findall(uri_decoded)
         # if len(counter) != 0:
-            # counter = counter[0]
+        # counter = counter[0]
         # else:
-            # counter = -1
+        # counter = -1
         # self.logger.debug('ts counter={}'.format(counter))
         if _uri == self.last_ts_filename:
-            self.logger.warning('TC Counter Same section being transmitted, ignoring uri: {} m3u8pid:{} proxypid:{}' \
-                .format(_uri, self.t_m3u8.pid, os.getpid()))
+            self.logger.notice(
+                'TC Counter Same section being transmitted, ignoring uri: {} m3u8pid:{} proxypid:{}'
+                .format(_uri, self.t_m3u8_pid, os.getpid()))
             return False
         self.last_ts_filename = _uri
         return True
@@ -300,38 +398,74 @@ def start_m3u8_queue_process(self):
             time.sleep(0.01)
             if InternalProxy.is_m3u8_starting == threading.get_ident():
                 break
+        ch_num = self.channel_dict['display_number']
+        namespace = self.channel_dict['namespace']
+        scan_list = WebHTTPHandler.rmg_station_scans[namespace]
+        tuner = scan_list[self.tuner_no]
+        m3u8_out_queue = None
+
+        if isinstance(tuner, dict) \
+                and tuner['ch'] == ch_num \
+                and tuner['instance'] == self.instance:
+
+            if not tuner['mux']:
+                # new tuner case
+                m3u8_out_queue = Queue(maxsize=MAX_OUT_QUEUE_SIZE)
+                self.t_queue = ThreadQueue(m3u8_out_queue, self.config)
+                self.t_queue.add_thread(threading.get_ident(), self.out_queue)
+                self.t_queue.status_queue = self.in_queue
+                WebHTTPHandler.rmg_station_scans[namespace][self.tuner_no]['mux'] = self.t_queue
+            else:
+                # reuse tuner case
+                self.t_queue = tuner['mux']
+                self.t_queue.add_thread(threading.get_ident(), self.out_queue)
+                self.t_m3u8 = self.t_queue.remote_proc
+                self.t_m3u8_pid = self.t_queue.remote_proc.pid
+                self.in_queue = self.t_queue.status_queue
+
         while not is_running and restarts > 0:
             restarts -= 1
             # Process is not thread safe.  Must do the same target, one at a time.
-            self.t_m3u8 = Process(target=m3u8_queue.start, args=(
-                self.config, self.plugins, self.in_queue, self.out_queue, self.channel_dict,))
-            self.t_m3u8.start()
-            self.in_queue.put({'uri': 'status'})
-            time.sleep(0.1)
-            tries = 0
-            while self.out_queue.empty() and tries < max_tries:
-                tries += 1
-                time.sleep(0.2)
-            if tries >= max_tries:
-                self.m3u8_terminate()
+            self.in_queue.put({'thread_id': threading.get_ident(), 'uri': 'status'})
+            self.logger.debug('3 Requesting status from m3u8_queue {}'.format(self.t_m3u8_pid))
+
+            if m3u8_out_queue:
+                self.logger.debug('Starting m3u8 queue process')
+                self.t_m3u8 = Process(target=m3u8_queue.start, args=(
+                    self.config, self.plugins, self.in_queue, m3u8_out_queue, self.channel_dict,))
+                self.t_m3u8.start()
+                self.t_queue.remote_proc = self.t_m3u8
+                self.t_m3u8_pid = self.t_m3u8.pid
+
+                time.sleep(0.1)
                 tries = 0
-            else:
-                try:
-                    # queue is not empty, but it sticks here anyway...
-                    status = self.out_queue.get(False, 3)
-                except Empty:
+                while self.out_queue.empty() and tries < max_tries:
+                    tries += 1
+                    time.sleep(0.2)
+                if tries >= max_tries:
                     self.m3u8_terminate()
-                    tries = 0
-                    continue
-
-                if status['uri'] == 'terminate':
-                    InternalProxy.is_m3u8_starting = False
-                    return False
-                elif status['uri'] == 'running':
-                    is_running = True
                 else:
-                    self.logger.warning('Unknown response from m3u8queue: {}' \
-                        .format(status['uri']))
+                    try:
+                        # queue is not empty, but it sticks here anyway...
+                        status = self.out_queue.get(False, 3)
+                    except queue.Empty:
+                        self.m3u8_terminate()
+                        continue
+
+                    if status['uri'] == 'terminate':
+                        self.logger.debug('Receive request to terminate from m3u8_queue {}'.format(self.t_m3u8_pid))
+                        InternalProxy.is_m3u8_starting = False
+                        return False
+                    elif status['uri'] == 'running':
+                        self.logger.debug('2 Status of Running returned from m3u8_queue {}'.format(self.t_m3u8_pid))
+                        is_running = True
+                    else:
+                        self.logger.warning(
+                            'Unknown response from m3u8queue: {}'
+                            .format(status['uri']))
+            else:
+                is_running = True
+
         InternalProxy.is_m3u8_starting = False
         return restarts > 0
 
@@ -340,18 +474,22 @@ def m3u8_terminate(self):
             try:
                 self.in_queue.get()
                 time.sleep(0.1)
-            except (Empty, EOFError) as e:
+            except (queue.Empty, EOFError):
                 pass
-        self.t_m3u8.terminate()
-        self.t_m3u8.join()
-        self.logger.debug('m3u8_queue did not start correctly, restarting {}' \
+        if self.t_m3u8:
+            self.t_m3u8.terminate()
+            self.t_m3u8.join()
+        self.logger.debug(
+            'm3u8_queue did not start correctly, restarting {}'
             .format(self.channel_dict['uid']))
         try:
             while not self.out_queue.empty():
                 self.out_queue.get()
-        except (Empty, EOFError):
+        except (queue.Empty, EOFError):
             pass
         self.clear_queues()
-        time.sleep(0.3)
+        time.sleep(0.1)
         self.in_queue = Queue()
-        self.out_queue = Queue(maxsize=MAX_OUT_QUEUE_SIZE)
+        self.out_queue = queue.Queue(maxsize=MAX_OUT_QUEUE_SIZE)
+        self.t_queue.add_thread(threading.get_ident(), self.out_queue)
+        self.t_queue.status_queue = self.in_queue
diff --git a/lib/streams/m3u8_queue.py b/lib/streams/m3u8_queue.py
index cabf44b..a13ff3a 100644
--- a/lib/streams/m3u8_queue.py
+++ b/lib/streams/m3u8_queue.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -16,8 +16,7 @@
 substantial portions of the Software.
 """
 
-import datetime
-import http
+import httpx
 import logging
 import os
 import re
@@ -25,7 +24,7 @@
 import sys
 import threading
 import time
-import urllib.request
+import urllib.parse
 from collections import OrderedDict
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from cryptography.hazmat.backends import default_backend
@@ -44,109 +43,79 @@
 
 
 PLAY_LIST = OrderedDict()
-IN_QUEUE = None
-STREAM_QUEUE = None
-OUT_QUEUE = None
+PROCESSED_URLS = {}
+IN_QUEUE = Queue()
+OUT_QUEUE = Queue()
 TERMINATE_REQUESTED = False
-MAX_STREAM_QUEUE_SIZE = 100
-
-
-class M3U8Queue(Thread):
-    """
-    This runs as an independent process (one per stream) to get and process the 
-    data stream as fast as possible and return it to the tuner web server for 
-    output to the client.
-    """
-    is_stuck = None
-
-    def __init__(self, _config, _channel_dict):
+MAX_STREAM_QUEUE_SIZE = 20
+STREAM_QUEUE = Queue()
+OUT_QUEUE_LIST = []
+HTTP_TIMEOUT=8
+HTTP_RETRIES=3
+PARALLEL_DOWNLOADS=3
+IS_VOD = False
+UID_COUNTER = 1
+UID_PROCESSED = 1
+
+class M3U8GetUriData(Thread):
+    def __init__(self, _queue_item, _uid_counter, _config):
+        global TERMINATE_REQUESTED
         Thread.__init__(self)
-        self.logger = logging.getLogger(__name__+str(threading.get_ident()))
+        self.queue_item = _queue_item
+        self.uid_counter = _uid_counter
+        self.video = Video(_config)
         self.config = _config
-        self.namespace = _channel_dict['namespace'].lower()
+        self.logger = logging.getLogger(__name__ + str(threading.get_ident()))
         self.pts_validation = None
-        self.initialized_psi = False
-        self.first_segment = True
-        self.config_section = utils.instance_config_section(_channel_dict['namespace'], _channel_dict['instance'])
-        self.atsc_msg = ATSCMsg()
-        self.channel_dict = _channel_dict
-        if self.config[self.config_section]['player-enable_pts_filter']:
-            self.pts_validation = PTSValidation(_config, _channel_dict)
-        self.video = Video(self.config)
-        self.atsc = _channel_dict['atsc']
-        if _channel_dict['json'].get('Header') is None:
-            self.header = {'User-agent': utils.DEFAULT_USER_AGENT}
-        else:
-            self.header = _channel_dict['json']['Header']
-        if _channel_dict['json'].get('use_date_on_m3u8_key') is None:
-            self.use_date_on_key = True
-        else:
-            self.use_date_on_key = _channel_dict['json']['use_date_on_m3u8_key']
-        
-        self.pts_resync = PTSResync(_config, self.config_section, _channel_dict['uid'])
-        self.key_list = {}
-        self.start()
+        if _config[M3U8Queue.config_section]['player-enable_pts_filter']:
+            self.pts_validation = PTSValidation(_config, M3U8Queue.channel_dict)
+        if not TERMINATE_REQUESTED:
+            self.start()
 
-    @handle_url_except()
-    def get_uri_data(self, _uri):
-        req = urllib.request.Request(_uri, headers=self.header)
-        with urllib.request.urlopen(req, timeout=10) as resp:
-            x = resp.read()
-        return x
-    
     def run(self):
-        global OUT_QUEUE
+        global UID_COUNTER
+        global UID_PROCESSED
         global STREAM_QUEUE
         global TERMINATE_REQUESTED
-        try:
-            while not TERMINATE_REQUESTED:
-                queue_item = STREAM_QUEUE.get()
-                if queue_item['uri_dt'] == 'terminate':
-                    time.sleep(0.01)
-                    break
-                elif queue_item['uri_dt'] == 'status':
-                    OUT_QUEUE.put({'uri': 'running',
-                        'data': None,
-                        'stream': None,
-                        'atsc': None})
-                    time.sleep(0.01)
-                    continue
-                self.process_m3u8_item(queue_item)
-        except (KeyboardInterrupt, EOFError):
-            TERMINATE_REQUESTED = True
-            self.pts_resync.terminate()
-            self.clear_queues()
-            sys.exit()
-        except Exception as ex:
-            TERMINATE_REQUESTED = True
-            STREAM_QUEUE.put({'uri_dt': 'terminate'})
-            IN_QUEUE.put({'uri': 'terminate'})
-            if self.pts_resync is not None:
-                self.pts_resync.terminate()
-            self.clear_queues()
-            time.sleep(0.01)
-            self.logger.exception('{}{}'.format(
-                'UNEXPECTED EXCEPTION M3U8Queue=', ex))
-            sys.exit()
-        # we are terminating so cleanup ffmpeg
-        if self.pts_resync is not None:
-            self.pts_resync.terminate()
-        self.clear_queues()
-                
+        self.logger.trace('M3U8GetUriData started {} {} {}'.format(self.queue_item['data']['uri'], os.getpid(), threading.get_ident()))
+        m3u8_data = self.process_m3u8_item(self.queue_item)
+        if not TERMINATE_REQUESTED:
+            PROCESSED_URLS[self.uid_counter] = m3u8_data
+            STREAM_QUEUE.put({'uri_dt': 'check_processed_list'})
+        self.logger.trace('M3U8GetUriData terminated COUNTER {} {} {}'.format(self.uid_counter, os.getpid(), threading.get_ident()))
+        m3u8_data = None
+        self.queue_item = None
+        self.uid_counter = None
+        self.video = None
+        self.pts_validation = None
+        self.logger = None
+
+
+    @handle_url_except()
+    def get_uri_data(self, _uri, _retries):
+        """
+        _retries is used by the decorator when a HTTP failure occurs
+        """
+        global HTTP_TIMEOUT
+        resp = M3U8Queue.http_session.get(_uri, headers=M3U8Queue.http_header, timeout=HTTP_TIMEOUT)
+        x = resp.content
+        resp.raise_for_status()
+        return x
 
     def decrypt_stream(self, _data):
+        global HTTP_RETRIES
         if _data['key'] and _data['key']['uri']:
-            if _data['key']['uri'] in self.key_list.keys():
-                key_data = self.key_list[_data['key']['uri']]
+            if _data['key']['uri'] in M3U8Queue.key_list.keys():
+                key_data = M3U8Queue.key_list[_data['key']['uri']]
                 self.logger.debug('Reusing key {} {}'.format(os.getpid(), _data['key']['uri']))
             elif not _data['key']['uri'].startswith('http'):
                 self.logger.warning('Unknown protocol, aborting {} {}'.format(os.getpid(), _data['key']['uri']))
                 return False
             else:
-                key_data = self.get_uri_data(_data['key']['uri'])
+                key_data = self.get_uri_data(_data['key']['uri'], HTTP_RETRIES)
 
             if key_data is not None:
-                self.key_list[_data['key']['uri']] = key_data
+                M3U8Queue.key_list[_data['key']['uri']] = key_data
                 if _data['key']['iv'] is None:
                     # if iv is none, use a random value
                     iv = bytearray.fromhex('000000000000000000000000000000F6')
@@ -157,139 +126,272 @@ def decrypt_stream(self, _data):
                 cipher = Cipher(algorithms.AES(key_data), modes.CBC(iv), default_backend())
                 decryptor = cipher.decryptor()
                 self.video.data = decryptor.update(self.video.data)
-        if len(self.key_list.keys()) > 20:
-            del self.key_list[list(self.key_list)[0]]
+        if len(M3U8Queue.key_list.keys()) > 20:
+            del M3U8Queue.key_list[list(M3U8Queue.key_list)[0]]
         return True
 
     def atsc_processing(self):
-        if self.atsc is None:
-            p_list = self.atsc_msg.extract_psip(self.video.data)
+        if not M3U8Queue.atsc:
+            p_list = M3U8Queue.atsc_msg.extract_psip(self.video.data)
             if len(p_list) != 0:
-                self.atsc = p_list
-                self.channel_dict['atsc'] = p_list
-                self.initialized_psi = True
+                M3U8Queue.atsc = p_list
+                M3U8Queue.channel_dict['atsc'] = p_list
+                M3U8Queue.initialized_psi = True
                 return p_list
 
-        elif not self.initialized_psi:
-            p_list = self.atsc_msg.extract_psip(self.video.data)
-            if len(self.atsc) != len(p_list):
-                self.atsc = p_list
-                self.channel_dict['atsc'] = p_list
-                self.initialized_psi = True
+        elif not M3U8Queue.initialized_psi:
+            p_list = M3U8Queue.atsc_msg.extract_psip(self.video.data)
+            if len(M3U8Queue.atsc) < len(p_list):
+                M3U8Queue.atsc = p_list
+                M3U8Queue.channel_dict['atsc'] = p_list
+                M3U8Queue.initialized_psi = True
                 return p_list
-            for i in range(len(p_list)):
-                if p_list[i][4:] != self.atsc[i][4:]:
-                    self.atsc = p_list
-                    self.channel_dict['atsc'] = p_list
-                    self.initialized_psi = True
-                    return p_list
+            if len(M3U8Queue.atsc) == len(p_list):
+                for i in range(len(p_list)):
+                    if p_list[i][4:] != M3U8Queue.atsc[i][4:]:
+                        M3U8Queue.atsc = p_list
+                        M3U8Queue.channel_dict['atsc'] = p_list
+                        M3U8Queue.initialized_psi = True
+                        is_changed = True
+                        return p_list
         return None
 
+    def is_pts_valid(self):
+        if self.pts_validation is None:
+            return True
+        results = self.pts_validation.check_pts(self.video)
+        if results['byteoffset'] != 0:
+            return False
+        if results['refresh_stream']:
+            return False
+        if results['reread_buffer']:
+            return False
+        return True
+
+    def get_stream_from_atsc(self):
+        if M3U8Queue.atsc is not None:
+            return M3U8Queue.atsc_msg.format_video_packets(M3U8Queue.atsc)
+        else:
+            self.logger.info(''.join([
+                'No ATSC msg available during filtered content, ',
+                'recommend running this channel again to catch the ATSC msg.']))
+            return M3U8Queue.atsc_msg.format_video_packets()
+
     def process_m3u8_item(self, _queue_item):
+        global IS_VOD
         global TERMINATE_REQUESTED
         global PLAY_LIST
         global OUT_QUEUE
+        global UID_PROCESSED
+        global HTTP_RETRIES
         uri_dt = _queue_item['uri_dt']
         data = _queue_item['data']
         if data['filtered']:
-            OUT_QUEUE.put({'uri': uri_dt[0],
-                'data': data,
-                'stream': self.get_stream_from_atsc(),
-                'atsc': None})
             PLAY_LIST[uri_dt]['played'] = True
-            time.sleep(0.01)
+            return {'uri': data['uri'],
+                           'data': data,
+                           'stream': self.get_stream_from_atsc(),
+                           'atsc': None}
         else:
-            count = 1
-            while True:
-                self.video.data = self.get_uri_data(uri_dt[0])
-                break
+            if IS_VOD:
+                count = self.config['stream']['vod_retries']
+            else:
+                count = 1
+            while count > 0:
+                self.video.data = self.get_uri_data(data['uri'], HTTP_RETRIES)
+                if self.video.data:
+                    break
+
+                # TBD WHAT TO DO WITH THIS?
+                if count > 1:
+                    out_queue_put({'uri': 'extend',
+                                   'data': data,
+                                   'stream': None,
+                                   'atsc': None})
+                count -= 1
 
             if uri_dt not in PLAY_LIST.keys():
+                self.logger.debug('{} uri_dt not in PLAY_LIST keys {}'.format(os.getpid(), uri_dt))
                 return
             if self.video.data is None:
                 PLAY_LIST[uri_dt]['played'] = True
-                OUT_QUEUE.put({'uri': uri_dt[0],
-                    'data': data,
-                    'stream': None,
-                    'atsc': None
-                    })
-                return
+                return {'uri': data['uri'],
+                               'data': data,
+                               'stream': None,
+                               'atsc': None
+                               }
             if not self.decrypt_stream(data):
                 # terminate if stream is not decryptable
-                OUT_QUEUE.put({'uri': 'terminate',
-                    'data': data,
-                    'stream': None,
-                    'atsc': None})
                 TERMINATE_REQUESTED = True
-                self.pts_resync.terminate()
-                self.clear_queues()
+                M3U8Queue.pts_resync.terminate()
+                M3U8Queue.pts_resync = None
+                clear_queues()
                 PLAY_LIST[uri_dt]['played'] = True
-                time.sleep(0.01)
-                return
+                return {'uri': 'terminate',
+                               'data': data,
+                               'stream': None,
+                               'atsc': None}
             if not self.is_pts_valid():
                 PLAY_LIST[uri_dt]['played'] = True
-                OUT_QUEUE.put({'uri': uri_dt[0],
-                    'data': data,
-                    'stream': None,
-                    'atsc': None
-                    })
-                return
-                
-            if self.first_segment:
-                #print('writing out FIRST segment')
-                self.first_segment = False
-                #print('writing out FIRST segment')
-            
-            self.pts_resync.resequence_pts(self.video)
-            if self.video.data is None:
-                OUT_QUEUE.put({'uri': uri_dt[0],
-                    'data': data,
-                    'stream': self.video.data,
-                    'atsc': None})
-                PLAY_LIST[uri_dt]['played'] = True
-                time.sleep(0.01)
-                return
+                return {'uri': data['uri'],
+                               'data': data,
+                               'stream': None,
+                               'atsc': None
+                               }
+
             atsc_default_msg = self.atsc_processing()
-            OUT_QUEUE.put({'uri': uri_dt[0],
-                'data': data,
-                'stream': self.video.data,
-                'atsc': atsc_default_msg
-                })
             PLAY_LIST[uri_dt]['played'] = True
-            time.sleep(0.01)
+            if self.uid_counter > UID_PROCESSED+1:
+                out_queue_put({'uri': 'extend',
+                               'data': data,
+                               'stream': None,
+                               'atsc': None})
+            return {'uri': data['uri'],
+                           'data': data,
+                           'stream': self.video.data,
+                           'atsc': atsc_default_msg
+                           }
 
-    def is_pts_valid(self):
-        if self.pts_validation is None:
-            return True
-        before = len(self.video.data)
-        results = self.pts_validation.check_pts(self.video)
-        if results['byteoffset'] != 0:
-            return False
-        if results['refresh_stream']:
-            return False
-        if results['reread_buffer']:
-            return False
-        return True
 
-    def get_stream_from_atsc(self):
-        if self.atsc is not None:
-            return self.atsc_msg.format_video_packets(self.atsc)
+class M3U8Queue(Thread):
+    """
+    This runs as an independent process (one per stream) to get and process the 
+    data stream as fast as possible and return it to the tuner web server for 
+    output to the client.
+    """
+    is_stuck = None
+    http_session = httpx.Client(http2=True, verify=False, follow_redirects=True)
+    http_header = None
+    key_list = {}
+    config_section = None
+    channel_dict = None
+    pts_resync = None
+    atsc = None
+    atsc_msg = None
+    initialized_psi = False
+
+
+    def __init__(self, _config, _channel_dict):
+        Thread.__init__(self)
+        self.video = Video(_config)
+        self.q_action = None
+        self.logger = logging.getLogger(__name__ + str(threading.get_ident()))
+        self.config = _config
+        self.namespace = _channel_dict['namespace'].lower()
+        M3U8Queue.config_section = utils.instance_config_section(_channel_dict['namespace'], _channel_dict['instance'])
+        M3U8Queue.channel_dict = _channel_dict
+        M3U8Queue.atsc_msg = ATSCMsg()
+        self.channel_dict = _channel_dict
+        M3U8Queue.atsc = _channel_dict['atsc']
+        if _channel_dict['json'].get('Header') is None:
+            M3U8Queue.http_header = {'User-agent': utils.DEFAULT_USER_AGENT}
         else:
-            self.logger.info(''.join([
-                'No ATSC msg available during filtered content, ',
-                'recommend running this channel again to catch the ATSC msg.']))
-            return self.atsc_msg.format_video_packets()
+            M3U8Queue.http_header = _channel_dict['json']['Header']
+        if _channel_dict['json'].get('use_date_on_m3u8_key') is None:
+            self.use_date_on_key = True
+        else:
+            self.use_date_on_key = _channel_dict['json']['use_date_on_m3u8_key']
 
-    def clear_queues(self):
-        global STREAM_QUEUE
+        M3U8Queue.pts_resync = PTSResync(_config, self.config_section, _channel_dict['uid'])
+        self.start()
+
+
+    def run(self):
         global OUT_QUEUE
-        global IN_QUEUE
-        # closing a multiporcessing queue with 'close' without emptying it will prevent a process dependant on that queue 
-        # from terminating and fulfilling a 'join' if there was an entry in the queue
-        # so we need to proactivley clear all queue entries instead of closing the queues
-        clear_q(STREAM_QUEUE)
-        clear_q(OUT_QUEUE)
-        clear_q(IN_QUEUE)
+        global STREAM_QUEUE
+        global TERMINATE_REQUESTED
+        global UID_COUNTER
+        global UID_PROCESSED
+        global PARALLEL_DOWNLOADS
+        global PROCESSED_URLS
+        global IS_VOD
+        try:
+            while not TERMINATE_REQUESTED:
+                queue_item = STREAM_QUEUE.get()
+                self.q_action = queue_item['uri_dt']
+                if queue_item['uri_dt'] == 'terminate':
+                    self.logger.debug('Received terminate from internalproxy {}'.format(os.getpid()))
+                    TERMINATE_REQUESTED = True
+                    
+                    break
+                elif queue_item['uri_dt'] == 'status':
+                    out_queue_put({'uri': 'running',
+                                   'data': None,
+                                   'stream': None,
+                                   'atsc': None})
+                    continue
+                elif queue_item['uri_dt'] == 'check_processed_list':
+                    self.logger.debug('#### Received check_processed_list request {}  Received: {}  Processed: {}  Processed_Queue: {}  Incoming_Queue: {}'
+                        .format(os.getpid(), UID_COUNTER, UID_PROCESSED, len(PROCESSED_URLS), STREAM_QUEUE.qsize()))
+                    self.check_processed_list()
+                    continue
+
+                self.logger.debug('**** Running check_processed_list {}  Received: {}  Processed: {}  Processed_Queue: {}  Incoming_Queue: {}'
+                    .format(os.getpid(), UID_COUNTER, UID_PROCESSED, len(PROCESSED_URLS), STREAM_QUEUE.qsize()))
+                self.check_processed_list()
+                while UID_COUNTER - UID_PROCESSED - len(PROCESSED_URLS) > PARALLEL_DOWNLOADS+1:
+                    self.logger.debug('Slowed Processing: {}  Received: {}  Processed: {}  Processed_Queue: {}  Incoming_Queue: {}'
+                        .format(os.getpid(), UID_COUNTER, UID_PROCESSED, len(PROCESSED_URLS), STREAM_QUEUE.qsize()))
+                    time.sleep(.5)
+                    self.check_processed_list()
+                    if TERMINATE_REQUESTED:
+                        break
+                self.process_queue = M3U8GetUriData(queue_item, UID_COUNTER, self.config)
+                if IS_VOD:
+                    time.sleep(0.1)
+                else:
+                    time.sleep(1.0)
+                UID_COUNTER += 1
+        except (KeyboardInterrupt, EOFError) as ex:
+            TERMINATE_REQUESTED = True
+            clear_queues()
+            if self.pts_resync is not None:
+                self.pts_resync.terminate()
+                self.pts_resync = None
+            time.sleep(0.01)
+            sys.exit()
+        except Exception as ex:
+            TERMINATE_REQUESTED = True
+            STREAM_QUEUE.put({'uri_dt': 'terminate'})
+            IN_QUEUE.put({'uri': 'terminate'})
+            if self.pts_resync is not None:
+                self.pts_resync.terminate()
+                self.pts_resync = None
+            clear_queues()
+            time.sleep(0.01)
+            self.logger.exception('{}'.format(
+                'UNEXPECTED EXCEPTION M3U8Queue='))
+            sys.exit()
+        # we are terminating so cleanup ffmpeg
+        if self.pts_resync is not None:
+            self.pts_resync.terminate()
+            self.pts_resync = None
+        time.sleep(0.01)
+        out_queue_put({'uri': 'terminate',
+                       'data': None,
+                       'stream': None,
+                       'atsc': None})
+        PROCESSED_URLS.clear()
+        time.sleep(0.01)
+        TERMINATE_REQUESTED = True
+        self.logger.debug('M3U8Queue terminated {}'.format(os.getpid()))
+
+
+    def check_processed_list(self):
+        global UID_PROCESSED
+        global PROCESSED_URLS
+        if len(PROCESSED_URLS) > 0:
+            first_key = sorted(PROCESSED_URLS.keys())[0]
+            if first_key == UID_PROCESSED:
+                self.video.data = PROCESSED_URLS[first_key]['stream']
+                M3U8Queue.pts_resync.resequence_pts(self.video)
+                if self.video.data is None and self.q_action != 'check_processed_list':
+                    PLAY_LIST[self.q_action]['played'] = True
+                PROCESSED_URLS[first_key]['stream'] = self.video.data
+                
+                out_queue_put(PROCESSED_URLS[first_key])
+                del PROCESSED_URLS[first_key]
+                UID_PROCESSED += 1
 
 
 class M3U8Process(Thread):
@@ -298,12 +400,13 @@ class M3U8Process(Thread):
     Includes managing the processing queue and providing
     the M3U8Queue with what to process.
     """
+
     def __init__(self, _config, _plugins, _channel_dict):
+        global HTTP_TIMEOUT
+        global HTTP_RETRIES
+        global PARALLEL_DOWNLOADS
         Thread.__init__(self)
-        self.logger = logging.getLogger(__name__+str(threading.get_ident()))
-        global IN_QUEUE
-        global OUT_QUEUE
-        global TERMINATE_REQUESTED
+        self.logger = logging.getLogger(__name__ + str(threading.get_ident()))
         self.config = _config
         self.channel_dict = _channel_dict
         if _channel_dict['json'].get('Header') is None:
@@ -314,102 +417,112 @@ def __init__(self, _config, _plugins, _channel_dict):
             self.use_date_on_key = True
         else:
             self.use_date_on_key = _channel_dict['json']['use_date_on_m3u8_key']
-        
+
+        self.ch_uid = _channel_dict['uid']
         self.is_starting = True
         self.last_refresh = time.time()
         self.plugins = _plugins
+        HTTP_TIMEOUT = self.config[_channel_dict['namespace'].lower()]['stream-g_http_timeout']
+        HTTP_RETRIES = self.config[_channel_dict['namespace'].lower()]['stream-g_http_retries']
+        PARALLEL_DOWNLOADS = self.config[_channel_dict['namespace'].lower()]['stream-g_concurrent_downloads']
         self.config_section = utils.instance_config_section(_channel_dict['namespace'], _channel_dict['instance'])
-        i = 5
-        while i > 0 and IN_QUEUE.empty():
-            i -= 1
-            time.sleep(0.02)
-        if IN_QUEUE.empty():
-            self.logger.warning('1Corrupted queue, restarting process {} {}'.format(_channel_dict['uid'], os.getpid()))
-            TERMINATE_REQUESTED = True
-            time.sleep(0.01)
-            return
-        time.sleep(0.01)
-        try:
-            queue_item = IN_QUEUE.get(False, 1)
-        except Empty:
-            self.logger.debug('2Corrupted queue, restarting process {} {}'.format(_channel_dict['uid'], os.getpid()))
-            TERMINATE_REQUESTED = True
-            time.sleep(0.01)
-            return
+        self.use_full_duplicate_checking = self.config[self.config_section]['player-enable_full_duplicate_checking']
 
-        self.stream_uri = self.get_stream_uri()
-        if not self.stream_uri:
-            self.logger.warning('Unknown Channel {}'.format(_channel_dict['uid']))
-            OUT_QUEUE.put({'uri': 'terminate',
-                'data': None,
-                'stream': None,
-                'atsc': None})
-            TERMINATE_REQUESTED = True
-            time.sleep(0.01)
-            return
-        else:
-            OUT_QUEUE.put({'uri': 'running',
-                'data': None,
-                'stream': None,
-                'atsc': None})
-            time.sleep(0.01)
         self.is_running = True
         self.duration = 6
         self.m3u8_q = M3U8Queue(_config, _channel_dict)
+        time.sleep(0.1)
+        self.file_filter = None
         self.start()
 
     def run(self):
+        global IS_VOD
+        global IN_QUEUE
+        global OUT_QUEUE
         global TERMINATE_REQUESTED
+
+        self.stream_uri = self.get_stream_uri()
+        if not self.stream_uri:
+            self.logger.warning('Unknown Channel {}'.format(self.ch_uid))
+            out_queue_put({'uri': 'terminate',
+                           'data': None,
+                           'stream': None,
+                           'atsc': None})
+            time.sleep(0.01)
+            self.terminate()
+            self.m3u8_q.join()
+            TERMINATE_REQUESTED = True
+            self.logger.debug('1 M3U8Process terminated {}'.format(os.getpid()))
+            return
+        else:
+            out_queue_put({'uri': 'running',
+                           'data': None,
+                           'stream': None,
+                           'atsc': None})
+            time.sleep(0.01)
+
         try:
             self.logger.debug('M3U8: {} {}'.format(self.stream_uri, os.getpid()))
-            self.file_filter = None
             if self.config[self.config_section]['player-enable_url_filter']:
                 stream_filter = self.config[self.config_section]['player-url_filter']
                 if stream_filter is not None:
                     self.file_filter = re.compile(stream_filter)
                 else:
                     self.logger.warning('[{}]][player-enable_url_filter]'
-                        ' enabled but [player-url_filter] not set'
-                        .format(self.config_section))
+                                        ' enabled but [player-url_filter] not set'
+                                        .format(self.config_section))
             while not TERMINATE_REQUESTED:
                 added = 0
                 removed = 0
                 self.logger.debug('Reloading m3u8 stream queue {}'.format(os.getpid()))
-                playlist = self.get_m3u8_data(self.stream_uri)
+                playlist = self.get_m3u8_data(self.stream_uri, 2)
                 if playlist is None:
-                    self.logger.debug('Playlist is none, terminating stream')
-                    break
+                    self.logger.debug('M3U Playlist is None, retrying')
+                    self.sleep(self.duration+0.5)
+                    continue
+                if playlist.playlist_type == 'vod' or self.config[self.config_section]['player-play_all_segments']:
+                    if not IS_VOD:
+                        self.logger.debug('Setting stream type to VOD {}'.format(os.getpid()))
+                        IS_VOD = True
+                elif IS_VOD:
+                    self.logger.debug('Setting stream type to non-VOD {}'.format(os.getpid()))
+                    IS_VOD = False
                 removed += self.remove_from_stream_queue(playlist)
                 added += self.add_to_stream_queue(playlist)
                 if self.plugins.plugins[self.channel_dict['namespace']].plugin_obj \
                         .is_time_to_refresh_ext(self.last_refresh, self.channel_dict['instance']):
                     self.stream_uri = self.get_stream_uri()
-                    self.logger.debug('M3U8: {} {}' \
-                        .format(self.stream_uri, os.getpid()))
+                    self.logger.debug('M3U8: {} {}'
+                                      .format(self.stream_uri, os.getpid()))
                     self.last_refresh = time.time()
-                    self.sleep(0.3)
-                elif added == 0 and self.duration > 0:
-                    self.sleep(0.8)
-                else:
-                    self.sleep(0.8)
+                    time.sleep(0.3)
+                elif self.duration > 0.5:
+                    self.sleep(self.duration+0.5)
         except Exception as ex:
-            self.logger.exception('{}{}'.format(
-                'UNEXPECTED EXCEPTION M3U8Process=', ex))
+            self.logger.exception('{}'.format(
+                'UNEXPECTED EXCEPTION M3U8Process='))
         self.terminate()
         # wait for m3u8_q to finish so it can cleanup ffmpeg
         self.m3u8_q.join()
+        TERMINATE_REQUESTED = True
+        self.logger.debug('M3U8Process terminated {}'.format(os.getpid()))
 
     def sleep(self, _time):
-        for i in range(round(_time*10)):
+        global TERMINATE_REQUESTED
+        start_ttw = time.time()
+        for i in range(round(_time * 5)):
             if not TERMINATE_REQUESTED:
-                time.sleep(self.duration * 0.1)
+                time.sleep(self.duration * 0.2)
+            delta_ttw = time.time() - start_ttw
+            if delta_ttw > _time:
+                break
 
     def terminate(self):
         global STREAM_QUEUE
         try:
             STREAM_QUEUE.put({'uri_dt': 'terminate'})
             time.sleep(0.01)
-        except ValueError:
+        except ValueError as ex:
             pass
 
     def get_stream_uri(self):
@@ -417,10 +530,9 @@ def get_stream_uri(self):
             .plugin_obj.get_channel_uri_ext(self.channel_dict['uid'], self.channel_dict['instance'])
 
     @handle_url_except()
-    @handle_json_except
-    def get_m3u8_data(self, _uri):
+    def get_m3u8_data(self, _uri, _retries):
         # it sticks here.  Need to find a work around for the socket.timeout per process
-        return m3u8.load(_uri, headers=self.header)
+        return m3u8.load(_uri, headers=self.header, http_session=M3U8Queue.http_session)
 
     def segment_date_time(self, _segment):
         if _segment:
@@ -429,18 +541,17 @@ def segment_date_time(self, _segment):
             return None
         return _segment.current_program_date_time.replace(microsecond=0)
 
-
     def add_to_stream_queue(self, _playlist):
         global PLAY_LIST
         global STREAM_QUEUE
         global TERMINATE_REQUESTED
         total_added = 0
         if _playlist.keys != [None]:
-            keys = [{"uri": key.absolute_uri, "method": key.method, "iv": key.iv} \
-                for key in _playlist.keys if key]
+            keys = [{"uri": key.absolute_uri, "method": key.method, "iv": key.iv}
+                    for key in _playlist.keys if key]
             if len(keys) != len(_playlist.segments):
-                keys = [{"uri": keys[0]['uri'], "method": keys[0]['method'], "iv": keys[0]['iv']} \
-                    for i in range(0, len(_playlist.segments))]
+                keys = [{"uri": keys[0]['uri'], "method": keys[0]['method'], "iv": keys[0]['iv']}
+                        for i in range(0, len(_playlist.segments))]
         else:
             keys = [None for i in range(0, len(_playlist.segments))]
         num_segments = len(_playlist.segments)
@@ -450,10 +561,10 @@ def add_to_stream_queue(self, _playlist):
                 seg_to_play = num_segments
             elif seg_to_play > num_segments:
                 seg_to_play = num_segments
-            
-            skipped_seg = num_segments-seg_to_play
-            #total_added += self.add_segment(_playlist.segments[0], keys[0])
-            
+
+            skipped_seg = num_segments - seg_to_play
+            # total_added += self.add_segment(_playlist.segments[0], keys[0])
+
             for m3u8_segment, key in zip(_playlist.segments[0:skipped_seg], keys[0:skipped_seg]):
                 total_added += self.add_segment(m3u8_segment, key, _default_played=True)
             for i in range(skipped_seg, num_segments):
@@ -468,7 +579,10 @@ def add_to_stream_queue(self, _playlist):
                 last_key = list(PLAY_LIST.keys())[-1]
                 i = 0
                 for index, segment in enumerate(reversed(_playlist.segments)):
-                    uri = segment.absolute_uri
+                    if self.use_full_duplicate_checking:
+                        uri = segment.absolute_uri
+                    else:
+                        uri = segment.get_path_from_uri()
                     dt = self.segment_date_time(segment)
                     if self.use_date_on_key:
                         uri_dt = (uri, dt)
@@ -476,13 +590,8 @@ def add_to_stream_queue(self, _playlist):
                         uri_dt = (uri, 0)
                     if last_key == uri_dt:
                         i = num_segments - index
-            remaining_segs = num_segments - i
-            for m3u8_segment, key in zip(_playlist \
-                    .segments[i:num_segments], keys[i:num_segments]):
-                remaining_segs -= 1
-                if remaining_segs < 1:
-                    # delay is this is the last segment to add from the provider
-                    time.sleep(2)
+            for m3u8_segment, key in zip(
+                    _playlist.segments[i:num_segments], keys[i:num_segments]):
                 added = self.add_segment(m3u8_segment, key)
                 total_added += added
                 if added == 0 or TERMINATE_REQUESTED:
@@ -493,7 +602,11 @@ def add_to_stream_queue(self, _playlist):
     def add_segment(self, _segment, _key, _default_played=False):
         global TERMINATE_REQUESTED
         self.set_cue_status(_segment)
-        uri = _segment.absolute_uri
+        if self.use_full_duplicate_checking:
+            uri = _segment.absolute_uri
+        else:
+            uri = _segment.get_path_from_uri()
+        uri_full = _segment.absolute_uri
         dt = self.segment_date_time(_segment)
         if self.use_date_on_key:
             uri_dt = (uri, dt)
@@ -504,11 +617,12 @@ def add_segment(self, _segment, _key, _default_played=False):
             filtered = False
             cue_status = self.set_cue_status(_segment)
             if self.file_filter is not None:
-                m = self.file_filter.match(urllib.parse.unquote(uri))
+                m = self.file_filter.match(urllib.parse.unquote(uri_full))
                 if m:
                     filtered = True
             PLAY_LIST[uri_dt] = {
                 'uid': self.channel_dict['uid'],
+                'uri': uri_full,
                 'played': played,
                 'filtered': filtered,
                 'duration': _segment.duration,
@@ -516,20 +630,23 @@ def add_segment(self, _segment, _key, _default_played=False):
                 'key': _key
             }
             if _segment.duration > 0:
-                self.duration = _segment.duration
+                # use geometric averaging of 4 items
+                self.duration = (self.duration*3 + _segment.duration)/4
             try:
                 if not played and not TERMINATE_REQUESTED:
-                    self.logger.debug('Added {} to play queue {}' \
-                        .format(uri, os.getpid()))
+                    self.logger.debug('Added {} to play queue {}'
+                                      .format(uri_full, os.getpid()))
                     STREAM_QUEUE.put({'uri_dt': uri_dt,
-                        'data': PLAY_LIST[uri_dt]})
+                                      'data': PLAY_LIST[uri_dt]})
                     return 1
                 if _default_played:
-                    self.logger.debug('Skipping {} {} {}' \
-                        .format(uri, os.getpid(), _segment.program_date_time))
-            except ValueError:
+                    self.logger.debug('Skipping {} {} {}'
+                                      .format(uri_full, os.getpid(), _segment.program_date_time))
+            except ValueError as ex:
                 # queue is closed, terminating
                 pass
+        else:
+            self.logger.warning('DUPICATE FOUND {}'.format(uri_dt))
 
         return 0
 
@@ -545,27 +662,33 @@ def remove_from_stream_queue(self, _playlist):
                     disc_index = total_index - i
                     break
             for segment in _playlist.segments[disc_index:total_index]:
-                s_uri = segment.absolute_uri
+                if self.use_full_duplicate_checking:
+                    s_uri = segment.absolute_uri
+                else:
+                    s_uri = segment.get_path_from_uri()
                 s_dt = self.segment_date_time(segment)
                 if self.use_date_on_key:
                     s_key = (s_uri, s_dt)
                 else:
                     s_key = (s_uri, 0)
-                
+
                 if s_key in PLAY_LIST.keys():
                     continue
                 else:
                     try:
                         i = url_list.index(s_uri)
                         PLAY_LIST = utils.rename_dict_key(list(PLAY_LIST.keys())[i], s_key, PLAY_LIST)
-                    except ValueError:
+                    except ValueError as ex:
                         # not in list
                         pass
-            
+
         for segment_key in list(PLAY_LIST.keys()):
             is_found = False
             for segment_m3u8 in _playlist.segments:
-                s_uri = segment_m3u8.absolute_uri
+                if self.use_full_duplicate_checking:
+                    s_uri = segment_m3u8.absolute_uri
+                else:
+                    s_uri = segment_m3u8.get_path_from_uri()
                 s_dt = self.segment_date_time(segment_m3u8)
                 if self.use_date_on_key:
                     s_key = (s_uri, s_dt)
@@ -578,8 +701,8 @@ def remove_from_stream_queue(self, _playlist):
                 if PLAY_LIST[segment_key]['played']:
                     del PLAY_LIST[segment_key]
                     total_removed += 1
-                    self.logger.debug('Removed {} from play queue {}' \
-                        .format(segment_key[0], os.getpid()))
+                    self.logger.debug('Removed {} from play queue {}'
+                                      .format(segment_key[0], os.getpid()))
                 continue
             else:
                 break
@@ -593,18 +716,36 @@ def set_cue_status(self, _segment):
         else:
             return None
 
+
 def clear_q(q):
     try:
         while True:
             q.get_nowait()
-    except (Empty, ValueError, EOFError):
+    except (Empty, ValueError, EOFError) as ex:
         pass
 
+
 def clear_queues():
+    # closing a multiprocessing queue with 'close' without emptying
+    # it will prevent a process dependant on that queue
+    # from terminating and fulfilling a 'join' if there was an entry in the queue
+    # so we need to proactivley clear all queue entries instead of closing the queues
+    global STREAM_QUEUE
+    global OUT_QUEUE
+    global IN_QUEUE
     clear_q(OUT_QUEUE)
     clear_q(STREAM_QUEUE)
     clear_q(IN_QUEUE)
 
+def out_queue_put(data_dict):
+    global OUT_QUEUE
+    logger = logging.getLogger(__name__)
+    for t in OUT_QUEUE_LIST:
+        data_dict['thread_id'] = t
+        OUT_QUEUE.put(data_dict)
+        time.sleep(0.01)
+
+
 def start(_config, _plugins, _m3u8_queue, _data_queue, _channel_dict, extra=None):
     """
     All items in this process must handle a socket timeout of 5.0
@@ -613,6 +754,7 @@ def start(_config, _plugins, _m3u8_queue, _data_queue, _channel_dict, extra=None
     global STREAM_QUEUE
     global OUT_QUEUE
     global TERMINATE_REQUESTED
+    logger = None
     try:
         utils.logging_setup(_plugins.config_obj.data)
         logger = logging.getLogger(__name__)
@@ -625,32 +767,67 @@ def start(_config, _plugins, _m3u8_queue, _data_queue, _channel_dict, extra=None
             try:
                 q_item = IN_QUEUE.get()
                 if q_item['uri'] == 'terminate':
-                    TERMINATE_REQUESTED = True
+                    OUT_QUEUE_LIST.remove(q_item['thread_id'])
+                    if not len(OUT_QUEUE_LIST):
+                        TERMINATE_REQUESTED = True
+                        clear_queues()
+                    else:
+                        clear_q(OUT_QUEUE)
+                    time.sleep(0.01)
+
                     # clear queues in case queues are full (eg VOD) with queue.put stmts blocked 
                     # p_m3u8 & m3u8_q then see TERMINATE_REQUESTED and exit including stopping ffmpeg
-                    clear_queues()
+                    OUT_QUEUE.put({
+                        'thread_id': q_item['thread_id'],
+                        'uri': 'terminate',
+                        'data': None,
+                        'stream': None,
+                        'atsc': None})
+                    time.sleep(0.01)
+                    if not len(OUT_QUEUE_LIST):
+                        p_m3u8.join()
+                elif q_item['uri'] == 'status':
+                    if q_item['thread_id'] not in OUT_QUEUE_LIST:
+                        OUT_QUEUE_LIST.append(q_item['thread_id'])
+                        logger.debug('Adding client thread {} to m3u8 queue list'.format(q_item['thread_id']))
+                    STREAM_QUEUE.put({'uri_dt': 'status'})
+                    logger.debug('Sending Status request to stream queue {}'.format(os.getpid()))
+                    time.sleep(0.01)
+                elif q_item['uri'] == 'restart_http':
+                    logger.debug('HTTP Session restarted {}'.format(os.getpid()))
+                    temp_session = M3U8Queue.http_session
+                    M3U8Queue.http_session = httpx.Client(http2=True, verify=False, follow_redirects=True)
+                    temp_session.close()
+                    temp_session = None
                     time.sleep(0.01)
-                    p_m3u8.join()
-                    # finally make sure all queues are clear so that this process can be joined
-                    clear_queues()
                 else:
                     logger.debug('UNKNOWN m3u8 queue request {}'.format(q_item['uri']))
-            except (KeyboardInterrupt, EOFError, TypeError, ValueError):
+            except (KeyboardInterrupt, EOFError, TypeError, ValueError) as ex:
                 TERMINATE_REQUESTED = True
                 try:
+                    clear_queues()
+                    out_queue_put({
+                        'uri': 'terminate',
+                        'data': None,
+                        'stream': None,
+                        'atsc': None})
+                    time.sleep(0.01)
                     STREAM_QUEUE.put({'uri_dt': 'terminate'})
-                except (EOFError, TypeError, ValueError):
+                    time.sleep(0.1)
+                except (EOFError, TypeError, ValueError) as ex:
                     pass
-                time.sleep(0.01)
+                logger.debug('4 m3u8_queue process terminated {}'.format(os.getpid()))
                 sys.exit()
+        clear_queues()
+        logger.debug('1 m3u8_queue process terminated {}'.format(os.getpid()))
         sys.exit()
-
-
     except Exception as ex:
-        logger.exception('{}{}'.format(
-            'UNEXPECTED EXCEPTION startup=', str(ex)))
+        logger.exception('{}'.format(
+            'UNEXPECTED EXCEPTION startup'))
         TERMINATE_REQUESTED = True
+        logger.debug('3 m3u8_queue process terminated {}'.format(os.getpid()))
         sys.exit()
-    except KeyboardInterrupt:
+    except KeyboardInterrupt as ex:
         TERMINATE_REQUESTED = True
+        logger.debug('2 m3u8_queue process terminated {}'.format(os.getpid()))
         sys.exit()
diff --git a/lib/streams/pts_resync.py b/lib/streams/pts_resync.py
index 8a04cdd..6a8375b 100644
--- a/lib/streams/pts_resync.py
+++ b/lib/streams/pts_resync.py
@@ -16,13 +16,13 @@
 substantial portions of the Software.
 """
 
+import copy
 import logging
 import os
 import subprocess
 import time
 from threading import Thread
 
-import lib.common.utils as utils
 from .stream_queue import StreamQueue
 
 
@@ -32,37 +32,71 @@ def __init__(self, _config, _config_section, _id):
         self.logger = logging.getLogger(__name__)
         self.config = _config
         self.config_section = _config_section
+        self.empty_packet_count = 0
+        self.is_restart_requested = False
+        self.is_looping = False
         self.id = _id
-        if self.config[self.config_section]['player-pts_resync_type'] == 'ffmpeg':
-            self.ffmpeg_proc = self.open_ffmpeg_proc()
-        else:
-            self.ffmpeg_proc = None
-        self.stream_queue = StreamQueue(188, self.ffmpeg_proc, _id)
+        self.ffmpeg_proc = None
         if self.config[self.config_section]['player-enable_pts_resync']:
             if self.config[self.config_section]['player-pts_resync_type'] == 'ffmpeg':
-                self.logger.info('PTS Resync running ffmpeg')
+                self.ffmpeg_proc = self.open_ffmpeg_proc()
+            self.stream_queue = StreamQueue(188, self.ffmpeg_proc, _id)
+            if self.config[self.config_section]['player-pts_resync_type'] == 'ffmpeg':
+                self.logger.debug('PTS Resync running ffmpeg')
 
     def video_to_stdin(self, _video):
-        i = 2
+        video_copy = copy.copy(_video.data)
+        i = 3
+        self.is_looping = False
         while i > 0:
             i -= 1
             try:
-                self.ffmpeg_proc.stdin.write(_video.data)
+                if video_copy:
+                    self.ffmpeg_proc.stdin.write(video_copy)
                 break
             except (BrokenPipeError, TypeError) as ex:
                 # This occurs when the process does not start correctly
-                self.stream_queue.terminate()
+                self.logger.debug('BROKENPIPE {} {}'.format(self.ffmpeg_proc.pid, str(ex)))
+                if not self.is_restart_requested:
+                    errcode = self.restart_ffmpeg()
+                    self.is_looping = True
+                else:
+                    time.sleep(0.7)
+                    
+            except ValueError:
+                # during termination, writing to a closed port, ignore
+                break
+        self.is_looping = False
+        video_copy = None
+
+    def restart_ffmpeg(self):
+        self.logger.debug('Restarting PTSResync ffmpeg due to no ffmpeg processing {}'.format(self.ffmpeg_proc.pid))
+        errcode = 0
+        self.empty_packet_count = 0
+        self.stream_queue.terminate()
+        while True:
+            try:
                 self.ffmpeg_proc.terminate()
-                try:
-                    self.ffmpeg_proc.communicate()
-                except ValueError:
-                    pass
-                while self.ffmpeg_proc.poll() is None:
-                    time.sleep(0.1)
-                self.ffmpeg_proc = self.open_ffmpeg_proc()
+                #self.ffmpeg_proc.wait(timeout=1.5)
+                break
+            except ValueError:
+                pass
+            except subprocess.TimeoutExpired:
                 time.sleep(0.01)
-                self.logger.info('Restarting PTSResync ffmpeg due to corrupted process start {}'.format(os.getpid()))
-                self.stream_queue = StreamQueue(188, self.ffmpeg_proc, self.id)
+        try:
+            sout, serr = self.ffmpeg_proc.communicate()
+            errcode = self.ffmpeg_proc.returncode
+            # an errcode of 1 means ffmpeg could not run
+            if errcode == 1:
+                self.logger.debug('FFMPEG ERRCODE: {}, unable for pts_resync to process segment in ffmpeg'.format(self.ffmpeg_proc.returncode))
+        except ValueError:
+            pass
+        while self.ffmpeg_proc.poll() is None:
+            time.sleep(0.1)
+        self.ffmpeg_proc = self.open_ffmpeg_proc()
+        self.stream_queue = StreamQueue(188, self.ffmpeg_proc, self.id)
+        time.sleep(0.5)
+        return errcode
 
 
     def resequence_pts(self, _video):
@@ -71,9 +105,22 @@ def resequence_pts(self, _video):
         if _video.data is None:
             return
         if self.config[self.config_section]['player-pts_resync_type'] == 'ffmpeg':
+            while self.is_looping:
+                time.sleep(0.5)
             t_in = Thread(target=self.video_to_stdin, args=(_video,))
             t_in.start()
+            time.sleep(0.1)
             new_video = self.stream_queue.read()
+            if not new_video:
+                self.empty_packet_count += 1
+                if self.empty_packet_count > 2:
+                    if not self.is_restart_requested:
+                        self.is_restart_requested = True
+                        self.restart_ffmpeg()
+                        self.is_restart_requested = False
+            else:
+                self.empty_packet_count = 0
+
             _video.data = new_video
         elif self.config[self.config_section]['player-pts_resync_type'] == 'internal':
             self.logger.warning('player-pts_resync_type internal NOT IMPLEMENTED')
@@ -88,7 +135,10 @@ def terminate(self):
             self.ffmpeg_proc.stdout.flush()
             self.ffmpeg_proc.terminate()
             try:
-                self.ffmpeg_proc.communicate()
+                sout, serr = self.ffmpeg_proc.communicate()
+                errcode = self.ffmpeg_proc.returncode
+                if errcode == 1:
+                    self.logger.debug('FFMPEG errcode on exit: {}, unable for pts_resync to process segment in ffmpeg'.format(self.ffmpeg_proc.returncode))
             except ValueError:
                 pass
 
@@ -99,7 +149,8 @@ def open_ffmpeg_proc(self):
         visible by looking at the video packets for a 6 second window being 171
         instead of 180.  Following the first read, the packets increase to 180.
         """
-        ffmpeg_command = [self.config['paths']['ffmpeg_path'],
+        ffmpeg_command = [
+            self.config['paths']['ffmpeg_path'],
             '-nostats',
             '-hide_banner',
             '-loglevel', 'fatal',
@@ -109,9 +160,9 @@ def open_ffmpeg_proc(self):
             '-f', 'mpegts',
             '-c', 'copy',
             'pipe:1']
-        ffmpeg_process = subprocess.Popen(ffmpeg_command,
-            stdin=subprocess.PIPE, 
+        ffmpeg_process = subprocess.Popen(
+            ffmpeg_command,
+            stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             bufsize=-1)
         return ffmpeg_process
-
diff --git a/lib/streams/pts_validation.py b/lib/streams/pts_validation.py
index e56b351..b9c966f 100644
--- a/lib/streams/pts_validation.py
+++ b/lib/streams/pts_validation.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -19,11 +19,10 @@
 import json
 import logging
 import subprocess
-import time
-
 
 import lib.common.utils as utils
 
+
 class PTSValidation:
     logger = None
 
@@ -47,7 +46,6 @@ def __init__(self, _config, _channel_dict):
         self.config_section = utils.instance_config_section(
             self.channel_dict['namespace'], self.channel_dict['instance'])
 
-
     def check_pts(self, _video):
         """
         Checks the PTS in the video stream.  If a bad PTS packet is found, 
@@ -75,7 +73,7 @@ def check_pts(self, _video):
                 return {'refresh_stream': False, 'byteoffset': 0, 'reread_buffer': True}
             elif pts_data['last_pts'] <= self.prev_last_pts:
                 self.logger.debug('Small PTS to Large PTS with entire PTS in the past. last_pts={} vs prev={}'
-                    .format(pts_data['last_pts'], self.prev_last_pts))
+                                  .format(pts_data['last_pts'], self.prev_last_pts))
                 return {'refresh_stream': False, 'byteoffset': 0, 'reread_buffer': True}
             else:
                 byte_offset = self.find_bad_pkt_offset(from_front=False)
@@ -113,7 +111,7 @@ def check_pts(self, _video):
         elif pts_data['first_pts'] < self.prev_last_pts:
             if pts_data['last_pts'] <= self.prev_last_pts:
                 self.logger.debug('Entire PTS buffer in the past last_pts={} vs prev={}'.format(pts_data['last_pts'],
-                    self.prev_last_pts))
+                                                                                                self.prev_last_pts))
                 return {'refresh_stream': False, 'byteoffset': 0, 'reread_buffer': True}
             else:
                 byte_offset = self.find_past_pkt_offset(self.prev_last_pts)
@@ -163,7 +161,7 @@ def get_pts_values(self, _pts_json):
             'DELTA PTS=', delta_from_prev,
             'Pkts Rcvd=', len(_pts_json['packets'])))
         return {'first_pts': first_pts, 'last_pts': last_pts,
-            'pts_size': pts_size, 'delta_from_prev': delta_from_prev}
+                'pts_size': pts_size, 'delta_from_prev': delta_from_prev}
 
     def find_bad_pkt_offset(self, from_front):
         """
@@ -212,25 +210,24 @@ def find_past_pkt_offset(self, prev_last_pts):
                 byte_offset = int(int(self.pts_json['packets'][i]['pos']) / 188) * 188
                 self.logger.debug(
                     '{}{} {}{} {}{}'.format('Future PTS at byte_offset=', byte_offset, 'pkt_pts=', next_pkt_pts,
-                        'prev_pkt=', prev_pkt_dts))
+                                            'prev_pkt=', prev_pkt_dts))
                 break
             i += 1
         return byte_offset
 
-
     def get_probe_results(self, _video):
         ffprobe_command = [self.config['paths']['ffprobe_path'],
-            '-print_format', 'json',
-            '-v', 'quiet', '-show_packets',
-            '-select_streams', 'v:0',
-            '-show_entries', 'side_data=:packet=pts,pos,duration,size',
-            '-']
+                           '-print_format', 'json',
+                           '-v', 'quiet', '-show_packets',
+                           '-select_streams', 'v:0',
+                           '-show_entries', 'side_data=:packet=pts,pos,duration,size',
+                           '-']
         cmdpts = subprocess.Popen(ffprobe_command,
-            stdin=subprocess.PIPE, stdout=subprocess.PIPE)
+                                  stdin=subprocess.PIPE, stdout=subprocess.PIPE)
         ptsout = cmdpts.communicate(_video.data)[0]
         exit_code = cmdpts.wait()
         if exit_code != 0:
             self.logger.warning('FFPROBE failed to execute with error code: {}'
-                .format(exit_code))
+                                .format(exit_code))
             return None
         return json.loads(ptsout)
diff --git a/lib/streams/stream.py b/lib/streams/stream.py
index 392b4a6..cdfd829 100644
--- a/lib/streams/stream.py
+++ b/lib/streams/stream.py
@@ -22,46 +22,63 @@
 from lib.clients.web_handler import WebHTTPHandler
 import lib.common.utils as utils
 
-class Stream:
 
+class Stream:
     logger = None
 
     def __init__(self, _plugins, _hdhr_queue):
         self.plugins = _plugins
+        self.namespace = ''
+        self.instance = ''
+        self.config = self.plugins.config_obj.data
         self.hdhr_queue = _hdhr_queue
         if Stream.logger is None:
             Stream.logger = logging.getLogger(__name__)
 
     def put_hdhr_queue(self, _namespace, _index, _channel, _status):
-        if not self.plugins.config_obj.data['hdhomerun']['disable_hdhr']:
+        if not self.config['hdhomerun']['disable_hdhr']:
             self.hdhr_queue.put(
-                {'namespace': _namespace, 'tuner': _index, 
-                'channel': _channel, 'status': _status})
+                {'namespace': _namespace, 'tuner': _index,
+                 'channel': _channel, 'status': _status})
 
-    def find_tuner(self, _namespace, _instance, _ch_num, _tuner):
+    def find_tuner(self, _namespace, _instance, _ch_num, _isvod):
         # keep track of how many tuners we can use at a time
         found = -1
         scan_list = WebHTTPHandler.rmg_station_scans[_namespace]
         for index, scan_status in enumerate(scan_list):
             # the first idle tuner gets it
-            if scan_status == 'Idle':
-                WebHTTPHandler.rmg_station_scans[_namespace][index] = {'instance': _instance, 'ch': _ch_num, 'status': 'Starting'}
-                self.put_hdhr_queue(_namespace, index, _ch_num, 'Stream')
+            if scan_status == 'Idle' and found == -1:
                 found = index
-                break
+            elif isinstance(scan_status, dict):
+                if scan_status['instance'] == _instance \
+                        and scan_status['ch'] == _ch_num \
+                        and not _isvod \
+                        and scan_status['mux'] \
+                        and not scan_status['mux'].terminate_requested:
+                    found = index
+                    break
+        if found == -1:
+            return found
+        if WebHTTPHandler.rmg_station_scans[_namespace][index] != 'Idle':
+            self.logger.debug('Reusing tuner {} {}:{} ch:{}'.format(found, _namespace, _instance, _ch_num))
+        else:
+            self.logger.debug('Adding new tuner {} for stream {}:{} ch:{}'.format(found, _namespace, _instance, _ch_num))
+            WebHTTPHandler.rmg_station_scans[_namespace][found] = { \
+                'instance': _instance,
+                'ch': _ch_num,
+                'mux': None,
+                'status': 'Starting'}
+            self.put_hdhr_queue(_namespace, index, _ch_num, 'Stream')
         return found
 
-
-
-
     def set_service_name(self, _channel_dict):
         updated_chnum = utils.wrap_chnum(
-            str(_channel_dict['number']), _channel_dict['namespace'], 
-            _channel_dict['instance'], self.plugins.config_obj.data)
+            str(_channel_dict['display_number']), _channel_dict['namespace'],
+            _channel_dict['instance'], self.config)
 
         if self.config['epg']['epg_channel_number']:
             service_name = updated_chnum + \
-                ' ' + _channel_dict['display_name']
+                           ' ' + _channel_dict['display_name']
         else:
             service_name = _channel_dict['display_name']
         return service_name
@@ -70,14 +87,16 @@ def get_stream_uri(self, _channel_dict):
         return self.plugins.plugins[_channel_dict['namespace']] \
             .plugin_obj.get_channel_uri_ext(_channel_dict['uid'], _channel_dict['instance'])
 
-    def gen_response(self, _namespace, _instance, _ch_num, _tuner):
+    def gen_response(self, _namespace, _instance, _ch_num, _isvod):
         """
         Returns dict where the dict is consistent with
         the method do_dict_response requires as an argument
         A code other than 200 means do not tune
         dict also include a "tuner_index" that informs caller what tuner is allocated
         """
-        i = self.find_tuner(_namespace, _instance, _ch_num, _tuner)
+        self.namespace = _namespace
+        self.instance = _instance
+        i = self.find_tuner(_namespace, _instance, _ch_num, _isvod)
         if i >= 0:
             return {
                 'tuner': i,
@@ -85,10 +104,15 @@ def gen_response(self, _namespace, _instance, _ch_num, _tuner):
                 'headers': {'Content-type': 'video/MP2T;'},
                 'text': None}
         else:
-            self.logger.warning('All tuners already in use [{}][{}] max tuners: {}' \
+            self.logger.warning(
+                'All tuners already in use [{}][{}] max tuners: {}'
                 .format(_namespace, _instance, len(WebHTTPHandler.rmg_station_scans[_namespace])))
             return {
                 'tuner': i,
                 'code': 400,
                 'headers': {'Content-type': 'text/html'},
                 'text': web_templates['htmlError'].format('400 - All tuners already in use.')}
+
+    @property
+    def config_section(self):
+        return utils.instance_config_section(self.namespace, self.instance)
diff --git a/lib/streams/stream_queue.py b/lib/streams/stream_queue.py
index 2b7ed68..24920ab 100644
--- a/lib/streams/stream_queue.py
+++ b/lib/streams/stream_queue.py
@@ -35,13 +35,13 @@ def __init__(self, _bytes_per_read, _proc, _stream_id):
         self.queue = []
         self.proc = _proc
         self.stream_id = _stream_id
-        self.not_terminated = True
+        self.is_terminated = False
 
         def _populate_queue():
             """
             Collect lines from 'stream' and put them in 'queue'.
             """
-            while self.not_terminated:
+            while not self.is_terminated:
                 try:
                     self.sout.flush()
                     video_data = self.sout.read(self.bytes_per_read)
@@ -49,9 +49,11 @@ def _populate_queue():
                         self.queue.append(video_data)
                     else:
                         self.logger.debug('Stream ended for this process, exiting queue thread')
+                        self.is_terminated = True
                         break
                 except ValueError:
                     # occurs on termination with buffer must not be NULL
+                    self.is_terminated = True
                     break
         self._t = Thread(target=_populate_queue, args=())
         self._t.daemon = True
@@ -74,4 +76,4 @@ def read(self):
         return None
         
     def terminate(self):
-        self.not_terminated = False
+        self.is_terminated = True
diff --git a/lib/streams/streamlink_proxy.py b/lib/streams/streamlink_proxy.py
index 4c84de8..7775028 100644
--- a/lib/streams/streamlink_proxy.py
+++ b/lib/streams/streamlink_proxy.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -20,6 +20,7 @@
 import subprocess
 import time
 
+import lib.common.exceptions as exceptions
 from lib.clients.web_handler import WebHTTPHandler
 from lib.streams.video import Video
 from lib.db.db_config_defn import DBConfigDefn
@@ -27,6 +28,8 @@
 from .stream_queue import StreamQueue
 from .pts_validation import PTSValidation
 
+IDLE_TIMER = 20      # Duration for no video causing a refresh
+MAX_IDLE_TIMER = 59  # duration for no video causing stream termination
 
 class StreamlinkProxy(Stream):
 
@@ -45,70 +48,85 @@ def __init__(self, _plugins, _hdhr_queue):
         self.write_buffer = None
         self.stream_queue = None
         self.pts_validation = None
+        self.tuner_no = -1
         super().__init__(_plugins, _hdhr_queue)
-        self.config = self.plugins.config_obj.data
         self.db_configdefn = DBConfigDefn(self.config)
         self.video = Video(self.config)
 
     def update_tuner_status(self, _status):
-        ch_num = self.channel_dict['number']
+        ch_num = self.channel_dict['display_number']
         namespace = self.channel_dict['namespace']
         scan_list = WebHTTPHandler.rmg_station_scans[namespace]
-        for i, tuner in enumerate(scan_list):
-            if type(tuner) == dict and tuner['ch'] == ch_num:
-                WebHTTPHandler.rmg_station_scans[namespace][i]['status'] = _status
+        tuner = scan_list[self.tuner_no]
+        if type(tuner) == dict and tuner['ch'] == ch_num:
+            WebHTTPHandler.rmg_station_scans[namespace][self.tuner_no]['status'] = _status
 
-
-    def stream(self, _channel_dict, _write_buffer):
+    def stream(self, _channel_dict, _write_buffer, _tuner_no):
+        global MAX_IDLE_TIMER
+        self.logger.info('Using streamlink_proxy for channel {}'.format(_channel_dict['uid']))
+        self.tuner_no = _tuner_no
         self.channel_dict = _channel_dict
         self.write_buffer = _write_buffer
         self.config = self.db_configdefn.get_config()
+        MAX_IDLE_TIMER = self.config[self.namespace.lower()]['stream-g_stream_timeout']
+
         self.pts_validation = PTSValidation(self.config, self.channel_dict)
         channel_uri = self.get_stream_uri(self.channel_dict)
         if not channel_uri:
-            self.logger.warning('Unknown Channel')
+            self.logger.warning('Unknown Channel {}'.format(_channel_dict['uid']))
             return
         self.streamlink_proc = self.open_streamlink_proc(channel_uri)
+        if not self.streamlink_proc:
+            return
         time.sleep(0.01)
         self.last_refresh = time.time()
         self.block_prev_time = self.last_refresh
         self.buffer_prev_time = self.last_refresh
-        self.read_buffer()
+        try:
+            self.read_buffer()
+        except exceptions.CabernetException as ex:
+            self.logger.info(str(ex))
+            return
         while True:
-            if self.video.data is None:
-                self.logger.debug('No Video Data, waiting')
-                break
-                #self.streamlink_proc = self.refresh_stream()
+            if not self.video.data:
+                self.logger.info(
+                    '1 No Video Data, refreshing stream {} {}'
+                    .format(_channel_dict['uid'], self.streamlink_proc.pid))
+                self.streamlink_proc = self.refresh_stream()
             else:
                 try:
                     self.validate_stream()
                     self.update_tuner_status('Streaming')
+                    start_ttw = time.time()
                     self.write_buffer.write(self.video.data)
+                    delta_ttw = time.time() - start_ttw
+                    self.logger.info(
+                        'Serving {} {} ({}B) ttw:{:.2f}s'
+                        .format(self.streamlink_proc.pid, _channel_dict['uid'],
+                                len(self.video.data), delta_ttw))
                 except IOError as e:
                     if e.errno in [errno.EPIPE, errno.ECONNABORTED, errno.ECONNRESET, errno.ECONNREFUSED]:
-                        self.logger.info('1. Connection dropped by end device')
+                        self.logger.info('1. Connection dropped by end device {}'.format(self.streamlink_proc.pid))
                         break
                     else:
                         self.logger.error('{}{}'.format(
-                            '1 ################ UNEXPECTED EXCEPTION=', e))
+                            '1 UNEXPECTED EXCEPTION=', e))
                         raise
             try:
                 self.read_buffer()
+            except exceptions.CabernetException as ex:
+                self.logger.info('{} {}'.format(ex, self.streamlink_proc.pid))
+                break
             except Exception as e:
                 self.logger.error('{}{}'.format(
-                    '2 ################ UNEXPECTED EXCEPTION=', e))
-                raise
-        self.logger.debug('Terminating streamlink stream')
-        self.streamlink_proc.terminate()
-        try:
-            self.streamlink_proc.communicate()
-        except ValueError:
-            pass
+                    '2 UNEXPECTED EXCEPTION=', e))
+                break
+        self.terminate_stream()
 
     def validate_stream(self):
-        if not self.config[self.channel_dict['namespace'].lower()]['player-enable_pts_filter']:
+        if not self.config[self.config_section]['player-enable_pts_filter']:
             return
-            
+
         has_changed = True
         while has_changed:
             has_changed = False
@@ -126,37 +144,58 @@ def validate_stream(self):
             if results['reread_buffer']:
                 self.read_buffer()
                 has_changed = True
-        return 
+        return
 
     def read_buffer(self):
+        global MAX_IDLE_TIMER
+        global IDLE_TIMER
         data_found = False
         self.video.data = None
-        idle_timer = 5
+        idle_timer = MAX_IDLE_TIMER  # time slice segments are less than 10 seconds
         while not data_found:
             self.video.data = self.stream_queue.read()
             if self.video.data:
                 data_found = True
             else:
-                time.sleep(0.5)
+                if self.stream_queue.is_terminated:
+                    raise exceptions.CabernetException('Streamlink Terminated, exiting stream {}'.format(self.streamlink_proc.pid))
+
+                time.sleep(1)
                 idle_timer -= 1
-                if idle_timer == 0:
-                    if self.plugins.plugins[self.channel_dict['namespace']].plugin_obj \
-                            .is_time_to_refresh_ext(self.last_refresh, self.channel_dict['instance']):
-                        self.streamlink_proc = self.refresh_stream()
-                    idle_timer = 2
+                if idle_timer % IDLE_TIMER == 0:
+                    self.logger.info(
+                        '2 No Video Data, refreshing stream {}'
+                        .format(self.streamlink_proc.pid))
+                    self.streamlink_proc = self.refresh_stream()
+                    
+                if idle_timer < 1:
+                    idle_timer = MAX_IDLE_TIMER  # time slice segments are less than 10 seconds
+                    self.logger.info(
+                        'No Video Data, terminating stream {}'
+                        .format(self.streamlink_proc.pid))
+                    time.sleep(15)
+                    self.streamlink_proc = self.terminate_stream()
+                    raise exceptions.CabernetException('Unable to get video stream, terminating')
+                elif int(MAX_IDLE_TIMER / 2) == idle_timer:
+                    self.update_tuner_status('No Reply')
+        return
+
+    def terminate_stream(self):
+        self.logger.debug('Terminating streamlink stream {}'.format(self.streamlink_proc.pid))
+        while True:
+            try:
+                self.streamlink_proc.terminate()
+                self.streamlink_proc.wait(timeout=1.5)
+                break
+            except ValueError:
+                pass
+            except subprocess.TimeoutExpired:
+                time.sleep(0.01)
 
     def refresh_stream(self):
         self.last_refresh = time.time()
         channel_uri = self.get_stream_uri(self.channel_dict)
-        try:
-            self.streamlink_proc.terminate()
-            self.streamlink_proc.wait(timeout=0.1)
-            self.logger.debug('Previous streamlink terminated')
-        except ValueError:
-            pass
-        except subprocess.TimeoutExpired:
-            self.streamlink_proc.terminate()
-            time.sleep(0.01)
+        self.terminate_stream()
 
         self.logger.debug('{}{}'.format(
             'Refresh Stream channelUri=', channel_uri))
@@ -172,20 +211,46 @@ def open_streamlink_proc(self, _channel_uri):
         visible by looking at the video packets for a 6 second window being 171
         instead of 180.  Following the first read, the packets increase to 180.
         """
+        header = self.channel_dict['json'].get('Header')
+        str_array = []
+        llevel = self.config['handler_loghandler']['level']
+        if llevel == 'DEBUG':
+            sl_llevel = 'trace'
+        elif llevel == 'INFO':
+            sl_llevel = 'info'
+        elif llevel == 'NOTICE':
+            sl_llevel = 'warning'
+        elif llevel == 'WARNING':
+            sl_llevel = 'error'
+        else:
+            sl_llevel = 'none'
+        
+        if header:
+            for key, value in header.items():
+                str_array.append('--http-header')
+                str_array.append(key + '=' + value)
+                if key == 'Referer':
+                    self.logger.debug('Using HTTP Referer: {}  Channel: {}'.format(value, self.channel_dict['uid']))
         uri = '{}'.format(_channel_uri)
-        streamlink_command = ['streamlink',
+        streamlink_command = [
+            self.config['paths']['streamlink_path'],
             '--stdout',
-            '--quiet',
-            '--hds-segment-threads', '2',
+            '--loglevel', sl_llevel,
             '--ffmpeg-fout', 'mpegts',
             '--hls-segment-attempts', '2',
             '--hls-segment-timeout', '5',
             uri,
             '720,best'
-            ]
-        streamlink_process = subprocess.Popen(streamlink_command,
-            stdout=subprocess.PIPE,
-            bufsize=-1)
+        ]
+        streamlink_command.extend(str_array)
+        try:
+            streamlink_process = subprocess.Popen(
+                streamlink_command,
+                stdout=subprocess.PIPE,
+                bufsize=-1)
+        except:
+            self.logger.error('Streamlink Binary Not Found: {}'.format(self.config['paths']['streamlink_path']))
+            return
         self.stream_queue = StreamQueue(188, streamlink_process, self.channel_dict['uid'])
-        time.sleep(1)
+        time.sleep(0.1)
         return streamlink_process
diff --git a/lib/streams/thread_queue.py b/lib/streams/thread_queue.py
new file mode 100644
index 0000000..1bf2e7f
--- /dev/null
+++ b/lib/streams/thread_queue.py
@@ -0,0 +1,200 @@
+"""
+MIT License
+
+Copyright (C) 2023 ROCKY4546
+https://github.com/rocky4546
+
+This file is part of Cabernet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+"""
+
+import logging
+import threading
+import time
+from queue import Empty
+
+from multiprocessing import Queue, Process
+from threading import Thread
+
+
+class ThreadQueue(Thread):
+    """
+    Takes a queue containing thread ids and pushes them 
+    into other queues associated with those threads
+    Assumes queue item is a dict containing a name/value of "thread_id"
+    'terminate' can be sent via name 'uri' to terminate a specific thread id
+    """
+    # list of [threadid, queue] items
+
+    def __init__(self, _queue, _config):
+        Thread.__init__(self)
+        self.logger = logging.getLogger(__name__ + str(threading.get_ident()))
+        # incoming queue containing the thread id of which outgoing queue to send it to.
+        self.queue = _queue
+        # outgoing queues
+        self.queue_list = {}
+        self.config = _config
+        self.terminate_requested = False
+        # The process using the incoming queue to send data
+        self._remote_proc = None
+        # incoming queue to the process, stored locally
+        self._status_queue = None
+        self.start()
+
+    def __str__(self):
+        """
+        Used to display the number of queues in the outgoing queue list
+        """
+        return str(len(self.queue_list))
+
+    def run(self):
+        thread_id = None
+        try:
+            while not self.terminate_requested:
+                queue_item = self.queue.get()
+                thread_id = queue_item.get('thread_id')
+                if not thread_id:
+                    self.logger.warning('Badly formatted queue. thread_id required and missing thread_id:{}  uri:{}'
+                        .format(queue_item.get('thread_id'), queue_item.get('uri')))
+                    continue
+                if not queue_item.get('uri'):
+                    self.logger.warning('Badly formatted queue. uri required and missing thread_id:{}  uri:{}'
+                        .format(queue_item.get('thread_id'), queue_item.get('uri')))
+                    continue
+                if queue_item.get('uri') == 'terminate':
+                    time.sleep(self.config['stream']['switch_channel_timeout'])
+                    self.del_thread(thread_id, True)
+                out_queue = self.queue_list.get(thread_id)
+                if out_queue:
+                    # Define the length of sleep to keep the queues from becoming full
+                    # or using all the memory.  Occurs with VOD streams.
+                    # sleep timer auto-adjusts to keep the queue a little over 10 items
+                    # in the outgoing queue
+                    if out_queue.qsize() > 10:
+                        s = out_queue.qsize()/2
+                    else:
+                        s = 0.0
+                    out_queue.put(queue_item)
+                    self.sleep(s)
+
+        except (KeyboardInterrupt, EOFError) as ex:
+            self.terminate_requested = True
+            self.clear_queues()
+            self.logger.exception('{}{}'.format(
+                'UNEXPECTED EXCEPTION ThreadQueue=', ex))
+        except Exception as ex:
+            # tell everyone we are terminating badly
+            self.logger.exception('{}'.format(
+                'UNEXPECTED EXCEPTION ThreadQueue'))
+            for qdict in self.queue_list.items():
+                qdict[1].put({'thread_id': qdict[0], 'uri': 'terminate'})
+            self.terminate_requested = True
+            self.clear_queues()
+            time.sleep(0.01)
+
+        self.clear_queues()
+        self.terminate_requested = True
+        self.logger.debug('ThreadQueue terminated')
+
+    def clear_queues(self):
+        self.clear_q(self.queue)
+
+    def clear_q(self, _q):
+        try:
+            while True:
+                item = _q.get_nowait()
+        except (Empty, ValueError, EOFError, OSError) as ex:
+            pass
+
+    def add_thread(self, _thread_id, _queue):
+        """
+        Adds the thread id to the list of queues this class is sending data
+        """
+        out_queue = self.queue_list.get(_thread_id)
+        self.queue_list[_thread_id] = _queue
+        if not out_queue:
+            self.logger.debug('Adding thread id queue to thread queue: {}'.format(_thread_id))
+
+    def del_thread(self, _thread_id, _is_inrun=False):
+        """
+        Removes the thread id from the list of queues this class is sending data to
+        if queue list is empty, then will also set the terminate to True
+        and return True
+        _is_inrun is set to true when the call comes from the thread run method, 
+        so wait for terminate is not required since it already is not waiting for get queue processing
+        """
+        out_queue = self.queue_list.get(_thread_id)
+        if out_queue:
+            del self.queue_list[_thread_id]
+            self.logger.debug('Removing thread id queue from thread queue: {}'.format(_thread_id))
+            if not len(self.queue_list):
+                # sleep to deal with boomerang effects on termination
+                # when the channel does a quick reset by the client
+                time.sleep(1.0)
+            if not len(self.queue_list):
+                self.logger.debug('Terminating thread queue')
+                self.terminate_requested = True
+                time.sleep(0.01)
+                self.clear_queues()
+                if _is_inrun:
+                    return True
+                else:
+                    self.queue.put({'thread_id': _thread_id, 'uri': 'terminate'})
+                    time.sleep(0.01)
+                    self.wait_for_termination()
+                return True
+            else:
+                return False
+        else:
+            return True
+
+    def wait_for_termination(self):
+        count = 50
+        while self.is_alive() and count > 0:
+            time.sleep(0.1)
+            count -= 1
+        self.clear_queues()
+
+    def sleep(self, _time):
+        """
+        Creates a sleep function that will exit quickly if the termination flag is set
+        """
+        start_ttw = time.time()
+        for i in range(round(_time * 5)):
+            if not self.terminate_requested:
+                time.sleep(_time * 0.2)
+            else:
+                break
+            delta_ttw = time.time() - start_ttw
+            if delta_ttw > _time:
+                break
+
+    @property
+    def remote_proc(self):
+        """
+        process using the status_queue and sending to the incoming queue
+        """
+        return self._remote_proc
+
+    @remote_proc.setter
+    def remote_proc(self, _proc):
+        self._remote_proc = _proc
+
+    @property
+    def status_queue(self):
+        """
+        queue used by the remote process as its incoming queue
+        """
+        return self._status_queue
+
+    @status_queue.setter
+    def status_queue(self, _queue):
+        self._status_queue = _queue
diff --git a/lib/tvheadend/epg_category.py b/lib/tvheadend/epg_category.py
index e19d09d..4343ed2 100644
--- a/lib/tvheadend/epg_category.py
+++ b/lib/tvheadend/epg_category.py
@@ -71,8 +71,7 @@
     'COMEDY':            'Comedy',
     'SOAP':              'Soap / Melodrama / Folkloric',
     'ROMANCE':           'Romance',
-    'HISTORICAL':        'Serious / Classical / Religious ' \
-        '/ Historical movie / Drama',
+    'HISTORICAL':        'Serious / Classical / Religious / Historical movie / Drama',
     'XXX':               'Adult movie / Drama',
 
     'NEWS':              'News / Current affairs',
@@ -155,77 +154,77 @@
 
 # Normal GENRES to TVHEADEND translation
 TVHEADEND = {
-    'Action'                : tvh_genres['THRILLER'],
-    'Action sports'         : tvh_genres['SPORT'],
-    'Adventure'             : tvh_genres['ADVENTURE'],
-    'Agriculture'           : tvh_genres['NATURE'],
-    'Animals'               : tvh_genres['NATURE'],
-    'Anthology'             : tvh_genres['FILM'],
-    'Art'                   : tvh_genres['CULTURE'],
-    'Baseball'              : tvh_genres['SPORT_TEAM'],
-    'Basketball'            : tvh_genres['SPORT_TEAM'],
-    'Biography'             : tvh_genres['VIP'],
-    'Boxing'                : tvh_genres['SPORT'],
-    'Cartoon'               : tvh_genres['CARTOON'],
-    'Children'              : tvh_genres['KIDS'],
-    'Classic Sport Event'   : tvh_genres['SPORT_SPECIAL'],
-    'Comedy'                : tvh_genres['COMEDY'],
-    'Comedy drama'          : tvh_genres['COMEDY'],
-    'Community'             : tvh_genres['SOCIAL'],
-    'Consumer'              : tvh_genres['SHOPPING'],
-    'Cooking'               : tvh_genres['COOKING'],
-    'Crime'                 : tvh_genres['THRILLER'],
-    'Crime drama'           : tvh_genres['THRILLER'],
-    'Docudrama'             : tvh_genres['DOCUMENTARY'],
-    'Documentary'           : tvh_genres['DOCUMENTARY'],
-    'Drama'                 : tvh_genres['MOVIE'],
-    'Educational'           : tvh_genres['EDUCATIONAL'],
-    'Entertainment'         : tvh_genres['GAME'],
-    'Exercise'              : tvh_genres['FITNESS'],
-    # 'Fantasy'              :
-    'financial'             : tvh_genres['ECONOMIC'],
-    'Football'              : tvh_genres['FOOTBALL'],
-    'Game show'             : tvh_genres['GAME'],
-    'Golf'                  : tvh_genres['SPORT_TEAM'],
-    'Health'                : tvh_genres['MEDICINE'],
-    'Historical drama'      : tvh_genres['HISTORICAL'],
-    'Hockey'                : tvh_genres['SPORT_TEAM'],
-    'Home improvement'      : tvh_genres['HANDICRAFT'],
-    'Horror'                : tvh_genres['SF'],
-    'House/garden'          : tvh_genres['GARDENING'],
-    'How-to'                : tvh_genres['SCIENCE'],
-    'Interview'             : tvh_genres['DEBATE'],
-    'Law'                   : tvh_genres['SOCIAL'],
-    'Medical'               : tvh_genres['MEDICINE'],
-    'Mixed martial arts'    : tvh_genres['MARTIAL_ARTS'],
-    'Music'                 : tvh_genres['MUSIC'],
-    'Musical'               : tvh_genres['MUSIC'],
-    'Musical comedy'        : tvh_genres['COMEDY'],
-    'Mystery'               : tvh_genres['THRILLER'],
-    'News'                  : tvh_genres['NEWS'],
-    'Newsmagazine'          : tvh_genres['NEWS_MAGAZINE'],
-    'Olympics'              : tvh_genres['SPORT'],
-    'Outdoors'              : tvh_genres['SPORT'],
-    'Poker'                 : tvh_genres['GAME'],
-    'Pro wrestling'         : tvh_genres['MARTIAL_ARTS'],
-    'Public affairs'        : tvh_genres['BROADCASTING'],
-    'Reality'               : tvh_genres['GAME'],
-    'Religious'             : tvh_genres['RELIGION'],
-    'Romance'               : tvh_genres['ROMANCE'],
-    'Romantic comedy'       : tvh_genres['ROMANCE'],
-    'Science'               : tvh_genres['SCIENCE'],
-    'Science fiction'       : tvh_genres['SF'],
-    'Self improvement'      : tvh_genres['FURTHER_EDUCATION'],
-    'Shopping'              : tvh_genres['SHOPPING'],
-    'Sitcom'                : tvh_genres['COMEDY'],
-    'Soap'                  : tvh_genres['SOAP'],
-    'Soccer'                : tvh_genres['FOOTBALL'],
-    # 'Special'             :
-    'Sports talk'           : tvh_genres['SPORT'],
-    'Talk'                  : tvh_genres['TALK_SHOW'],
-    'Thriller'              : tvh_genres['THRILLER'],
-    'Travel'                : tvh_genres['TRAVEL'],
-    'Variety'               : tvh_genres['VARIETY'],
-    'Weightlifting'         : tvh_genres['ATHLETICS'],
-    'Western'               : tvh_genres['ADVENTURE']
+    'Action':                 tvh_genres['THRILLER'],
+    'Action sports':          tvh_genres['SPORT'],
+    'Adventure':              tvh_genres['ADVENTURE'],
+    'Agriculture':            tvh_genres['NATURE'],
+    'Animals':                tvh_genres['NATURE'],
+    'Anthology':              tvh_genres['FILM'],
+    'Art':                    tvh_genres['CULTURE'],
+    'Baseball':               tvh_genres['SPORT_TEAM'],
+    'Basketball':             tvh_genres['SPORT_TEAM'],
+    'Biography':              tvh_genres['VIP'],
+    'Boxing':                 tvh_genres['SPORT'],
+    'Cartoon':                tvh_genres['CARTOON'],
+    'Children':               tvh_genres['KIDS'],
+    'Classic Sport Event':    tvh_genres['SPORT_SPECIAL'],
+    'Comedy':                 tvh_genres['COMEDY'],
+    'Comedy drama':           tvh_genres['COMEDY'],
+    'Community':              tvh_genres['SOCIAL'],
+    'Consumer':               tvh_genres['SHOPPING'],
+    'Cooking':                tvh_genres['COOKING'],
+    'Crime':                  tvh_genres['THRILLER'],
+    'Crime drama':            tvh_genres['THRILLER'],
+    'Docudrama':              tvh_genres['DOCUMENTARY'],
+    'Documentary':            tvh_genres['DOCUMENTARY'],
+    'Drama':                  tvh_genres['MOVIE'],
+    'Educational':            tvh_genres['EDUCATIONAL'],
+    'Entertainment':          tvh_genres['GAME'],
+    'Exercise':               tvh_genres['FITNESS'],
+    'Fantasy':                tvh_genres['SF'],
+    'financial':              tvh_genres['ECONOMIC'],
+    'Football':               tvh_genres['FOOTBALL'],
+    'Game show':              tvh_genres['GAME'],
+    'Golf':                   tvh_genres['SPORT_TEAM'],
+    'Health':                 tvh_genres['MEDICINE'],
+    'Historical drama':       tvh_genres['HISTORICAL'],
+    'Hockey':                 tvh_genres['SPORT_TEAM'],
+    'Home improvement':       tvh_genres['HANDICRAFT'],
+    'Horror':                 tvh_genres['SF'],
+    'House/garden':           tvh_genres['GARDENING'],
+    'How-to':                 tvh_genres['SCIENCE'],
+    'Interview':              tvh_genres['DEBATE'],
+    'Law':                    tvh_genres['SOCIAL'],
+    'Medical':                tvh_genres['MEDICINE'],
+    'Mixed martial arts':     tvh_genres['MARTIAL_ARTS'],
+    'Music':                  tvh_genres['MUSIC'],
+    'Musical':                tvh_genres['MUSIC'],
+    'Musical comedy':         tvh_genres['COMEDY'],
+    'Mystery':                tvh_genres['THRILLER'],
+    'News':                   tvh_genres['NEWS'],
+    'Newsmagazine':           tvh_genres['NEWS_MAGAZINE'],
+    'Olympics':               tvh_genres['SPORT'],
+    'Outdoors':               tvh_genres['SPORT'],
+    'Poker':                  tvh_genres['GAME'],
+    'Pro wrestling':          tvh_genres['MARTIAL_ARTS'],
+    'Public affairs':         tvh_genres['BROADCASTING'],
+    'Reality':                tvh_genres['GAME'],
+    'Religious':              tvh_genres['RELIGION'],
+    'Romance':                tvh_genres['ROMANCE'],
+    'Romantic comedy':        tvh_genres['ROMANCE'],
+    'Science':                tvh_genres['SCIENCE'],
+    'Science fiction':        tvh_genres['SF'],
+    'Self improvement':       tvh_genres['FURTHER_EDUCATION'],
+    'Shopping':               tvh_genres['SHOPPING'],
+    'Sitcom':                 tvh_genres['COMEDY'],
+    'Soap':                   tvh_genres['SOAP'],
+    'Soccer':                 tvh_genres['FOOTBALL'],
+    'Special':                tvh_genres['NEW_MEDIA'],
+    'Sports talk':            tvh_genres['SPORT'],
+    'Talk':                   tvh_genres['TALK_SHOW'],
+    'Thriller':               tvh_genres['THRILLER'],
+    'Travel':                 tvh_genres['TRAVEL'],
+    'Variety':                tvh_genres['VARIETY'],
+    'Weightlifting':          tvh_genres['ATHLETICS'],
+    'Western':                tvh_genres['ADVENTURE']
 }
diff --git a/lib/tvheadend/service/Unix/tv_grab_file b/lib/tvheadend/service/Unix/tv_grab_file
old mode 100755
new mode 100644
diff --git a/lib/updater/cabernet.py b/lib/updater/cabernet.py
index 3f5faa3..0c4b085 100644
--- a/lib/updater/cabernet.py
+++ b/lib/updater/cabernet.py
@@ -18,6 +18,7 @@
 
 import glob
 import importlib
+import importlib.resources
 import json
 import logging
 import os
@@ -35,8 +36,7 @@
 from lib.common.decorators import handle_json_except
 from lib.common.tmp_mgmt import TMPMgmt
 
-MANIFEST_FILE = 'manifest.json'
-TMP_ZIPFILE = utils.CABERNET_NAMESPACE + '.zip'
+TMP_ZIPFILE = utils.CABERNET_ID + '.zip'
 
 class CabernetUpgrade:
 
@@ -48,7 +48,7 @@ def __init__(self, _plugins):
         self.config = _plugins.config_obj.data
         self.plugin_db = DBPlugins(self.config)
         self.tmp_mgmt = TMPMgmt(self.config)
-        
+
     def update_version_info(self):
         """
         Updates the database with the latest version release data
@@ -59,27 +59,30 @@ def update_version_info(self):
         if release_data_list is not None:
             current_version = utils.VERSION
             last_version = release_data_list[0]['tag_name']
+            last_stable_version = release_data_list[0]['tag_name']
             next_version = self.get_next_release(release_data_list)
-            manifest['version'] = current_version
-            manifest['next_version'] = next_version
-            manifest['latest_version'] = last_version
+            manifest['version']['current'] = current_version
+            manifest['version']['next'] = next_version
+            manifest['version']['latest'] = last_version
+            manifest['version']['installed'] = True
             self.save_manifest(manifest)
             # need to have the task take at least 1 second to register the time
             time.sleep(1)
 
     def import_manifest(self):
         """
-        Loads the manifest for cabernet from a file
+        Loads the manifest for cabernet
         """
-        json_settings = importlib.resources.read_text(self.config['paths']['resources_pkg'], MANIFEST_FILE)
-        settings = json.loads(json_settings)
-        return settings
-        
+        json_settings = self.plugin_db.get_repos(utils.CABERNET_ID)
+        if json_settings:
+            json_settings = json_settings[0]
+        return json_settings
+
     def load_manifest(self):
         """
         Loads the cabernet manifest from DB
         """
-        manifest_list = self.plugin_db.get_plugins(utils.CABERNET_NAMESPACE)
+        manifest_list = self.plugin_db.get_repos(utils.CABERNET_ID)
         if manifest_list is None:
             return None
         else:
@@ -89,20 +92,20 @@ def save_manifest(self, _manifest):
         """
         Saves to DB the manifest for cabernet
         """
-        self.plugin_db.save_plugin(_manifest)
-        
+        self.plugin_db.save_repo(_manifest)
+
     def github_releases(self, _manifest):
         url = ''.join([
-            _manifest['github_repo_' + self.config['main']['upgrade_quality'] ],
+            _manifest['dir']['github_repo_' + self.config['main']['upgrade_quality']],
             '/releases'
-            ])
-        return self.get_uri_data(url)
-
-    @handle_json_except 
-    @handle_url_except 
-    def get_uri_data(self, _uri):
-        header = {'Content-Type': 'application/json', 
-            'User-agent': utils.DEFAULT_USER_AGENT}
+        ])
+        return self.get_uri_data(url, 2)
+
+    @handle_json_except
+    @handle_url_except
+    def get_uri_data(self, _uri, _retries):
+        header = {'Content-Type': 'application/json',
+                  'User-agent': utils.DEFAULT_USER_AGENT}
         req = urllib.request.Request(_uri, headers=header)
         with urllib.request.urlopen(req, timeout=10.0) as resp:
             x = json.load(resp)
@@ -110,59 +113,71 @@ def get_uri_data(self, _uri):
 
     def get_next_release(self, release_data_list):
         current_version = self.config['main']['version']
-        x = self.version_re.match(current_version)
-        c_version_float = float(re.findall(r'\d+\.(\d+\.\d+).\d+', current_version)[0])
+        cur_version_float = utils.get_version_index(current_version)
+        next_version_int = (int(cur_version_float/100)+2)*100
         prev_version = release_data_list[0]['tag_name']
+        data = None
         for data in release_data_list:
-            numbers = re.findall(r'\d+\.(\d+)\.(\d+).\d+', data['tag_name'])[0]
-            version_float = float('{:01d}.{:02d}'.format(int(numbers[0]), int(numbers[1])))
-            if version_float-0.101 < c_version_float:
+            version_float = utils.get_version_index(data['tag_name'])
+            if version_float < next_version_int:
                 break
         prev_version = data['tag_name']
         return prev_version
 
+    def get_stable_release(self, release_data_list):
+        """
+        Get the latest stable release with the format z.y.x.w without additional text...
+        
+        """
+        pass
+
+
+
+
     def upgrade_app(self, _web_status):
         """
         Initial request to perform an upgrade
         """
         c_manifest = self.load_manifest()
         if c_manifest is None:
+            self.logger.info('Cabernet manifest not found, aborting')
+            _web_status.data += 'Cabernet manifest not found, aborting<br>\r\n'
             return False
-        if c_manifest['next_version'] == c_manifest['version']:
+        if not c_manifest['version'].get('next'):
+            return False
+        if c_manifest['version'].get('next') == c_manifest['version'].get('current'):
             self.logger.info('Cabernet is on the current version, not upgrading')
             _web_status.data += 'Cabernet is on the current version, not upgrading<br>\r\n'
             return False
-        
-        
+
         # This checks to see if additional files or folders are in the 
         # basedir area. if so, abort upgrade.
         # It is basically for the case where we have the wrong directory
         _web_status.data += 'Checking current install area for expected files...<br>\r\n'
         if not self.check_expected_files(_web_status):
             return False
-        
+
         b = backups.Backups(self.plugins)
-        
+
         # recursively check all folders from the basedir to see if they are writable
         _web_status.data += 'Checking write permissions...<br>\r\n'
         resp = b.check_code_write_permissions()
         if resp is not None:
             _web_status.data += resp
             return False
-        
-        
+
         # simple call to run a backup of the data and source
         # use a direct call to the backup methods instead of calling the scheduler
         _web_status.data += 'Creating backup of code and data...<br>\r\n'
         if not b.backup_all():
             _web_status.data += 'Backup failed, aborting upgrade<br>\r\n'
             return False
-        
+
         _web_status.data += 'Downloading new version from website...<br>\r\n'
         if not self.download_zip('/'.join([
-                c_manifest['github_repo_' + self.config['main']['upgrade_quality'] ], 
-                'zipball', c_manifest['next_version']
-                ])):
+            c_manifest['dir']['github_repo_' + self.config['main']['upgrade_quality']],
+            'zipball', c_manifest['version']['next']
+        ]), 2):
             _web_status.data += 'Download of the new version failed, aborting upgrade<br>\r\n'
             return False
 
@@ -198,27 +213,30 @@ def check_expected_files(self, _web_status):
         """
         Check the base directory files to see if all are expected.
         """
-        files_present = ['build', 'lib', 'misc', 'plugins', 'plugins_ext',
-            '.dockerignore', '.gitignore', 'CHANGELOG.md', 'CONTRIBUTING.md',
-            'Dockerfile', 'Dockerfile_l2p', 'Dockerfile_tvh', 'Dockerfile_tvh_crypt.alpine',
-            'Dockerfile_tvh_crypt.slim-buster', 'LICENSE', 'README.md',
-            'TVHEADEND.md', 'docker-compose.yml', 'requirements.txt', 'tvh_main.py',
-            'data', 'config.ini', 'is_container', '.git', 'cabernet.url', 'ffmpeg', 
-            'README.txt', 'uninst.exe' ]
-
-        filelist = [os.path.basename(x) for x in 
-            glob.glob(os.path.join(self.config['paths']['main_dir'], '*'))]
+        files_present = ['build', 'lib', 'misc',
+                         '.dockerignore', '.gitignore', 'CHANGELOG.md', 'CONTRIBUTING.md',
+                         'Dockerfile', 'Dockerfile_l2p', 'Dockerfile_tvh', 'Dockerfile_tvh_crypt.alpine',
+                         'Dockerfile_tvh_crypt.slim-buster', 'LICENSE', 'README.md',
+                         'TVHEADEND.md', 'docker-compose.yml', 'requirements.txt', 'tvh_main.py',
+                         'data', 'config.ini', 'is_container', '.git', 'cabernet.url', 'ffmpeg',
+                         'README.txt', 'uninst.exe']
+
+        files_present.extend([self.config['paths']['internal_plugins_pkg'],  self.config['paths']['external_plugins_pkg']])
+
+        filelist = [os.path.basename(x) for x in
+                    glob.glob(os.path.join(self.config['paths']['main_dir'], '*'))]
         response = True
         for file in filelist:
             if file not in files_present:
-                _web_status.data += '#### Extra file(s) found in install directory, aborting upgrade. FILE: {}<br>\r\n'.format(file)
+                _web_status.data += '#### Extra file(s) found in install directory, aborting upgrade. FILE: {}<br>\r\n'\
+                    .format(file)
                 response = False
         return response
 
     @handle_json_except
     @handle_url_except
-    def download_zip(self, _zip_url):
-                          
+    def download_zip(self, _zip_url, _retries):
+
         buf_size = 2 * 16 * 16 * 1024
         save_path = pathlib.Path(self.config['paths']['tmp_dir']).joinpath(TMP_ZIPFILE)
         h = {'Content-Type': 'application/zip', 'User-agent': utils.DEFAULT_USER_AGENT}
@@ -245,9 +263,9 @@ def extract_code(self):
             return None
 
     def cleanup_tmp(self):
-        dir = self.config['paths']['tmp_dir']
-        for files in os.listdir(dir):
-            path = os.path.join(dir, files)
+        dir_ = self.config['paths']['tmp_dir']
+        for files in os.listdir(dir_):
+            path = os.path.join(dir_, files)
             try:
                 shutil.rmtree(path)
             except OSError:
diff --git a/lib/updater/patcher.py b/lib/updater/patcher.py
index ff737c1..048ae82 100644
--- a/lib/updater/patcher.py
+++ b/lib/updater/patcher.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -16,21 +16,21 @@
 substantial portions of the Software.
 """
 
-import importlib
+
+import configparser
 import logging
-import os
-import shutil
-import sqlite3
-import threading
 import time
+import traceback
 
-import lib.common.utils as utils
-from lib.db.db_channels import DBChannels
+from lib.plugins.plugin_manager.plugin_manager import PluginManager
+from lib.db.db_plugins import DBPlugins
 from lib.db.db_scheduler import DBScheduler
 
-REQUIRED_VERSION = '0.9.9'
+
+REQUIRED_VERSION = '0.9.14'
 LOGGER = None
 
+
 def patch_upgrade(_config_obj, _new_version):
     """
     This method is called when a cabernet upgrade is requested.  Versions are
@@ -41,15 +41,25 @@ def patch_upgrade(_config_obj, _new_version):
     it is associated is tested with this new version.
     """
     global LOGGER
-    LOGGER = logging.getLogger(__name__)
+    if not LOGGER:
+        LOGGER = logging.getLogger(__name__)
+
     results = ''
     if _new_version.startswith(REQUIRED_VERSION):
-        LOGGER.info('Applying the patch to version: {}'.format(REQUIRED_VERSION))
-        results = 'Patch: Updating Channels database...'
+        LOGGER.info('Applying patches to version: {}'.format(REQUIRED_VERSION))
+
+        try:
+            try:
+                _config_obj.config_handler.remove_option('streams', 'stream_timeout')
+            except configparser.NoSectionError:
+                pass
+            _config_obj.config_handler.remove_option('logger_root', 'level')
+            _config_obj.config_handler.set('logger_root', 'level', 'TRACE')
 
-    dbchannels = DBChannels(_config_obj.data)
-    dbchannels.create_tables()
 
+        except Exception:
+            # Make sure that the patcher exits normally so the maintenance flag is removed
+            LOGGER.warning(traceback.format_exc())
     return results
 
 
@@ -60,6 +70,8 @@ def move_key(_config_obj, _key):
 
 def find_key_by_section(_config_obj, _key, _section):
     global LOGGER
+    if not LOGGER:
+        LOGGER = logging.getLogger(__name__)
     if _section in _config_obj.data:
         if _key in _config_obj.data[_section]:
             LOGGER.info('Moving setting {}:{} to instance'.format(_section, _key))
@@ -68,11 +80,11 @@ def find_key_by_section(_config_obj, _key, _section):
             for section in sections:
                 _config_obj.write(section, _key, value)
             _config_obj.write(_section, _key, None)
-    
+
 
 def find_instance(_config, _plugin_name):
     sections = []
     for section in _config.keys():
-        if section.startswith(_plugin_name+'_'):
+        if section.startswith(_plugin_name + '_'):
             sections.append(section)
     return sections
diff --git a/lib/updater/plugins.py b/lib/updater/plugins.py
index b6ccf7e..76440a1 100644
--- a/lib/updater/plugins.py
+++ b/lib/updater/plugins.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -16,7 +16,38 @@
 substantial portions of the Software.
 """
 
+
+import logging
+
+from lib.db.db_plugins import DBPlugins
+from lib.plugins.plugin_manager.plugin_manager import PluginManager
+
+
 class PluginsUpgrade:
 
-    def __init__(self):
-        pass
\ No newline at end of file
+    def __init__(self, _plugins):
+        self.logger = logging.getLogger(__name__)
+        self.config_obj = _plugins.config_obj
+        self.config = _plugins.config_obj.data
+        self.plugin_db = DBPlugins(self.config)
+        self.pm = PluginManager(None, self.config_obj)
+
+
+    def upgrade_plugins(self, _web_status):
+        _web_status.data += '#### Checking Plugins ####<br>\r\n'
+        plugin_defns = self.plugin_db.get_plugins(True)
+        if not plugin_defns:
+            return True
+
+        for p_defn in plugin_defns:
+            if not p_defn.get('external'):
+                continue
+            if p_defn['version']['current'] == p_defn['version']['latest']:
+                continue
+            # upgrade available
+            _web_status.data += self.pm.delete_plugin(p_defn['repoid'], p_defn['id'])
+            _web_status.data += self.pm.install_plugin(p_defn['repoid'], p_defn['id'])
+        _web_status.data += '<br>\r\n#### Plugin Upgrades Finished ####<br>\r\n'
+
+        return True
+
diff --git a/lib/updater/updater.py b/lib/updater/updater.py
index 2f1fdb0..9fdc4dc 100644
--- a/lib/updater/updater.py
+++ b/lib/updater/updater.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -17,27 +17,29 @@
 """
 
 import importlib
+import importlib.resources
 import json
 import logging
-import pathlib
 import re
 import time
-import urllib.request
 from threading import Thread
 
 import lib.common.utils as utils
-import lib.updater.cabernet as cabernet
 from lib.db.db_scheduler import DBScheduler
 from lib.db.db_plugins import DBPlugins
 from lib.common.decorators import getrequest
 from lib.web.pages.templates import web_templates
 from lib.updater.cabernet import CabernetUpgrade
+from lib.updater.plugins import PluginsUpgrade
 from lib.common.string_obj import StringObj
 from lib.common.tmp_mgmt import TMPMgmt
+from lib.updater import cabernet
+from lib.plugins.repo_handler import RepoHandler
 
 STATUS = StringObj()
 IS_UPGRADING = False
 
+
 @getrequest.route('/api/upgrade')
 def upgrade(_webserver):
     global STATUS
@@ -45,9 +47,9 @@ def upgrade(_webserver):
     v = Updater(_webserver.plugins)
     try:
         if 'id' in _webserver.query_data:
-            if _webserver.query_data['id'] != utils.CABERNET_NAMESPACE:
-                _webserver.do_mime_response(501, 'text/html', 
-                    web_templates['htmlError'].format('501 - Invalid ID'))
+            if _webserver.query_data['id'] != utils.CABERNET_ID:
+                _webserver.do_mime_response(501, 'text/html',
+                                            web_templates['htmlError'].format('501 - Invalid ID'))
                 return
             if not IS_UPGRADING:
                 IS_UPGRADING = True
@@ -59,10 +61,10 @@ def upgrade(_webserver):
             return
         else:
             _webserver.do_mime_response(501, 'text/html',
-                web_templates['htmlError'].format('404 - Unknown action'))
+                                        web_templates['htmlError'].format('404 - Unknown action'))
     except KeyError:
-        _webserver.do_mime_response(501, 'text/html', 
-            web_templates['htmlError'].format('501 - Badly formed request'))
+        _webserver.do_mime_response(501, 'text/html',
+                                    web_templates['htmlError'].format('501 - Badly formed request'))
 
 
 def check_for_updates(plugins):
@@ -91,23 +93,27 @@ def scheduler_tasks(self):
                 'internal',
                 None,
                 'lib.updater.updater.check_for_updates',
-                20,
-                'thread',
+                99,
+                'inline',
                 'Checks cabernet and all plugins for updated versions'
-                ):
+        ):
             scheduler_db.save_trigger(
                 'Applications',
                 'Check for Updates',
                 'interval',
                 interval=2850,
                 randdur=60
-                )
+            )
             scheduler_db.save_trigger(
                 'Applications',
                 'Check for Updates',
                 'startup')
 
     def update_version_info(self):
+        self.logger.info('Updating Repo Cabernet-Repository versions')
+        self.repos = RepoHandler(self.config_obj)
+        self.repos.load_cabernet_repo()
+        self.logger.info('Updating Cabernet versions')
         c = CabernetUpgrade(self.plugins)
         c.update_version_info()
 
@@ -115,7 +121,7 @@ def import_manifest(self):
         """
         Loads the manifest for cabernet from a file
         """
-        json_settings = importlib.resources.read_text(self.config['paths']['resources_pkg'], MANIFEST_FILE)
+        json_settings = importlib.resources.read_text(self.config['paths']['resources_pkg'], utils.CABERNET_REPO)
         settings = json.loads(json_settings)
         return settings
 
@@ -123,14 +129,14 @@ def load_manifest(self, _manifest):
         """
         Loads the cabernet manifest from DB
         """
-        return self.plugin_db.get_plugins(_manifest)[0]
+        return self.plugin_db.get_plugins(_installed=True, _namespace=_manifest)[0]
 
     def save_manifest(self, _manifest):
         """
         Saves to DB the manifest for cabernet
         """
         self.plugin_db.save_plugin(_manifest)
- 
+
     def upgrade_app(self, _id):
         """
         Initial request to perform an upgrade
@@ -140,6 +146,7 @@ def upgrade_app(self, _id):
 
         STATUS.data = 'Starting upgrade...<br>\r\n'
 
+        # upgrade the main cabernet app
         app = CabernetUpgrade(self.plugins)
         if not app.upgrade_app(STATUS):
             STATUS.data += '<script type="text/javascript">upgrading = "failed"</script>'
@@ -147,15 +154,21 @@ def upgrade_app(self, _id):
             IS_UPGRADING = False
             return
 
-        # what do we do with plugins?  They go here if necessary
-        STATUS.data += '(TBD) Upgrading plugins...<br>\r\n'
+        # upgrade the installed external plugins
+        p = PluginsUpgrade(self.plugins)
+        if not p.upgrade_plugins(STATUS):
+            STATUS.data += '<script type="text/javascript">upgrading = "failed"</script>'
+            time.sleep(1)
+            IS_UPGRADING = False
+            return
 
         STATUS.data += 'Entering Maintenance Mode...<br>\r\n'
+        # make sure the config_handler really has the config data uploaded
+        self.config_obj.config_handler.read(self.config_obj.data['paths']['config_file'])
         self.config_obj.write('main', 'maintenance_mode', True)
 
         STATUS.data += 'Restarting app in 3...<br>\r\n'
         self.tmp_mgmt.cleanup_tmp()
-        IS_UPGRADING = False
         time.sleep(0.8)
         STATUS.data += '2...<br>\r\n'
         time.sleep(0.8)
@@ -163,9 +176,10 @@ def upgrade_app(self, _id):
         STATUS.data += '<script type="text/javascript">upgrading = "success"</script>'
         time.sleep(1)
         self.restart_app()
-        
+        IS_UPGRADING = False
+
     def restart_app(self):
         # get schedDB and find restart taskid.
         scheduler_db = DBScheduler(self.config)
         task = scheduler_db.get_tasks('Applications', 'Restart')[0]
-        self.sched_queue.put({'cmd': 'runtask', 'taskid': task['taskid'] })
+        self.sched_queue.put({'cmd': 'runtask', 'taskid': task['taskid']})
diff --git a/lib/web/htdocs/html/index.html b/lib/web/htdocs/html/index.html
index f6b7665..03dbee8 100644
--- a/lib/web/htdocs/html/index.html
+++ b/lib/web/htdocs/html/index.html
@@ -5,7 +5,6 @@
 
     <meta name="viewport"
         content="viewport-fit=cover, width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="manifest" href="manifest.json">
     <meta name="format-detection" content="telephone=no">
     <meta name="msapplication-tap-highlight" content="no">
 
@@ -41,6 +40,7 @@
     <link rel="stylesheet" type="text/css" href="/modules/emby-elements/emby-button/emby-button.css">
     <link rel="stylesheet" type="text/css" href="/modules/backdrop/style.css">
     <link rel="stylesheet" type="text/css" href="/modules/flexstyles.css">
+    <link rel="stylesheet" type="text/css" href="/modules/listview/listview.css">
     <title>cabernet</title>
 
     <style>
@@ -87,7 +87,7 @@
     <div class="mainDrawer scrollY hiddenScrollY-hover scrollY-mini drawer-docked drawer-open"
         style="will-change: transform;">
         <div class="navDrawerHeader flex flex-direction-row align-items-center">
-            <div class="navDrawerLogo pageTitleWithDefaultLogo flex-grow" href="/" title="Home">
+            <div class="navDrawerLogo pageTitleWithDefaultLogo flex-grow" title="Home">
             </div>
             <button type="button" 
                 class="navClosePanel btnPinNavDrawer paper-icon-button-light " 
@@ -106,7 +106,7 @@
                 <div class="collapseContent navDrawerCollapseContent content-inner" style="height: auto;">
                     <a 
                         class="navMenuOption navButton"
-                        href="#" onclick='load_url("/html/links.html")' 
+                        href="#" onclick='load_url("/html/links.html", "Cabernet Links")' 
                         title="Home Screen">
                         <i class="md-icon navMenuOptionIcon">message</i>
                         <span class="navMenuOptionText">XML/JSON Links</span>
@@ -121,26 +121,26 @@
             <div title="Configuration" class="collapsible-content">
                 <div class="collapseContent navDrawerCollapseContent content-inner" style="height: auto;">
                     <a
-                        class="navMenuOption navButton" href="#" onclick='load_url("/api/configform?area=general")' title="Display">
+                        class="navMenuOption navButton" href="#" onclick='load_url("/api/configform?area=general", "Cabernet Settings:Internal")' title="Display">
                         <i class="md-icon navMenuOptionIcon">settings</i>
                         <span class="navMenuOptionText">Internal</span>
                     </a>
                     <a
-                        class="navMenuOption navButton" href="#" onclick='load_url("/api/configform?area=streams")' title="Stream Providers">
-                        <i class="md-icon navMenuOptionIcon">cast</i>
+                        class="navMenuOption navButton" href="#" onclick='load_url("/api/configform?area=streams", "Cabernet Settings:Streams")' title="Stream Providers">
+                        <i class="md-icon navMenuOptionIcon">extension</i>
                         <span class="navMenuOptionText">Stream Providers</span>
                     </a>
                     <a
-                        class="navMenuOption navButton" href="#" onclick='load_url("/api/configform?area=epg")' title="EPG Providers">
-                        <i class="md-icon navMenuOptionIcon">cast</i>
+                        class="navMenuOption navButton" href="#" onclick='load_url("/api/configform?area=epg", "Cabernet Settings:EPG")' title="EPG Providers">
+                        <i class="md-icon navMenuOptionIcon">extension</i>
                         <span class="navMenuOptionText">EPG Providers</span>
                     </a>
                     <a
-                        class="navMenuOption navButton" href="#" onclick='load_url("/api/configform?area=clients")' title="Providers">
+                        class="navMenuOption navButton" href="#" onclick='load_url("/api/configform?area=clients", "Cabernet Settings:Clients")' title="Providers">
                         <i class="md-icon navMenuOptionIcon">tv</i>
                         <span class="navMenuOptionText">Clients</span>
                     </a>
-                    <a class="navMenuOption navButton" href="#" onclick='load_url("/api/configform?area=logging")' title="Logging">
+                    <a class="navMenuOption navButton" href="#" onclick='load_url("/api/configform?area=logging", "Cabernet Settings:Logging")' title="Logging">
                         <i class="md-icon navMenuOptionIcon">article</i>
                         <span class="navMenuOptionText">Logging</span>
                     </a>
@@ -154,25 +154,33 @@
             <div title="Configuration" class="collapsible-content">
                 <div class="collapseContent navDrawerCollapseContent content-inner" style="height: auto;">
                     <a
-                        class="navMenuOption navButton" href="#" onclick='load_url("/api/channels")' title="Channel Editor">
+                        class="navMenuOption navButton" href="#" onclick='load_url("/api/channels", "Cabernet Channel Editor")' title="Channel Editor">
                         <i class="md-icon navMenuOptionIcon">build</i>
                         <span class="navMenuOptionText">Channel Editor</span>
                     </a>
                 </div>
                 <div class="collapseContent navDrawerCollapseContent content-inner" style="height: auto;">
                     <a
-                        class="navMenuOption navButton" href="#" onclick='load_url("/api/schedulehtml")' title="Scheduled Tasks">
+                        class="navMenuOption navButton" href="#" onclick='load_url("/api/schedulehtml", "Cabernet Scheduler")' title="Scheduled Tasks">
                         <i class="md-icon navMenuOptionIcon">schedule</i>
                         <span class="navMenuOptionText">Scheduled Tasks</span>
                     </a>
                 </div>
                 <div class="collapseContent navDrawerCollapseContent content-inner" style="height: auto;">
                     <a
-                        class="navMenuOption navButton" href="#" onclick='load_url("/api/data_mgmt")' title="Data Management">
+                        class="navMenuOption navButton" href="#" onclick='load_url("/api/datamgmt", "Cabernet Data Management")' title="Data Management">
                         <i class="md-icon navMenuOptionIcon">inventory_2</i>
                         <span class="navMenuOptionText">Data Mgmt</span>
                     </a>
                 </div>
+                <div class="collapseContent navDrawerCollapseContent content-inner" style="height: auto;">
+                    <a
+                        class="navMenuOption navButton" href="#" onclick='load_url("/api/plugins", "Cabernet Plugins")' title="Plugins">
+                        <i class="md-icon navMenuOptionIcon">shopping_cart</i>
+                        <span class="navMenuOptionText">Plugins</span>
+                        <div id="pluginStatus" class="status-note"></div>
+                    </a>
+                </div>
                 <hr>
             </div>
         </div>
diff --git a/lib/web/htdocs/html/links.html b/lib/web/htdocs/html/links.html
index 6aba2c9..257cb22 100644
--- a/lib/web/htdocs/html/links.html
+++ b/lib/web/htdocs/html/links.html
@@ -6,7 +6,6 @@ <h2>Cabernet</h2>
     <p>This is a list of interfaces provided by Cabernet.
         If it states HDHR, then the interface matches that of HDHomerun tuners.
     <ul>
-        <li><a class="button-link emby-button" href="/playlist" target="_blank">/playlist: Same as channels.m3u</a>
         <li><a class="button-link emby-button" href="/device.xml" target="_blank">/device.xml: DLNA/SSDP device description response</a>
         <li><a class="button-link emby-button" href="/discover.json" target="_blank">/discover.json: HDHR, app metadata</a>
         <li><a class="button-link emby-button" href="/lineup_status.json" target="_blank">/lineup_status.json: HDHR, stream source data</a>
@@ -14,8 +13,35 @@ <h2>Cabernet</h2>
         <li><a class="button-link emby-button" href="/lineup.xml" target="_blank">/lineup.xml: HDHR, channel list in XML format</a>
         <li><a class="button-link emby-button" href="/xmltv.xml" target="_blank">/xmltv.xml: XMLTV formatted EPG</a>
         <li><a class="button-link emby-button" href="/channels.m3u" target="_blank">/channels.m3u: M3U formatted channel list</a>
+        <li><a class="button-link emby-button" href="/playlist" target="_blank">/playlist M3U formatted channel list</a>
         <li><a class="button-link emby-button" href="/config.json" target="_blank">/config.json: JSON list of most config parameters</a>
-        <li>/watch/#id: Tunes stream to Channel ID requested</a>
-        <li>/auto/v#id: HDHR, Tunes stream to Channel ID requested</a>
+        <li>/watch/#uid: Tunes stream to Channel ID requested</li>
+        <li>/auto/v#chnum: HDHR, Tunes stream to Channel Number requested</li>
     </ul>
+
+    All links above have the same ability to apply to any plugin.  You can request the data filtered
+    for a plugin or for an instance of the plugin.<br><br>
+    
+
+    <h3>Examples of URLs</h3>
+    <pre>    http://idaddress:6077/PlUtotV/DeFauLt/channel.m3u</pre>
+    will generate a list of channels for the PlutoTV:default instance while
+    <pre>    http://idaddress:6077/M3U/channel.m3u</pre>
+    generates a list of channels for all instances of the M3U plugin, combined.
+    To get an EPG for everything under XUMO
+    <pre>    http://idaddress:6077/Xumo/xmltv.xml</pre>   
+    To get a M3U formatted channel list of M3U:Stirr
+    <pre>    http://idaddress:6077/m3u/sTirR/playlist or
+    http://idaddress:6077/m3U/sTirR/channels.m3u</pre>   
+    To get EPG for all plugins in Cabernet
+    <pre>    http://idaddress:6077/xmltv.xml</pre>
+
+    For TVHeadend, it would be appropriate to create a network for each plugin or plugin:instance.<br>
+    For Plex, you can create a TV Source and Guide Data for all or per plugin<br>
+    For Emby and JellyFin, you can create a TV Source and Guide Data for all, per plugin, or plugin:instance.
+
+    Setting up the HDHomeRun connection with Emby, Plex or JellyFin, you can use the following link<br>
+    http://ipaddress:6077 or http://ipaddress:6077/PlutoTV<br>
+    for plutotv only channels. When requested, use the full url to identify the xmltv.xml file
+
 </body>
diff --git a/lib/web/htdocs/modules/channels/channelsform.js b/lib/web/htdocs/modules/channels/channelsform.js
index 8a8e9af..acfa286 100644
--- a/lib/web/htdocs/modules/channels/channelsform.js
+++ b/lib/web/htdocs/modules/channels/channelsform.js
@@ -118,7 +118,7 @@ $(document).ready(setTimeout(function(){
             $('table.sortable td:nth-child('+index+')').each(function() {
                 if ( $(this).find('input').length > 0 ) {
                     if ( keyValue.toLowerCase() == "blank" ) {
-                        if ( $(this).find('input').is(":empty") ) {
+                        if ( !$(this).find('input').val() ) {
                             $(this).parent().removeClass(name+"-hide");
                         } else {
                             $(this).parent().addClass(name+"-hide");
diff --git a/lib/web/htdocs/modules/dashboard/__init__.py b/lib/web/htdocs/modules/dashboard/__init__.py
old mode 100755
new mode 100644
diff --git a/lib/web/htdocs/modules/dashboard/dashboard.css b/lib/web/htdocs/modules/dashboard/dashboard.css
old mode 100755
new mode 100644
diff --git a/lib/web/htdocs/modules/dashboard/dashboard.js b/lib/web/htdocs/modules/dashboard/dashboard.js
old mode 100755
new mode 100644
index e148b1e..576fcd6
--- a/lib/web/htdocs/modules/dashboard/dashboard.js
+++ b/lib/web/htdocs/modules/dashboard/dashboard.js
@@ -32,23 +32,29 @@ $(document).ready(setTimeout(function(){
         $('#dashboard').html('<h3 style="margin:0;">Tuner Status</h3><table id="tuners" ></table>');
         $('#tuners').append('<thead><tr><th class="header" style="min-width: 10ch;">State</th>'
             + '<th class="header" style="min-width: 10ch;">Plugin</th>'
-            + '<th class="header" style="min-width: 10ch;">Tuner</th>'
+            + '<th class="header" style="min-width: 7ch;">Tuner</th>'
             + '<th class="header" style="min-width: 10ch;">Instance</th>'
-            + '<th class="header" style="min-width: 10ch;">Channel</th></thead>'
+            + '<th class="header" style="min-width: 7ch;">Channel</th>'
+            + '<th class="header" style="min-width: 7ch;">Clients</th></thead>'
             );
         var active = false;
-        $.each(tuner_data, function(key1, list_value) {
-            if(list_value !== null) {
-                if (typeof list_value === 'object' ) {
-                    $.each(list_value, function(key2, tuner_status) {
-                        if (typeof tuner_status === 'object' ) {
-                            $('#tuners').append('<tr><td>' + tuner_status.status +'</td><td>' + key1 + '</td><td>tuner' + key2 + '</td><td>' + tuner_status.instance + '</td><td>' + tuner_status.ch + '</td></tr>');
-                            active = true
-                        }
-                    });
+        if ( tuner_data === null ) {
+            $('#tuners').append('<tr><td colspan=5>Tuner Status is Down, check 5004 process</td></tr>');
+        } else {
+            $.each(tuner_data, function(key1, list_value) {
+                if(list_value !== null) {
+                    if (typeof list_value === 'object' ) {
+                        $.each(list_value, function(key2, tuner_status) {
+                            if (typeof tuner_status === 'object' ) {
+                                $('#tuners').append('<tr><td>' + tuner_status.status +'</td><td>' + key1 + '</td><td>tuner' + key2 + '</td><td>' + tuner_status.instance + '</td><td>' + tuner_status.ch + '</td><td>' + tuner_status.mux + '</td></tr>');
+                                active = true;
+                                console.log(tuner_status);
+                            }
+                        });
+                    }
                 }
-            }
-        });
+            });
+        }
         return active;
     }
 
@@ -69,7 +75,5 @@ $(document).ready(setTimeout(function(){
         });
         return active;
     }
-
     populateDashboard();
-    
 }, 1000));
diff --git a/lib/web/htdocs/modules/fonts/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2 b/lib/web/htdocs/modules/fonts/material-icons/flUhRq6tzZclQEJ-Vdg-IuiaDsNc.woff2
old mode 100755
new mode 100644
diff --git a/plugins/provider_video_123tv/lib/__init__.py b/lib/web/htdocs/modules/listview/__init__.py
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/provider_video_123tv/lib/__init__.py
rename to lib/web/htdocs/modules/listview/__init__.py
diff --git a/lib/web/htdocs/modules/listview/listview.css b/lib/web/htdocs/modules/listview/listview.css
index de9f30c..12e7637 100644
--- a/lib/web/htdocs/modules/listview/listview.css
+++ b/lib/web/htdocs/modules/listview/listview.css
@@ -1,348 +1,428 @@
-.listItem{
-  background:0 0;
-  border:0;
-  outline:0!important;
-  color:inherit;
-  vertical-align:middle;
-  font-family:inherit;
-  font-size:inherit;
-  margin:0;
-  display:-webkit-box;
-  display:-webkit-flex;
-  display:flex;
-  -webkit-box-align:center;
-  -webkit-align-items:center;
-  align-items:center;
-  text-align:left;
-  padding:.25em 0;
-  overflow:hidden;
-  -webkit-flex-shrink:0;
-  flex-shrink:0;
-  text-decoration:none;
-  line-height:inherit
-}
-.listItem.dragging-over{
-  position:relative
-}
-.dragging-over-top:before{
-  content:' ';
-  height:.1em;
-  width:100%;
-  position:absolute;
-  top:0;
-  z-index:99999;
-  -webkit-border-radius:100em;
-  border-radius:100em
-}
-.dragging-over-bottom:after{
-  content:' ';
-  height:.1em;
-  width:100%;
-  position:absolute;
-  bottom:0;
-  z-index:99999;
-  -webkit-border-radius:100em;
-  border-radius:100em
-}
-.listItem-noverticalpadding{
-  padding-top:0;
-  padding-bottom:0
-}
-.listItemCursor{
-  cursor:pointer
-}
-@media (pointer:coarse){
-  .listItem-touchzoom-transition{
-    -webkit-transition:-webkit-transform .1s ease-in-out;
-    -o-transition:transform .1s ease-in-out;
-    transition:transform .1s ease-in-out;
-    -webkit-transition-delay:80ms;
-    -o-transition-delay:80ms;
-    transition-delay:80ms
-  }
-  .listItem-touchzoom:active{
-    -webkit-transform:scale(.94);
-    transform:scale(.94)
-  }
-}
-.listItem-largeImage{
-  padding:1em 0
-}
-.listItem-withContentWrapper{
-  -webkit-box-orient:vertical;
-  -webkit-box-direction:normal;
-  -webkit-flex-direction:column;
-  flex-direction:column;
-  -webkit-box-align:start;
-  -webkit-align-items:flex-start;
-  align-items:flex-start
-}
-.listItem-content{
-  display:-webkit-box;
-  display:-webkit-flex;
-  display:flex;
-  -webkit-box-align:center;
-  -webkit-align-items:center;
-  align-items:center;
-  width:100%
-}
-.listItem-indexnumberleft{
-  margin-right:1em;
-  margin-left:.5em
-}
-.listItem-border{
-  border-bottom-width:.08em;
-  border-bottom-style:solid
-}
-.paperListItem:last-child{
-  border-bottom-style:none
-}
-.listItemAside,.listItemIcon,.listItemImageContainer{
-  -webkit-flex-shrink:0;
-  flex-shrink:0
-}
-.listItemButton{
-  margin:0;
-  -webkit-flex-shrink:0;
-  flex-shrink:0;
-  contain:layout style
-}
-@media (pointer:coarse){
-  .listItemContextMenuButton{
-    display:none
-  }
-}
-.listItemBody{
-  -webkit-box-flex:1;
-  -webkit-flex-grow:1;
-  flex-grow:1;
-  padding:.35em .75em;
-  overflow:hidden;
-  -o-text-overflow:ellipsis;
-  text-overflow:ellipsis;
-  -webkit-box-orient:vertical;
-  -webkit-box-direction:normal;
-  -webkit-flex-direction:column;
-  flex-direction:column;
-  vertical-align:middle;
-  -webkit-box-pack:center;
-  -webkit-justify-content:center;
-  justify-content:center;
-  text-align:left;
-  -webkit-box-align:initial;
-  -webkit-align-items:initial;
-  align-items:initial;
-  margin:0
-}
-.listItemBody-noleftpadding{
-  padding-left:0!important
-}
-.listItemBody-code{
-  font-family:monospace
-}
-.listItemBody-noverticalpadding{
-  padding-top:0;
-  padding-bottom:0
-}
-.listItemBodyText{
-  margin:0;
-  overflow:hidden;
-  -o-text-overflow:ellipsis;
-  text-overflow:ellipsis
-}
-.listItemBodyText-nowrap{
-  white-space:nowrap
-}
-.listItemImageContainer{
-  width:3.26em;
-  height:3.26em;
-  position:relative;
-  display:-webkit-box;
-  display:-webkit-flex;
-  display:flex;
-  -webkit-box-align:center;
-  -webkit-align-items:center;
-  align-items:center;
-  -webkit-box-pack:center;
-  -webkit-justify-content:center;
-  justify-content:center;
-  -webkit-border-radius:.3em;
-  border-radius:.3em
-}
-.listItemImage{
-  -webkit-border-radius:.3em;
-  border-radius:.3em;
-  width:100%;
-  height:100%;
-  -o-object-fit:contain;
-  object-fit:contain
-}
-.listItemImage-round,.listItemImageContainer-round{
-  -webkit-border-radius:100em;
-  border-radius:100em
-}
-.listItemImageContainer-large{
-  width:20vw;
-  height:11.25vw;
-  margin-right:.35em
-}
-.listItemImageButton{
-  margin:0;
-  color:rgba(255,255,255,.6);
-  font-size:1.5em;
-  background:0 0;
-  -webkit-transition:-webkit-transform .2s ease-in-out;
-  -o-transition:transform .2s ease-in-out;
-  transition:transform .2s ease-in-out;
-  display:-webkit-box;
-  display:-webkit-flex;
-  display:flex;
-  position:absolute;
-  top:50%;
-  left:50%;
-  margin-left:-2em;
-  margin-top:-2em
-}
-@media(hover:hover) and (pointer:fine){
-  .listItemImageButton:hover{
-    -webkit-transform:scale(1.2,1.2);
-    transform:scale(1.2,1.2)
-  }
-}
-.listItemImageButton-icon{
-  background:rgba(0,0,0,.4);
-  border:.08em solid currentColor;
-  -webkit-border-radius:100em;
-  border-radius:100em;
-  display:-webkit-box;
-  display:-webkit-flex;
-  display:flex;
-  -webkit-box-pack:center;
-  -webkit-justify-content:center;
-  justify-content:center;
-  -webkit-box-align:center;
-  -webkit-align-items:center;
-  align-items:center;
-  padding:.21em
-}
-@media all and (max-width:64em){
-  .listItemImageContainer-large{
-    width:33.75vw;
-    height:18.984375vw
-  }
-  .listItemImageButton{
-    font-size:1.02em!important
-  }
-}
-.listItemImageContainer-large-tv{
-  width:30vw!important;
-  height:16.875vw!important
-}
-.listItemIcon{
-  width:1em!important;
-  height:1em!important;
-  font-size:163%;
-  padding:0 .25em
-}
-.listItemImageContainer>.listItemIcon{
-  margin:0
-}
-.listViewDragHandle{
-  touch-action:none;
-  padding:1em
-}
-.listItemProgressBar{
-  position:absolute!important;
-  bottom:0;
-  left:0;
-  right:0
-}
-.listItem:focus{
-  -webkit-border-radius:.42em;
-  border-radius:.42em
-}
-.listItem:focus .secondary{
-  color:inherit!important
-}
-.listItem-focusscale{
-  -webkit-transition:-webkit-transform .2s ease-out;
-  -o-transition:transform .2s ease-out;
-  transition:transform .2s ease-out
-}
-.listItem-focusscale:focus{
-  -webkit-transform:scale(1.025,1.025);
-  transform:scale(1.025,1.025)
-}
-.paperList{
-  margin:.5em auto;
-  -webkit-border-radius:.3em;
-  border-radius:.3em
-}
-.paperList-clear{
-  background-color:transparent!important
-}
-.paperList .listItemImageContainer{
-  margin:0 .25em 0 1em
-}
-.listItemMediaInfo{
-  display:none;
-  -webkit-box-align:center;
-  -webkit-align-items:center;
-  align-items:center;
-  margin-right:1em;
-  -webkit-flex-shrink:0;
-  flex-shrink:0
-}
-.listGroupHeader-first{
-  margin-top:0
-}
-.listItemIndicators{
-  right:.324em;
-  top:.324em;
-  position:absolute;
-  display:-webkit-box;
-  display:-webkit-flex;
-  display:flex;
-  -webkit-box-align:center;
-  -webkit-align-items:center;
-  align-items:center
-}
-.listItem,.listItemBody,.listItemMediaInfo{
-  display:-webkit-box;
-  display:-webkit-flex;
-  display:flex;
-  contain:layout style
-}
-.listItem-bottomoverview{
-  font-size:88%;
-  margin-top:.2em
-}
-@media not all and (min-width:50em){
-  .listItem-overview{
-    display:none!important
-  }
-}
-@media all and (min-width:50em){
-  .listItem-bottomoverview{
-    display:none!important
-  }
-}
-.listItemCheckboxContainer{
-  width:auto!important
-}
-@media all and (max-width:75em){
-  .listViewUserDataButtons{
-    display:none!important
-  }
-}
-.listItemPlayedIndicator{
-  font-size:1.6em
-}
-.listItem .mediaStreamAttribute{
-  padding-left:2.3em
-}
-@media(pointer:coarse){
-  .listItem-textActionButton{
-    pointer-events:none!important
-  }
-}
+.menuIconButton{
+    color: var(--theme-text-color); 
+    background-color: var(--card-background);
+    border-radius: 8px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    padding-right: 8px;
+    padding-left: 8px;
+}
+
+.menuSection{
+    min-width: inherit;
+    font-size: 1.7em;
+    background: var(--card-background);
+    border: 3px inset var(--docked-drawer-background);
+    display: inline-flex;
+    vertical-align: top;
+}
+
+.menuSection:hover{
+    opacity: 0.5;
+}
+
+.menuButton{
+    padding: 8px 8px;
+    padding-right: 1em;
+    width: 100%;
+    text-align: left;
+    display: flex;
+    align-items: center;
+    position: relative;
+    background-color: inherit;
+    color: var(--theme-text-color);
+    border: 0;
+}
+.menuButton:hover {
+    background-color: var(--theme-button-hover-color);
+    cursor: pointer;    
+}
+.menuItem:{
+    position: relative;
+}
+
+.menuList{
+    margin: 0;
+    display: block;
+    padding: 0;
+    list-style-type: none;
+}
+.menuList + .menuList{
+        border-top: 1px solid #ddd;
+}
+.menuPanel{
+    display: flex;
+    flex-direction: column;
+}
+.menuCanvas{
+    position: absolute;
+    padding-top: 13px;
+    padding-bottom: 13px;
+    top: 0px;
+    left:0px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    border-radius: 10px;
+    background-color: var(--drawer-background);
+    opacity: 1.0;
+    border: var(--line-size) solid var(--line-background) 
+}
+
+.listItemHide{
+    display: none;
+}
+.listItemShow{
+    display: flex;
+}
+
+
+
+.listItem{
+  background:0 0;
+  border:0;
+  outline:0!important;
+  color:inherit;
+  vertical-align:middle;
+  font-family:inherit;
+  font-size:inherit;
+  margin:0;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+  align-items:center;
+  text-align:left;
+  padding:.25em 0;
+  overflow:hidden;
+  -webkit-flex-shrink:0;
+  flex-shrink:0;
+  text-decoration:none;
+  line-height:inherit
+}
+.listItem.dragging-over{
+  position:relative
+}
+.dragging-over-top:before{
+  content:' ';
+  height:.1em;
+  width:100%;
+  position:absolute;
+  top:0;
+  z-index:99999;
+  -webkit-border-radius:100em;
+  border-radius:100em
+}
+.dragging-over-bottom:after{
+  content:' ';
+  height:.1em;
+  width:100%;
+  position:absolute;
+  bottom:0;
+  z-index:99999;
+  -webkit-border-radius:100em;
+  border-radius:100em
+}
+.listItem-noverticalpadding{
+  padding-top:0;
+  padding-bottom:0
+}
+.listItemCursor{
+  cursor:pointer
+}
+@media (pointer:coarse){
+  .listItem-touchzoom-transition{
+    -webkit-transition:-webkit-transform .1s ease-in-out;
+    -o-transition:transform .1s ease-in-out;
+    transition:transform .1s ease-in-out;
+    -webkit-transition-delay:80ms;
+    -o-transition-delay:80ms;
+    transition-delay:80ms
+  }
+  .listItem-touchzoom:active{
+    -webkit-transform:scale(.94);
+    transform:scale(.94)
+  }
+}
+.listItem-largeImage{
+  padding:1em 0
+}
+.listItem-withContentWrapper{
+  -webkit-box-orient:vertical;
+  -webkit-box-direction:normal;
+  -webkit-flex-direction:column;
+  flex-direction:column;
+  -webkit-box-align:start;
+  -webkit-align-items:flex-start;
+  align-items:flex-start
+}
+.listItem-content{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+  align-items:center;
+  width:100%
+}
+.listItem-indexnumberleft{
+  margin-right:1em;
+  margin-left:.5em
+}
+.listItem-border{
+  border-bottom-width:.08em;
+  border-bottom-style:solid
+}
+.paperListItem:last-child{
+  border-bottom-style:none
+}
+.listItemAside,.listItemIcon,.listItemImageContainer{
+  -webkit-flex-shrink:0;
+  flex-shrink:0
+}
+.listItemButton{
+  margin:0;
+  -webkit-flex-shrink:0;
+  flex-shrink:0;
+  contain:layout style
+}
+@media (pointer:coarse){
+  .listItemContextMenuButton{
+    display:none
+  }
+}
+.listItemBody{
+  -webkit-box-flex:1;
+  -webkit-flex-grow:1;
+  flex-grow:1;
+  padding:.35em .75em;
+  overflow:hidden;
+  -o-text-overflow:ellipsis;
+  text-overflow:ellipsis;
+  -webkit-box-orient:vertical;
+  -webkit-box-direction:normal;
+  -webkit-flex-direction:column;
+  flex-direction:column;
+  vertical-align:middle;
+  -webkit-box-pack:center;
+  -webkit-justify-content:center;
+  justify-content:center;
+  text-align:left;
+  -webkit-box-align:initial;
+  -webkit-align-items:initial;
+  align-items:initial;
+  margin:0
+}
+.listItemBody-noleftpadding{
+  padding-left:0!important
+}
+.listItemBody-code{
+  font-family:monospace
+}
+.listItemBody-noverticalpadding{
+  padding-top:0;
+  padding-bottom:0
+}
+.listItemBodyText{
+  margin:0;
+  overflow:hidden;
+  -o-text-overflow:ellipsis;
+  text-overflow:ellipsis
+}
+.listItemBodyText-nowrap{
+  white-space:nowrap
+}
+.listItemImageContainer{
+  width:3.26em;
+  height:3.26em;
+  position:relative;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+  align-items:center;
+  -webkit-box-pack:center;
+  -webkit-justify-content:center;
+  justify-content:center;
+  -webkit-border-radius:.3em;
+  border-radius:.3em
+}
+.listItemImage{
+  -webkit-border-radius:.3em;
+  border-radius:.3em;
+  width:100%;
+  height:100%;
+  -o-object-fit:contain;
+  object-fit:contain
+}
+.listItemImage-round,.listItemImageContainer-round{
+  -webkit-border-radius:100em;
+  border-radius:100em
+}
+.listItemImageContainer-large{
+  width:20vw;
+  height:11.25vw;
+  margin-right:.35em
+}
+.listItemImageButton{
+  margin:0;
+  color:rgba(255,255,255,.6);
+  font-size:1.5em;
+  background:0 0;
+  -webkit-transition:-webkit-transform .2s ease-in-out;
+  -o-transition:transform .2s ease-in-out;
+  transition:transform .2s ease-in-out;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  position:absolute;
+  top:50%;
+  left:50%;
+  margin-left:-2em;
+  margin-top:-2em
+}
+@media(hover:hover) and (pointer:fine){
+  .listItemImageButton:hover{
+    -webkit-transform:scale(1.2,1.2);
+    transform:scale(1.2,1.2)
+  }
+}
+.listItemImageButton-icon{
+  background:rgba(0,0,0,.4);
+  border:.08em solid currentColor;
+  -webkit-border-radius:100em;
+  border-radius:100em;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  -webkit-box-pack:center;
+  -webkit-justify-content:center;
+  justify-content:center;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+  align-items:center;
+  padding:.21em
+}
+@media all and (max-width:64em){
+  .listItemImageContainer-large{
+    width:33.75vw;
+    height:18.984375vw
+  }
+  .listItemImageButton{
+    font-size:1.02em!important
+  }
+}
+.listItemImageContainer-large-tv{
+  width:30vw!important;
+  height:16.875vw!important
+}
+.listItemIcon{
+  width:1em!important;
+  height:1em!important;
+  font-size:163%;
+  padding:0 .25em
+}
+.listItemImageContainer>.listItemIcon{
+  margin:0
+}
+.listViewDragHandle{
+  touch-action:none;
+  padding:1em
+}
+.listItemProgressBar{
+  position:absolute!important;
+  bottom:0;
+  left:0;
+  right:0
+}
+.listItem:focus{
+  -webkit-border-radius:.42em;
+  border-radius:.42em
+}
+.listItem:focus .secondary{
+  color:inherit!important
+}
+.listItem-focusscale{
+  -webkit-transition:-webkit-transform .2s ease-out;
+  -o-transition:transform .2s ease-out;
+  transition:transform .2s ease-out
+}
+.listItem-focusscale:focus{
+  -webkit-transform:scale(1.025,1.025);
+  transform:scale(1.025,1.025)
+}
+.paperList{
+  margin:.5em auto;
+  -webkit-border-radius:.3em;
+  border-radius:.3em
+}
+.paperList-clear{
+  background-color:transparent!important
+}
+.paperList .listItemImageContainer{
+  margin:0 .25em 0 1em
+}
+.listItemMediaInfo{
+  display:none;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+  align-items:center;
+  margin-right:1em;
+  -webkit-flex-shrink:0;
+  flex-shrink:0
+}
+.listGroupHeader-first{
+  margin-top:0
+}
+.listItemIndicators{
+  right:.324em;
+  top:.324em;
+  position:absolute;
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  -webkit-box-align:center;
+  -webkit-align-items:center;
+  align-items:center
+}
+.listItem,.listItemBody,.listItemMediaInfo{
+  display:-webkit-box;
+  display:-webkit-flex;
+  display:flex;
+  contain:layout style
+}
+.listItem-bottomoverview{
+  font-size:88%;
+  margin-top:.2em
+}
+@media not all and (min-width:50em){
+  .listItem-overview{
+    display:none!important
+  }
+}
+@media all and (min-width:50em){
+  .listItem-bottomoverview{
+    display:none!important
+  }
+}
+.listItemCheckboxContainer{
+  width:auto!important
+}
+@media all and (max-width:75em){
+  .listViewUserDataButtons{
+    display:none!important
+  }
+}
+.listItemPlayedIndicator{
+  font-size:1.6em
+}
+.listItem .mediaStreamAttribute{
+  padding-left:2.3em
+}
+@media(pointer:coarse){
+  .listItem-textActionButton{
+    pointer-events:none!important
+  }
+}
diff --git a/lib/web/htdocs/modules/listview/listview.js b/lib/web/htdocs/modules/listview/listview.js
index 201cd93..fd457b8 100644
--- a/lib/web/htdocs/modules/listview/listview.js
+++ b/lib/web/htdocs/modules/listview/listview.js
@@ -1,155 +1,155 @@
-define(["itemContextMenu", "dom", "cardBuilder", "itemShortcuts", "itemHelper", "mediaInfo", "indicators", "connectionManager", "layoutManager", "globalize", "datetime", "apphost", "imageLoader", "focusManager", "css!./listview", "emby-ratingbutton", "emby-playstatebutton", "embyProgressBarStyle", "emby-linkbutton"], function(itemContextMenu, dom, cardBuilder, itemShortcuts, itemHelper, mediaInfo, indicators, connectionManager, layoutManager, globalize, datetime, appHost, imageLoader, focusManager) {
-	"use strict";
-	var supportsNativeLazyLoading = "loading" in HTMLImageElement.prototype;
-
-	function getTextLinesHtml(textlines, isLargeStyle, allowTextWrap) {
-		var html = "",
-			isFirst = !0,
-			cssClass = "listItemBodyText";
-		allowTextWrap || (cssClass += " listItemBodyText-nowrap");
-		for (var i = 0, length = textlines.length; i < length; i++) {
-			var text = textlines[i];
-			text && (html += isFirst ? isLargeStyle ? '<h3 class="' + cssClass + '">' : '<div class="' + cssClass + '">' : '<div class="' + cssClass + ' listItemBodyText-secondary">', html += text, html += isFirst && isLargeStyle ? "</h3>" : "</div>", isFirst = !1)
-		}
-		return html
-	}
-
-	function getId(item) {
-		return item.Id
-	}
-
-	function getListItemHtml(item, index, options) {
-		var enableOverview = options.enableOverview,
-			enableSideMediaInfo = options.enableSideMediaInfo,
-			clickEntireItem = options.clickEntireItem,
-			isLargeStyle = options.isLargeStyle,
-			enableContentWrapper = options.enableContentWrapper,
-			tagName = options.tagName,
-			action = options.action,
-			html = "",
-			downloadWidth = isLargeStyle ? 600 : 80;
-		enableContentWrapper && (html += '<div class="listItem-content">');
-		var imgUrl, imageContainerClass, imageClass, playOnImageClick, imageAction, color, icon, iconCssClass, indicatorsHtml, progressHtml, serverId = item.ServerId,
-			apiClient = serverId ? connectionManager.getApiClient(serverId) : null,
-			itemType = item.Type;
-		!1 !== options.image && (imgUrl = cardBuilder.getImageUrl(item, apiClient, {
-			width: downloadWidth,
-			showChannelLogo: "channel" === options.imageSource
-		}).imgUrl, imageContainerClass = "listItemImageContainer", imageClass = "listItemImage", isLargeStyle && (imageContainerClass += " listItemImageContainer-large", layoutManager.tv && (imageContainerClass += " listItemImageContainer-large-tv")), options.roundImage && (imageClass += " listItemImage-round", imgUrl || (imageContainerClass += " listItemImageContainer-round")), playOnImageClick = options.imagePlayButton && !layoutManager.tv, clickEntireItem || (imageContainerClass += " itemAction"), options.playlistItemId && options.playlistItemId === item.PlaylistItemId && (imageContainerClass += " playlistIndexIndicatorImage"), imageAction = playOnImageClick ? "resume" : action, imgUrl || options.transparentIcon || (imageContainerClass += " defaultCardBackground defaultCardBackground0"), html += '<div data-action="' + imageAction + '" class="' + imageContainerClass + '"' + ((color = "Error" === item.Severity || "Fatal" === item.Severity || "Warn" === item.Severity ? "background-color:#cc0000;color:#fff;" : "") ? ' style="' + color + '"' : "") + ">", imgUrl ? supportsNativeLazyLoading || 2 === options.lazy ? html += '<img class="' + imageClass + '" loading="lazy" src="' + imgUrl + '" />' : html += '<img class="' + imageClass + ' lazy" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" data-src="' + imgUrl + '" alt />' : !options.enableDefaultIcon || (icon = cardBuilder.getDefaultIcon(item)) && (iconCssClass = "listItemIcon md-icon", options.transparentIcon && (iconCssClass += " listItemIcon-transparent"), html += '<i class="' + iconCssClass + '">' + icon + "</i>"), (indicatorsHtml = indicators.getPlayedIndicatorHtml(item, "listItem")) && (html += '<div class="indicators listItemIndicators">' + indicatorsHtml + "</div>"), playOnImageClick && (html += '<button title="' + globalize.translate("Play") + '" type="button" is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><i class="md-icon listItemImageButton-icon">&#xE037;</i></button>'), (progressHtml = indicators.getProgressBarHtml(item, {
-			containerClass: "listItemProgressBar"
-		})) && (html += progressHtml), html += "</div>"), options.showIndexNumberLeft && (html += '<div class="listItem-indexnumberleft secondaryText">', null == item.IndexNumber ? html += "&nbsp;" : html += item.IndexNumber, html += "</div>");
-		var textlines = [];
-		options.showProgramDateTime && textlines.push(datetime.toLocaleString(datetime.parseISO8601Date(item.StartDate), {
-			weekday: "long",
-			month: "short",
-			day: "numeric",
-			hour: "numeric",
-			minute: "2-digit"
-		})), options.showAccessToken && textlines.push(item.AccessToken + " - " + item.AppName), options.showProgramTime && textlines.push(datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate))), options.showChannel && item.ChannelName && textlines.push(dom.htmlEncode(item.ChannelName));
-		var parentTitle = null;
-		options.showParentTitle && ("Episode" === itemType ? parentTitle = item.SeriesName : (item.IsSeries || item.EpisodeTitle && item.Name) && (parentTitle = item.Name));
-		var displayName = itemHelper.getDisplayName(item, {
-			includeParentInfo: options.includeParentInfoInTitle
-		});
-		options.showIndexNumber && null != item.IndexNumber && (displayName = item.IndexNumber + ". " + displayName), options.showParentTitle && options.parentTitleWithTitle ? (displayName && (parentTitle && (parentTitle += " - "), parentTitle = (parentTitle || "") + displayName), textlines.push(dom.htmlEncode(parentTitle || ""))) : options.showParentTitle && textlines.push(dom.htmlEncode(parentTitle || "")), options.showLogLine && textlines.push(dom.htmlEncode(item)), displayName && !options.parentTitleWithTitle && textlines.push(dom.htmlEncode(displayName));
-		var containerAlbumArtistIds, showArtist = !0 === options.artist,
-			artistItems = "MusicAlbum" === item.Type ? item.AlbumArtists : item.ArtistItems;
-		showArtist || !1 === options.artist || (containerAlbumArtistIds = options.containerAlbumArtistIds, artistItems && artistItems.length && !(1 < artistItems.length) && containerAlbumArtistIds && 1 === containerAlbumArtistIds.length && -1 !== containerAlbumArtistIds.indexOf(artistItems[0].Id) || (showArtist = !0)), showArtist && artistItems && textlines.push(artistItems.map(function(a) {
-			return a.Type = "MusicArtist", a.IsFolder = !0,
-				function(options, item, text, serverId, parentId, isSameItemAsCard) {
-					if (text = text || itemHelper.getDisplayName(item), layoutManager.tv) return dom.htmlEncode(text);
-					if (!1 === options.textLinks) return dom.htmlEncode(text);
-					var html = '<button title="' + (text = dom.htmlEncode(text)) + '" ' + (isSameItemAsCard ? "" : itemShortcuts.getShortcutAttributesHtml(item, {
-						serverId: serverId,
-						parentId: parentId
-					})) + ' type="button"' + (options.draggable && options.draggableSubItems && !isSameItemAsCard ? ' draggable="true"' : "") + ' class="itemAction textActionButton listItem-textActionButton" data-action="link">';
-					return html += text, html += "</button>"
-				}(options, a, null, item.ServerId)
-		}).join(", ") || ""), "Game" === itemType ? textlines.push(dom.htmlEncode(item.GameSystem)) : "TvChannel" === itemType && item.CurrentProgram && textlines.push(dom.htmlEncode(itemHelper.getDisplayName(item.CurrentProgram))), options.showDateCreated && textlines.push(datetime.toLocaleString(datetime.parseISO8601Date(item.DateCreated, !0))), options.showDateModified && textlines.push(datetime.toLocaleString(datetime.parseISO8601Date(item.DateModified, !0))), options.showDate && textlines.push(datetime.toLocaleString(datetime.parseISO8601Date(item.Date, !0))), options.showShortOverview && textlines.push(item.ShortOverview ? dom.htmlEncode(item.ShortOverview) : "&nbsp;"), options.showMediaStreamInfo && mediaInfo.pushMediaStreamLines(item, options, textlines, cardBuilder.getDefaultIcon(item));
-		var cssClass = "listItemBody";
-		clickEntireItem || (cssClass += " itemAction"), !1 === options.image && (cssClass += " listItemBody-noleftpadding"), !1 === options.verticalPadding && (cssClass += " listItemBody-noverticalpadding"), options.code && (cssClass += " listItemBody-code"), html += "<" + options.listItemBodyTagName + ' class="' + cssClass + '">';
-		var sideMediaInfo, userData, likes, userDataButtonsHtml;
-		if (html += getTextLinesHtml(textlines, isLargeStyle, options.allowTextWrap), !1 !== options.mediaInfo && (enableSideMediaInfo || (html += '<div class="listItemMediaInfo listItemBodyText listItemBodyText-secondary listItemBodyText-nowrap">' + mediaInfo.getPrimaryMediaInfoHtml(item, {
-				episodeTitle: !1,
-				originalAirDate: !1,
-				subtitles: !1,
-				endsAt: !1
-			}) + "</div>")), enableOverview && item.Overview && (html += '<div class="listItem-overview listItemBodyText listItemBodyText-secondary">', html += dom.htmlEncode(item.Overview), html += "</div>"), html += "</" + options.listItemBodyTagName + ">", !1 !== options.mediaInfo && (!enableSideMediaInfo || (sideMediaInfo = mediaInfo.getPrimaryMediaInfoHtml(item, {
-				year: !1,
-				container: !1,
-				episodeTitle: !1,
-				criticRating: !1,
-				endsAt: !1
-			})) && (html += '<div class="listItemMediaInfo secondaryText">' + sideMediaInfo + "</div>")), options.recordButton || "Timer" !== itemType && "Program" !== itemType || (html += indicators.getTimerIndicator(item).replace("indicatorIcon", "indicatorIcon listItemAside")), clickEntireItem || (options.addToListButton && (html += '<button title="' + globalize.translate("HeaderAddToPlaylist") + '" type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><i class="md-icon">&#xE03B;</i></button>'), options.openInNewWindowButton && appHost.supports("targetblank") && (html += '<a title="' + globalize.translate("HeaderOpenInNewWindow") + '" type="button" is="emby-linkbutton" href="' + apiClient.getLogDownloadUrl(item) + '" target="_blank" class="paper-icon-button-light listItemButton itemAction" data-action="default"><i class="md-icon">open_in_new</i></a>'), options.downloadButton && (html += '<button title="' + globalize.translate("Download") + '" type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="download"><i class="md-icon">cloud_download</i></button>'), !1 !== options.moreButton && itemContextMenu.supportsContextMenu(item) && (html += '<button title="' + globalize.translate("More") + '" type="button" is="paper-icon-button-light" class="listItemButton listItemContextMenuButton itemAction" data-action="menu"><i class="md-icon">&#xE5D3;</i></button>'), options.infoButton && (html += '<button type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><i class="md-icon">&#xE88F;</i></button>'), options.deleteButton && (html += '<button title="' + globalize.translate("Delete") + '" type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="delete"><i class="md-icon">delete</i></button>'), options.overviewButton && item.Overview && (html += '<button type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="overview"><i class="md-icon">&#xE88F;</i></button>'), options.rightButtons && (html += function(options) {
-				for (var html = "", i = 0, length = options.rightButtons.length; i < length; i++) {
-					var button = options.rightButtons[i];
-					html += '<button type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="custom" data-customaction="' + button.id + '" title="' + button.title + '"><i class="md-icon">' + button.icon + "</i></button>"
-				}
-				return html
-			}(options)), !1 !== options.enableUserDataButtons && (likes = null == (userData = item.UserData || {}).Likes ? "" : userData.Likes, userDataButtonsHtml = "", itemHelper.canMarkPlayed(item) && (userDataButtonsHtml += '<button type="button" is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + itemType + '" data-played="' + userData.Played + '"><i class="md-icon">&#xE5CA;</i></button>'), itemHelper.canRate(item) && (userDataButtonsHtml += '<button type="button" is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + itemType + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><i class="md-icon">&#xE87D;</i></button>'), userDataButtonsHtml && (html += '<span class="listViewUserDataButtons flex align-items-center">' + userDataButtonsHtml + "</span>")), options.dragHandle && (html += '<i class="listViewDragHandle dragHandle md-icon listItemIcon listItemIcon-transparent">&#xE25D;</i>')), enableContentWrapper && (html += "</div>", enableOverview && item.Overview && (html += '<div class="listItem-bottomoverview secondaryText">', html += dom.htmlEncode(item.Overview), html += "</div>")), options.listItemParts) {
-			var attributes = itemShortcuts.getShortcutAttributes(item, options);
-			return action && attributes.push({
-				name: "data-action",
-				value: action
-			}), attributes.push({
-				name: "data-index",
-				value: index
-			}), options.addTabIndex && attributes.push({
-				name: "tabindex",
-				value: "0"
-			}), options.draggable && attributes.push({
-				name: "draggable",
-				value: "true"
-			}), {
-				attributes: attributes,
-				html: html
-			}
-		}
-		var dataAttributes = itemShortcuts.getShortcutAttributesHtml(item, options);
-		return action && (dataAttributes += ' data-action="' + action + '"'), dataAttributes += ' data-index="' + index + '"', options.addTabIndex && (dataAttributes += ' tabindex="0"'), options.draggable && (dataAttributes += ' draggable="true"'), "<" + tagName + ' class="' + options.className + '"' + dataAttributes + ">" + html + "</" + tagName + ">"
-	}
-
-	function setListOptions(items, options) {
-		options.enableContentWrapper = options.enableOverview && !layoutManager.tv, options.containerAlbumArtistIds = (options.containerAlbumArtists || []).map(getId), options.enableSideMediaInfo = null == options.enableSideMediaInfo || options.enableSideMediaInfo, options.clickEntireItem = !!layoutManager.tv || !(options.mediaInfo || options.moreButton || options.enableUserDataButtons || options.addToListButton || options.enableSideMediaInfo || options.enableOverview), options.isLargeStyle = "large" === options.imageSize, options.action = options.action || "link", options.tagName = options.clickEntireItem ? "button" : "div", options.listItemBodyTagName = "div";
-		var cssClass = "listItem";
-		(options.border || !1 !== options.highlight && !layoutManager.tv) && (cssClass += " listItem-border"), options.clickEntireItem && (cssClass += " itemAction"), "div" === options.tagName && (cssClass += " focusable", options.addTabIndex = !0), "none" === options.action && !options.clickEntireItem || (cssClass += " listItemCursor"), layoutManager.tv ? cssClass += " listItem-focusscale" : (cssClass += " listItem-touchzoom", cssClass += " listItem-touchzoom-transition"), layoutManager.tv || (options.draggable = !1 !== options.draggable, options.draggableSubItems = options.draggable && !1 !== options.draggableSubItems), options.isLargeStyle && (cssClass += " listItem-largeImage"), options.enableContentWrapper && (cssClass += " listItem-withContentWrapper"), !1 === options.verticalPadding && (cssClass += " listItem-noverticalpadding"), options.itemClass && (cssClass += " " + options.itemClass), options.dragHandle && options.draggable ? cssClass += " drop-target ordered-drop-target" : options.dropTarget && !layoutManager.tv && (cssClass += " drop-target full-drop-target"), options.className = cssClass;
-		var imageContainerClass, innerHTML = "";
-		!1 !== options.image && (imageContainerClass = "listItemImageContainer", options.isLargeStyle && (imageContainerClass += " listItemImageContainer-large", layoutManager.tv && (imageContainerClass += " listItemImageContainer-large-tv")), innerHTML += '<div class="' + imageContainerClass + '"></div>'), innerHTML += "<" + options.listItemBodyTagName + ' class="listItemBody">';
-		var textlines = [];
-		options.showDateModified && textlines.push("&nbsp;"), options.showDateCreated && textlines.push("&nbsp;"), options.showDate && textlines.push("&nbsp;"), options.showShortOverview && textlines.push("&nbsp;"), options.showProgramDateTime && textlines.push("&nbsp;"), options.showProgramTime && textlines.push("&nbsp;"), options.showChannel && textlines.push("&nbsp;"), options.showLogLine && textlines.push("&nbsp;"), options.showAccessToken && textlines.push("&nbsp;"), (options.showParentTitle && options.parentTitleWithTitle || options.showParentTitle) && textlines.push("&nbsp;"), options.parentTitleWithTitle || textlines.push("&nbsp;"), textlines.length < 1 && textlines.push("&nbsp;"), textlines.length < 2 && textlines.push("&nbsp;"), innerHTML += getTextLinesHtml(textlines, options.isLargeStyle, options.allowTextWrap), options.enableOverview && (innerHTML += '<div class="listItem-overview listItemBodyText listItemBodyText-secondary">', !1 !== options.mediaInfo && (options.enableSideMediaInfo || (innerHTML += '<div class="listItemMediaInfo listItemBodyText listItemBodyText-secondary listItemBodyText-nowrap"></div>')), innerHTML += "</div>"), innerHTML += "</" + options.listItemBodyTagName + ">", options.dragHandle && (innerHTML += '<i class="listViewDragHandle dragHandle md-icon listItemIcon listItemIcon-transparent">&#xE25D;</i>'), options.templateInnerHTML = innerHTML
-	}
-
-	function getListViewHtml(items, options) {
-		setListOptions(0, options);
-		for (var groupTitle = "", html = "", i = 0, length = items.length; i < length; i++) {
-			var itemGroupTitle, item = items[i];
-			!options.showIndex || (itemGroupTitle = function(item, options) {
-				if ("disc" !== options.index) return "";
-				var parentIndexNumber = item.ParentIndexNumber;
-				return 1 === parentIndexNumber || null == parentIndexNumber ? "" : globalize.translate("ValueDiscNumber", parentIndexNumber)
-			}(item, options)) !== groupTitle && (html += 0 === i ? '<h2 class="listGroupHeader listGroupHeader-first">' : '<h2 class="listGroupHeader">', html += itemGroupTitle, html += "</h2>", groupTitle = itemGroupTitle), html += getListItemHtml(item, i, options)
-		}
-		return html
-	}
-	return supportsNativeLazyLoading = !1, {
-		getListViewHtml: getListViewHtml,
-		getItemsHtml: getListViewHtml,
-		getListItemHtml: getListItemHtml,
-		setListOptions: setListOptions,
-		getItemParts: function(item, index, options) {
-			return options.listItemParts = !0, getListItemHtml(item, index, options)
-		},
-		buildItems: function(items, options) {
-			var itemsContainer = options.itemsContainer;
-			if (document.body.contains(itemsContainer)) {
-				var parentContainer = options.parentContainer;
-				if (parentContainer) {
-					if (!items.length) return void parentContainer.classList.add("hide");
-					parentContainer.classList.remove("hide")
-				}
-				var html = getListViewHtml(items, options);
-				itemsContainer.innerHTML = html, itemsContainer.items = items, html && imageLoader.lazyChildren(itemsContainer), options.autoFocus && focusManager.autoFocus(itemsContainer)
-			}
-		}
-	}
+define(["itemContextMenu", "dom", "cardBuilder", "itemShortcuts", "itemHelper", "mediaInfo", "indicators", "connectionManager", "layoutManager", "globalize", "datetime", "apphost", "imageLoader", "focusManager", "css!./listview", "emby-ratingbutton", "emby-playstatebutton", "embyProgressBarStyle", "emby-linkbutton"], function(itemContextMenu, dom, cardBuilder, itemShortcuts, itemHelper, mediaInfo, indicators, connectionManager, layoutManager, globalize, datetime, appHost, imageLoader, focusManager) {
+	"use strict";
+	var supportsNativeLazyLoading = "loading" in HTMLImageElement.prototype;
+
+	function getTextLinesHtml(textlines, isLargeStyle, allowTextWrap) {
+		var html = "",
+			isFirst = !0,
+			cssClass = "listItemBodyText";
+		allowTextWrap || (cssClass += " listItemBodyText-nowrap");
+		for (var i = 0, length = textlines.length; i < length; i++) {
+			var text = textlines[i];
+			text && (html += isFirst ? isLargeStyle ? '<h3 class="' + cssClass + '">' : '<div class="' + cssClass + '">' : '<div class="' + cssClass + ' listItemBodyText-secondary">', html += text, html += isFirst && isLargeStyle ? "</h3>" : "</div>", isFirst = !1)
+		}
+		return html
+	}
+
+	function getId(item) {
+		return item.Id
+	}
+
+	function getListItemHtml(item, index, options) {
+		var enableOverview = options.enableOverview,
+			enableSideMediaInfo = options.enableSideMediaInfo,
+			clickEntireItem = options.clickEntireItem,
+			isLargeStyle = options.isLargeStyle,
+			enableContentWrapper = options.enableContentWrapper,
+			tagName = options.tagName,
+			action = options.action,
+			html = "",
+			downloadWidth = isLargeStyle ? 600 : 80;
+		enableContentWrapper && (html += '<div class="listItem-content">');
+		var imgUrl, imageContainerClass, imageClass, playOnImageClick, imageAction, color, icon, iconCssClass, indicatorsHtml, progressHtml, serverId = item.ServerId,
+			apiClient = serverId ? connectionManager.getApiClient(serverId) : null,
+			itemType = item.Type;
+		!1 !== options.image && (imgUrl = cardBuilder.getImageUrl(item, apiClient, {
+			width: downloadWidth,
+			showChannelLogo: "channel" === options.imageSource
+		}).imgUrl, imageContainerClass = "listItemImageContainer", imageClass = "listItemImage", isLargeStyle && (imageContainerClass += " listItemImageContainer-large", layoutManager.tv && (imageContainerClass += " listItemImageContainer-large-tv")), options.roundImage && (imageClass += " listItemImage-round", imgUrl || (imageContainerClass += " listItemImageContainer-round")), playOnImageClick = options.imagePlayButton && !layoutManager.tv, clickEntireItem || (imageContainerClass += " itemAction"), options.playlistItemId && options.playlistItemId === item.PlaylistItemId && (imageContainerClass += " playlistIndexIndicatorImage"), imageAction = playOnImageClick ? "resume" : action, imgUrl || options.transparentIcon || (imageContainerClass += " defaultCardBackground defaultCardBackground0"), html += '<div data-action="' + imageAction + '" class="' + imageContainerClass + '"' + ((color = "Error" === item.Severity || "Fatal" === item.Severity || "Warn" === item.Severity ? "background-color:#cc0000;color:#fff;" : "") ? ' style="' + color + '"' : "") + ">", imgUrl ? supportsNativeLazyLoading || 2 === options.lazy ? html += '<img class="' + imageClass + '" loading="lazy" src="' + imgUrl + '" />' : html += '<img class="' + imageClass + ' lazy" src="data:image/gif;base64,R0lGODlhAQABAIAAAP///wAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==" data-src="' + imgUrl + '" alt />' : !options.enableDefaultIcon || (icon = cardBuilder.getDefaultIcon(item)) && (iconCssClass = "listItemIcon md-icon", options.transparentIcon && (iconCssClass += " listItemIcon-transparent"), html += '<i class="' + iconCssClass + '">' + icon + "</i>"), (indicatorsHtml = indicators.getPlayedIndicatorHtml(item, "listItem")) && (html += '<div class="indicators listItemIndicators">' + indicatorsHtml + "</div>"), playOnImageClick && (html += '<button title="' + globalize.translate("Play") + '" type="button" is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><i class="md-icon listItemImageButton-icon">&#xE037;</i></button>'), (progressHtml = indicators.getProgressBarHtml(item, {
+			containerClass: "listItemProgressBar"
+		})) && (html += progressHtml), html += "</div>"), options.showIndexNumberLeft && (html += '<div class="listItem-indexnumberleft secondaryText">', null == item.IndexNumber ? html += "&nbsp;" : html += item.IndexNumber, html += "</div>");
+		var textlines = [];
+		options.showProgramDateTime && textlines.push(datetime.toLocaleString(datetime.parseISO8601Date(item.StartDate), {
+			weekday: "long",
+			month: "short",
+			day: "numeric",
+			hour: "numeric",
+			minute: "2-digit"
+		})), options.showAccessToken && textlines.push(item.AccessToken + " - " + item.AppName), options.showProgramTime && textlines.push(datetime.getDisplayTime(datetime.parseISO8601Date(item.StartDate))), options.showChannel && item.ChannelName && textlines.push(dom.htmlEncode(item.ChannelName));
+		var parentTitle = null;
+		options.showParentTitle && ("Episode" === itemType ? parentTitle = item.SeriesName : (item.IsSeries || item.EpisodeTitle && item.Name) && (parentTitle = item.Name));
+		var displayName = itemHelper.getDisplayName(item, {
+			includeParentInfo: options.includeParentInfoInTitle
+		});
+		options.showIndexNumber && null != item.IndexNumber && (displayName = item.IndexNumber + ". " + displayName), options.showParentTitle && options.parentTitleWithTitle ? (displayName && (parentTitle && (parentTitle += " - "), parentTitle = (parentTitle || "") + displayName), textlines.push(dom.htmlEncode(parentTitle || ""))) : options.showParentTitle && textlines.push(dom.htmlEncode(parentTitle || "")), options.showLogLine && textlines.push(dom.htmlEncode(item)), displayName && !options.parentTitleWithTitle && textlines.push(dom.htmlEncode(displayName));
+		var containerAlbumArtistIds, showArtist = !0 === options.artist,
+			artistItems = "MusicAlbum" === item.Type ? item.AlbumArtists : item.ArtistItems;
+		showArtist || !1 === options.artist || (containerAlbumArtistIds = options.containerAlbumArtistIds, artistItems && artistItems.length && !(1 < artistItems.length) && containerAlbumArtistIds && 1 === containerAlbumArtistIds.length && -1 !== containerAlbumArtistIds.indexOf(artistItems[0].Id) || (showArtist = !0)), showArtist && artistItems && textlines.push(artistItems.map(function(a) {
+			return a.Type = "MusicArtist", a.IsFolder = !0,
+				function(options, item, text, serverId, parentId, isSameItemAsCard) {
+					if (text = text || itemHelper.getDisplayName(item), layoutManager.tv) return dom.htmlEncode(text);
+					if (!1 === options.textLinks) return dom.htmlEncode(text);
+					var html = '<button title="' + (text = dom.htmlEncode(text)) + '" ' + (isSameItemAsCard ? "" : itemShortcuts.getShortcutAttributesHtml(item, {
+						serverId: serverId,
+						parentId: parentId
+					})) + ' type="button"' + (options.draggable && options.draggableSubItems && !isSameItemAsCard ? ' draggable="true"' : "") + ' class="itemAction textActionButton listItem-textActionButton" data-action="link">';
+					return html += text, html += "</button>"
+				}(options, a, null, item.ServerId)
+		}).join(", ") || ""), "Game" === itemType ? textlines.push(dom.htmlEncode(item.GameSystem)) : "TvChannel" === itemType && item.CurrentProgram && textlines.push(dom.htmlEncode(itemHelper.getDisplayName(item.CurrentProgram))), options.showDateCreated && textlines.push(datetime.toLocaleString(datetime.parseISO8601Date(item.DateCreated, !0))), options.showDateModified && textlines.push(datetime.toLocaleString(datetime.parseISO8601Date(item.DateModified, !0))), options.showDate && textlines.push(datetime.toLocaleString(datetime.parseISO8601Date(item.Date, !0))), options.showShortOverview && textlines.push(item.ShortOverview ? dom.htmlEncode(item.ShortOverview) : "&nbsp;"), options.showMediaStreamInfo && mediaInfo.pushMediaStreamLines(item, options, textlines, cardBuilder.getDefaultIcon(item));
+		var cssClass = "listItemBody";
+		clickEntireItem || (cssClass += " itemAction"), !1 === options.image && (cssClass += " listItemBody-noleftpadding"), !1 === options.verticalPadding && (cssClass += " listItemBody-noverticalpadding"), options.code && (cssClass += " listItemBody-code"), html += "<" + options.listItemBodyTagName + ' class="' + cssClass + '">';
+		var sideMediaInfo, userData, likes, userDataButtonsHtml;
+		if (html += getTextLinesHtml(textlines, isLargeStyle, options.allowTextWrap), !1 !== options.mediaInfo && (enableSideMediaInfo || (html += '<div class="listItemMediaInfo listItemBodyText listItemBodyText-secondary listItemBodyText-nowrap">' + mediaInfo.getPrimaryMediaInfoHtml(item, {
+				episodeTitle: !1,
+				originalAirDate: !1,
+				subtitles: !1,
+				endsAt: !1
+			}) + "</div>")), enableOverview && item.Overview && (html += '<div class="listItem-overview listItemBodyText listItemBodyText-secondary">', html += dom.htmlEncode(item.Overview), html += "</div>"), html += "</" + options.listItemBodyTagName + ">", !1 !== options.mediaInfo && (!enableSideMediaInfo || (sideMediaInfo = mediaInfo.getPrimaryMediaInfoHtml(item, {
+				year: !1,
+				container: !1,
+				episodeTitle: !1,
+				criticRating: !1,
+				endsAt: !1
+			})) && (html += '<div class="listItemMediaInfo secondaryText">' + sideMediaInfo + "</div>")), options.recordButton || "Timer" !== itemType && "Program" !== itemType || (html += indicators.getTimerIndicator(item).replace("indicatorIcon", "indicatorIcon listItemAside")), clickEntireItem || (options.addToListButton && (html += '<button title="' + globalize.translate("HeaderAddToPlaylist") + '" type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><i class="md-icon">&#xE03B;</i></button>'), options.openInNewWindowButton && appHost.supports("targetblank") && (html += '<a title="' + globalize.translate("HeaderOpenInNewWindow") + '" type="button" is="emby-linkbutton" href="' + apiClient.getLogDownloadUrl(item) + '" target="_blank" class="paper-icon-button-light listItemButton itemAction" data-action="default"><i class="md-icon">open_in_new</i></a>'), options.downloadButton && (html += '<button title="' + globalize.translate("Download") + '" type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="download"><i class="md-icon">cloud_download</i></button>'), !1 !== options.moreButton && itemContextMenu.supportsContextMenu(item) && (html += '<button title="' + globalize.translate("More") + '" type="button" is="paper-icon-button-light" class="listItemButton listItemContextMenuButton itemAction" data-action="menu"><i class="md-icon">&#xE5D3;</i></button>'), options.infoButton && (html += '<button type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><i class="md-icon">&#xE88F;</i></button>'), options.deleteButton && (html += '<button title="' + globalize.translate("Delete") + '" type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="delete"><i class="md-icon">delete</i></button>'), options.overviewButton && item.Overview && (html += '<button type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="overview"><i class="md-icon">&#xE88F;</i></button>'), options.rightButtons && (html += function(options) {
+				for (var html = "", i = 0, length = options.rightButtons.length; i < length; i++) {
+					var button = options.rightButtons[i];
+					html += '<button type="button" is="paper-icon-button-light" class="listItemButton itemAction" data-action="custom" data-customaction="' + button.id + '" title="' + button.title + '"><i class="md-icon">' + button.icon + "</i></button>"
+				}
+				return html
+			}(options)), !1 !== options.enableUserDataButtons && (likes = null == (userData = item.UserData || {}).Likes ? "" : userData.Likes, userDataButtonsHtml = "", itemHelper.canMarkPlayed(item) && (userDataButtonsHtml += '<button type="button" is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + itemType + '" data-played="' + userData.Played + '"><i class="md-icon">&#xE5CA;</i></button>'), itemHelper.canRate(item) && (userDataButtonsHtml += '<button type="button" is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + itemType + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><i class="md-icon">&#xE87D;</i></button>'), userDataButtonsHtml && (html += '<span class="listViewUserDataButtons flex align-items-center">' + userDataButtonsHtml + "</span>")), options.dragHandle && (html += '<i class="listViewDragHandle dragHandle md-icon listItemIcon listItemIcon-transparent">&#xE25D;</i>')), enableContentWrapper && (html += "</div>", enableOverview && item.Overview && (html += '<div class="listItem-bottomoverview secondaryText">', html += dom.htmlEncode(item.Overview), html += "</div>")), options.listItemParts) {
+			var attributes = itemShortcuts.getShortcutAttributes(item, options);
+			return action && attributes.push({
+				name: "data-action",
+				value: action
+			}), attributes.push({
+				name: "data-index",
+				value: index
+			}), options.addTabIndex && attributes.push({
+				name: "tabindex",
+				value: "0"
+			}), options.draggable && attributes.push({
+				name: "draggable",
+				value: "true"
+			}), {
+				attributes: attributes,
+				html: html
+			}
+		}
+		var dataAttributes = itemShortcuts.getShortcutAttributesHtml(item, options);
+		return action && (dataAttributes += ' data-action="' + action + '"'), dataAttributes += ' data-index="' + index + '"', options.addTabIndex && (dataAttributes += ' tabindex="0"'), options.draggable && (dataAttributes += ' draggable="true"'), "<" + tagName + ' class="' + options.className + '"' + dataAttributes + ">" + html + "</" + tagName + ">"
+	}
+
+	function setListOptions(items, options) {
+		options.enableContentWrapper = options.enableOverview && !layoutManager.tv, options.containerAlbumArtistIds = (options.containerAlbumArtists || []).map(getId), options.enableSideMediaInfo = null == options.enableSideMediaInfo || options.enableSideMediaInfo, options.clickEntireItem = !!layoutManager.tv || !(options.mediaInfo || options.moreButton || options.enableUserDataButtons || options.addToListButton || options.enableSideMediaInfo || options.enableOverview), options.isLargeStyle = "large" === options.imageSize, options.action = options.action || "link", options.tagName = options.clickEntireItem ? "button" : "div", options.listItemBodyTagName = "div";
+		var cssClass = "listItem";
+		(options.border || !1 !== options.highlight && !layoutManager.tv) && (cssClass += " listItem-border"), options.clickEntireItem && (cssClass += " itemAction"), "div" === options.tagName && (cssClass += " focusable", options.addTabIndex = !0), "none" === options.action && !options.clickEntireItem || (cssClass += " listItemCursor"), layoutManager.tv ? cssClass += " listItem-focusscale" : (cssClass += " listItem-touchzoom", cssClass += " listItem-touchzoom-transition"), layoutManager.tv || (options.draggable = !1 !== options.draggable, options.draggableSubItems = options.draggable && !1 !== options.draggableSubItems), options.isLargeStyle && (cssClass += " listItem-largeImage"), options.enableContentWrapper && (cssClass += " listItem-withContentWrapper"), !1 === options.verticalPadding && (cssClass += " listItem-noverticalpadding"), options.itemClass && (cssClass += " " + options.itemClass), options.dragHandle && options.draggable ? cssClass += " drop-target ordered-drop-target" : options.dropTarget && !layoutManager.tv && (cssClass += " drop-target full-drop-target"), options.className = cssClass;
+		var imageContainerClass, innerHTML = "";
+		!1 !== options.image && (imageContainerClass = "listItemImageContainer", options.isLargeStyle && (imageContainerClass += " listItemImageContainer-large", layoutManager.tv && (imageContainerClass += " listItemImageContainer-large-tv")), innerHTML += '<div class="' + imageContainerClass + '"></div>'), innerHTML += "<" + options.listItemBodyTagName + ' class="listItemBody">';
+		var textlines = [];
+		options.showDateModified && textlines.push("&nbsp;"), options.showDateCreated && textlines.push("&nbsp;"), options.showDate && textlines.push("&nbsp;"), options.showShortOverview && textlines.push("&nbsp;"), options.showProgramDateTime && textlines.push("&nbsp;"), options.showProgramTime && textlines.push("&nbsp;"), options.showChannel && textlines.push("&nbsp;"), options.showLogLine && textlines.push("&nbsp;"), options.showAccessToken && textlines.push("&nbsp;"), (options.showParentTitle && options.parentTitleWithTitle || options.showParentTitle) && textlines.push("&nbsp;"), options.parentTitleWithTitle || textlines.push("&nbsp;"), textlines.length < 1 && textlines.push("&nbsp;"), textlines.length < 2 && textlines.push("&nbsp;"), innerHTML += getTextLinesHtml(textlines, options.isLargeStyle, options.allowTextWrap), options.enableOverview && (innerHTML += '<div class="listItem-overview listItemBodyText listItemBodyText-secondary">', !1 !== options.mediaInfo && (options.enableSideMediaInfo || (innerHTML += '<div class="listItemMediaInfo listItemBodyText listItemBodyText-secondary listItemBodyText-nowrap"></div>')), innerHTML += "</div>"), innerHTML += "</" + options.listItemBodyTagName + ">", options.dragHandle && (innerHTML += '<i class="listViewDragHandle dragHandle md-icon listItemIcon listItemIcon-transparent">&#xE25D;</i>'), options.templateInnerHTML = innerHTML
+	}
+
+	function getListViewHtml(items, options) {
+		setListOptions(0, options);
+		for (var groupTitle = "", html = "", i = 0, length = items.length; i < length; i++) {
+			var itemGroupTitle, item = items[i];
+			!options.showIndex || (itemGroupTitle = function(item, options) {
+				if ("disc" !== options.index) return "";
+				var parentIndexNumber = item.ParentIndexNumber;
+				return 1 === parentIndexNumber || null == parentIndexNumber ? "" : globalize.translate("ValueDiscNumber", parentIndexNumber)
+			}(item, options)) !== groupTitle && (html += 0 === i ? '<h2 class="listGroupHeader listGroupHeader-first">' : '<h2 class="listGroupHeader">', html += itemGroupTitle, html += "</h2>", groupTitle = itemGroupTitle), html += getListItemHtml(item, i, options)
+		}
+		return html
+	}
+	return supportsNativeLazyLoading = !1, {
+		getListViewHtml: getListViewHtml,
+		getItemsHtml: getListViewHtml,
+		getListItemHtml: getListItemHtml,
+		setListOptions: setListOptions,
+		getItemParts: function(item, index, options) {
+			return options.listItemParts = !0, getListItemHtml(item, index, options)
+		},
+		buildItems: function(items, options) {
+			var itemsContainer = options.itemsContainer;
+			if (document.body.contains(itemsContainer)) {
+				var parentContainer = options.parentContainer;
+				if (parentContainer) {
+					if (!items.length) return void parentContainer.classList.add("hide");
+					parentContainer.classList.remove("hide")
+				}
+				var html = getListViewHtml(items, options);
+				itemsContainer.innerHTML = html, itemsContainer.items = items, html && imageLoader.lazyChildren(itemsContainer), options.autoFocus && focusManager.autoFocus(itemsContainer)
+			}
+		}
+	}
 });
\ No newline at end of file
diff --git a/lib/web/htdocs/modules/listview/menu.js b/lib/web/htdocs/modules/listview/menu.js
new file mode 100644
index 0000000..4c50c32
--- /dev/null
+++ b/lib/web/htdocs/modules/listview/menu.js
@@ -0,0 +1,83 @@
+$(document).ready(function(){
+});
+
+function show_menu(_button, _menuid) {
+    switch_display(_button, _menuid);
+    reset_menu_posn(_button, _menuid);
+    return false;
+}
+
+function reset_menu_posn(_el_button, _menuid) {
+    menuid = '#' + _menuid;
+
+    var _el_menu_rect = $(menuid)[0].getBoundingClientRect();
+    var _el_button_rect = _el_button.getBoundingClientRect();
+    var _el_menu_height = _el_menu_rect.height;
+    var _el_button_height = _el_button_rect.height;
+    var _el_button_left = _el_button.scrollLeft;
+
+    if ( _el_button_rect.y + _el_button_height < _el_button_height ) {
+        _top = _el_button.offsetTop - _el_button_rect.y;
+    } else {
+        _top = _el_button.offsetTop - _el_menu_height + _el_button_height;
+    }
+    var _el_button_width = _el_button_rect.width;
+    var _el_menu_width = _el_menu_rect.width;
+
+    var panel_width = _el_button.parentElement.getBoundingClientRect().width;
+    if ( panel_width - _el_button_width - 5 < _el_menu_width ) {
+        _left = _el_button_left + _el_button_width/2;
+    } else {
+        _left = _el_button_left + _el_button_width;
+    }
+    $(menuid).css({"top":_top+'px', "left":_left+'px'});
+
+    var _el_menu_rect = $(menuid)[0].getBoundingClientRect();
+    var _el_menu_height = _el_menu_rect.height;
+    if ( _el_button_rect.y + _el_button_height < _el_menu_height ) {
+        _top = _el_button.offsetTop - _el_button_rect.y;
+    } else {
+        _top = _el_button.offsetTop - _el_menu_height + _el_button_height;
+    }
+    $(menuid).css({"top":_top+'px', "left":_left+'px'});
+}
+
+function switch_display(_button, _menuid) {
+    $('div#'+_menuid).each(function() {
+        if ( $(this).hasClass("listItemHide") ) {
+            $(this).removeClass("listItemHide");
+            $(this).addClass("listItemShow");
+            $(this).focus().select();
+            $(document).on('click', function(e) {
+                var _menu = $('#'+_menuid);
+                var _button2 = $('.menuSection');
+                if ( !$(e.target).closest(_menu).length ) {
+                    if ( !$(e.target).closest(_button2).length ) {
+                        switch_display(_button, _menuid);
+                    }
+                }
+            });
+            $('#menuForm').submit(function(e) { // catch the form's submit
+                // ajax does not submit name/value of button, so use hidden input
+                $('input:hidden[name=action]').val(e.originalEvent.submitter.value);
+                $.ajax({
+                    data: $(this).serialize(),
+                    type: $(this).attr('method'), // GET or POST
+                    url: $(this).attr('action'),
+                    success: function(response) { // on success
+                        $('#menuActionStatus').html(response);
+                    }
+                });
+                return false; // cancel original submit event
+            });
+            
+        } else {
+            $(this).removeClass("listItemShow");
+            $(this).addClass("listItemHide");
+            $(document).prop('onclick', null).off("click"); 
+            $('#menuForm').prop("onsubmit", null).off("submit");
+        }
+    });
+    
+}
+
diff --git a/lib/web/htdocs/modules/navdrawer/navdrawer.css b/lib/web/htdocs/modules/navdrawer/navdrawer.css
index 22b60cf..7cf8974 100644
--- a/lib/web/htdocs/modules/navdrawer/navdrawer.css
+++ b/lib/web/htdocs/modules/navdrawer/navdrawer.css
@@ -359,4 +359,15 @@
     -webkit-tap-highlight-color: transparent;
     text-decoration: none;
     line-height: inherit;
-}
\ No newline at end of file
+}
+
+.status-note {
+    bottom: 8px;
+    background: yellow;
+    color: blue;
+    border-radius: 8px;
+    padding-left: 5px;
+    padding-right: 5px;
+    font-size: 70%;
+    margin-left: 5px;
+}
diff --git a/plugins/provider_video_daddylive/lib/__init__.py b/lib/web/htdocs/modules/pluginmgr/__init__.py
old mode 100755
new mode 100644
similarity index 100%
rename from plugins/provider_video_daddylive/lib/__init__.py
rename to lib/web/htdocs/modules/pluginmgr/__init__.py
diff --git a/lib/web/htdocs/modules/pluginmgr/pluginmgr.js b/lib/web/htdocs/modules/pluginmgr/pluginmgr.js
new file mode 100644
index 0000000..681edf2
--- /dev/null
+++ b/lib/web/htdocs/modules/pluginmgr/pluginmgr.js
@@ -0,0 +1,58 @@
+function load_form_url(url) {
+    $("#pluginscontent").load(url);
+    $('div#pluginscontent').each(function() {
+        $(this).removeClass("pluginHide");
+        $(this).addClass("pluginShow");
+    });
+    $('div#plugincontent').each(function() {
+        $(this).removeClass("pluginShow");
+        $(this).addClass("pluginHide");
+    });    
+    return false;
+}
+
+function load_plugin_url(url) {
+    $("#plugincontent").load(url);
+    $('div#pluginscontent').each(function() {
+        $(this).removeClass("pluginShow");
+        $(this).addClass("pluginHide");
+    });
+    $('div#plugincontent').each(function() {
+        $(this).removeClass("pluginHide");
+        $(this).addClass("pluginShow");
+    });
+    
+    $(document).ready(setTimeout(function(){
+        $('form').submit(function(e) { // catch the form's submit
+            // ajax does not submit name/value of button, so use hidden input
+            $('input:hidden[name=action]').val(e.originalEvent.submitter.value);
+            $.ajax({
+                data: $(this).serialize(),
+                type: $(this).attr('method'), // GET or POST
+                url: $(this).attr('action'),
+                success: function(response) { // on success
+                    $('#menuActionStatus').html(response);
+                }
+            });
+            return false; // cancel original submit event
+        });
+    }, 500));
+
+    
+    
+    
+    
+    return false;
+}
+
+function display_plugins() {
+    $('div#pluginscontent').each(function() {
+        $(this).removeClass("pluginHide");
+        $(this).addClass("pluginShow");
+    });
+    $('div#plugincontent').each(function() {
+        $(this).removeClass("pluginShow");
+        $(this).addClass("pluginHide");
+    });
+    return false;
+}
diff --git a/lib/web/htdocs/modules/pluginmgr/pluginmgrform.css b/lib/web/htdocs/modules/pluginmgr/pluginmgrform.css
new file mode 100644
index 0000000..241d34d
--- /dev/null
+++ b/lib/web/htdocs/modules/pluginmgr/pluginmgrform.css
@@ -0,0 +1,114 @@
+textarea, input, select {
+    font-size: 90%;
+    font-weight: inherit;
+    text-decoration: none;
+    font-family: inherit;
+}
+
+.plugin_list {
+    display: flex;
+    flex-wrap: wrap;
+}
+
+.plugin_item {
+    text-align: center;
+    display: flex;
+    justify-content: end;
+    flex-direction: column;
+    color: var(--theme-text-color);
+    background-color: transparent;
+    border: none;
+    line-height: 1;
+    margin: 5px;
+    margin-bottom: 20px;
+}
+
+.plugin_item:hover {
+    opacity: 0.6;
+    cursor: pointer;
+}
+
+.pluginText-secondary {
+    color: var(--theme-body-secondary-text-color);
+    font-size: 90%;
+}
+
+.pluginHide{
+    display: none;
+}
+.pluginShow{
+    display: block;
+}
+
+.pluginIcon{
+    min-width: 2em;
+    font-size: 150%;
+    text-align: center;
+    display: table-cell;
+}
+.pluginSection{
+    display: inline-table;
+    border: 3px solid var(--card-background);
+    padding-right: 10px;
+    padding-left: 10px;
+    min-width: 25em;
+    background: var(--card-background);
+}
+.pluginSectionName{
+    font-size: 130%;
+    font-weight: bold;
+    display: flex;
+    flex-direction: column;
+    justify-content: end;
+}
+.pluginValue{
+    display: flex;
+    justify-content: center;
+    flex-direction: column;
+    margin-left: 10px;
+    margin-bottom: 2px;
+}
+div.pluginIcon a {
+    color: inherit;
+}
+
+.pluginIconButton{
+    background: #ffffff61;
+    width: 2em;
+    height: 2em;
+    border-radius: 50%;
+    padding: 0px;
+    border: 0px;
+    margin-left: 1em;
+    cursor: pointer;
+}
+
+.image-size{
+    width:20vw;
+}
+.icon-size{
+    width:5vw;
+}
+
+.bottom-left {
+    position: absolute;
+    bottom: 8px;
+    left: 8px;
+    background: yellow;
+    color: blue;
+    border-radius: 8px;
+    padding-left: 5px;
+    padding-right: 5px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+}
+
+@media only screen and (max-width:60em){
+    .image-size{
+        width:40vw;
+    }
+    .icon-size{
+        width:12vw;
+    }
+    
+}
\ No newline at end of file
diff --git a/lib/web/htdocs/modules/pluginmgr/pluginmgrform.js b/lib/web/htdocs/modules/pluginmgr/pluginmgrform.js
new file mode 100644
index 0000000..ff463da
--- /dev/null
+++ b/lib/web/htdocs/modules/pluginmgr/pluginmgrform.js
@@ -0,0 +1,16 @@
+$(document).ready(setTimeout(function(){
+    $('form').submit(function(e) { // catch the form's submit
+        // ajax does not submit name/value of button, so use hidden input
+        $('input:hidden[name=action]').val(e.originalEvent.submitter.value);
+        $.ajax({
+            data: $(this).serialize(),
+            type: $(this).attr('method'), // GET or POST
+            url: $(this).attr('action'),
+            success: function(response) { // on success
+                $('#menuActionStatus').html(response);
+            }
+        });
+        return false; // cancel original submit event
+    });
+    
+}, 500));
diff --git a/lib/web/htdocs/modules/scheduler/scheduler.js b/lib/web/htdocs/modules/scheduler/scheduler.js
index 92253e9..2a88573 100644
--- a/lib/web/htdocs/modules/scheduler/scheduler.js
+++ b/lib/web/htdocs/modules/scheduler/scheduler.js
@@ -37,6 +37,7 @@ function reload_div(){
     }, 5000);
 }
 function load_task_url(url) {
+    $("#schedtask").load(url);
     $('div#schedtasks').each(function() {
         $(this).removeClass("schedShow");
         $(this).addClass("schedHide");
@@ -45,7 +46,6 @@ function load_task_url(url) {
         $(this).removeClass("schedHide");
         $(this).addClass("schedShow");
     });
-    $("#schedtask").load(url);
     return false;
 }
 
diff --git a/lib/web/htdocs/modules/themes/spring/theme.css b/lib/web/htdocs/modules/themes/spring/theme.css
index e92efe9..2336891 100644
--- a/lib/web/htdocs/modules/themes/spring/theme.css
+++ b/lib/web/htdocs/modules/themes/spring/theme.css
@@ -5,18 +5,18 @@
     --theme-accent-text-color: rgba(255, 255, 122, 1.0);
     --theme-primary-color-lightened: rgba(94, 193, 87, 1.0);
     --theme-icon-focus-background: rgba(82, 181, 75, 0.4);
-    --theme-background: rgba(23, 21, 57, 0.5);
-    --button-background: rgba(0, 0, 0, 0.5);
-    --card-background: rgba(0, 0, 0, 0.5);
+    --theme-background: rgba(23, 21, 57, 0.6);
+    --button-background: rgba(40, 40, 40, 0.7);
+    --card-background: rgba(10, 10, 10, 0.5);
     --header-background: rgba(3, 51, 97, 0.5) url(bg.jpg) no-repeat center top;
     --header-blur-background: rgba(3, 51, 97, 0.7);
     --footer-background: #033664;
     --footer-blur-background: var(--footer-background);
     --theme-body-secondary-text-color: rgba(255, 255, 255, 0.6);
-    --line-background: rgba(255, 255, 255, 0.8);
-    --line-size: 0.13em;
+    --line-background: rgba(255, 255, 255, 0.5);
+    --line-size: 0.08em;
     --scrollbar-thumb-background: rgba(133, 115, 113, 1.0);
-    --drawer-background: rgba(1, 20, 50, 1.0);
+    --drawer-background: rgba(21, 20, 50, 0.9);
     --docked-drawer-background: rgba(0, 0, 0, 0.4);
     --logo-url:  /modules/themes/logowhite.png;
     --theme-button-hover-color: rgba(28, 141, 173, 0.718);
diff --git a/lib/web/pages/__init__.py b/lib/web/pages/__init__.py
index 4ec8834..de20e8c 100644
--- a/lib/web/pages/__init__.py
+++ b/lib/web/pages/__init__.py
@@ -1,4 +1,5 @@
 import lib.web.pages.background
 import lib.web.pages.index_js
 import lib.web.pages.web_urls
-import lib.web.pages.dashstatus_json
\ No newline at end of file
+import lib.web.pages.dashstatus_json
+import lib.web.pages.manifest
diff --git a/lib/web/pages/background.py b/lib/web/pages/background.py
index 3c2aeb1..016c92b 100644
--- a/lib/web/pages/background.py
+++ b/lib/web/pages/background.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -32,13 +32,13 @@ def background(_webserver):
 
 
 def send_random_image(_webserver):
+    image = None
     if not _webserver.config['display']['backgrounds']:
         background_dir = _webserver.config['paths']['themes_pkg'] + '.' + \
                          _webserver.config['display']['theme']
         image_list = list(importlib.resources.contents(background_dir))
         image_found = False
         count = 10
-        image = None
         while not image_found and count > 0:
             image = random.choice(image_list)
             mime_lookup = mimetypes.guess_type(image)
@@ -50,7 +50,8 @@ def send_random_image(_webserver):
             _webserver.do_file_response(200, background_dir, image)
         else:
             _webserver.logger.warning('No Background Image found: ' + background_dir)
-            _webserver.do_mime_response(404, 'text/html', web_templates['htmlError']
+            _webserver.do_mime_response(
+                404, 'text/html', web_templates['htmlError']
                 .format('404 - Background Image Not Found'))
     else:
         lbackground = _webserver.config['display']['backgrounds']
@@ -67,13 +68,13 @@ def send_random_image(_webserver):
                 count -= 1
             if image_found:
                 _webserver.do_file_response(200, None, full_image_path)
-                _webserver.logger.debug('Background Image: {}'.format(str(image).replace(lbackground,'.')))
+                _webserver.logger.debug('Background Image: {}'.format(str(image).replace(lbackground, '.')))
             else:
                 _webserver.logger.warning('Image not found at {}'.format(lbackground))
                 _webserver.do_mime_response(404, 'text/html',
-                    web_templates['htmlError'].format('404 - Background Image Not Found'))
+                                            web_templates['htmlError'].format('404 - Background Image Not Found'))
 
         except (FileNotFoundError, IndexError):
             _webserver.logger.warning('Background Theme Folder not found: ' + lbackground)
             _webserver.do_mime_response(404, 'text/html', web_templates['htmlError']
-                .format('404 - Background Folder Not Found'))
+                                        .format('404 - Background Folder Not Found'))
diff --git a/lib/web/pages/dashstatus_json.py b/lib/web/pages/dashstatus_json.py
old mode 100755
new mode 100644
index 91a07d4..6c4269b
--- a/lib/web/pages/dashstatus_json.py
+++ b/lib/web/pages/dashstatus_json.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -20,6 +20,7 @@
 import json
 import logging
 import urllib
+import urllib.request
 
 from lib.common.decorators import getrequest
 from lib.common.decorators import handle_url_except
@@ -31,12 +32,12 @@ def pages_dashstatus_json(_webserver):
     dashstatus_js = DashStatusJS(_webserver.config)
     expire_time = datetime.datetime.utcnow()
     expire_str = expire_time.strftime("%a, %d %b %Y %H:%M:%S GMT")
-    _webserver.do_dict_response({ 
-            'code': 200, 'headers': {'Content-type': 'application/json',
-            'Expires': expire_str
-            },
-            'text': dashstatus_js.get()
-            })
+    _webserver.do_dict_response({
+        'code': 200, 'headers': {'Content-type': 'application/json',
+                                 'Expires': expire_str
+                                 },
+        'text': dashstatus_js.get()
+    })
     return True
 
 
@@ -48,16 +49,16 @@ def __init__(self, _config):
 
     def get(self):
         js = ''.join([
-            '{ "tunerstatus": ', self.get_tuner_status(),
-            ', "schedstatus": ', self.get_scheduler_status(),
+            '{ "tunerstatus": ', str(self.get_tuner_status()),
+            ', "schedstatus": ', str(self.get_scheduler_status()),
             '}'
         ])
         return js
 
     def get_tuner_status(self):
         web_tuner_url = 'http://localhost:' + \
-            str(self.config['web']['plex_accessible_port'])
-        url = ( web_tuner_url + '/tunerstatus')
+                        str(self.config['web']['plex_accessible_port'])
+        url = (web_tuner_url + '/tunerstatus')
         return self.get_url(url)
 
     @handle_url_except()
@@ -65,6 +66,8 @@ def get_url(self, _url):
         req = urllib.request.Request(_url)
         with urllib.request.urlopen(req) as resp:
             result = resp.read()
+        if result is None:
+            return 'null'
         return result.decode('utf-8')
 
     def get_scheduler_status(self):
diff --git a/lib/web/pages/index_js.py b/lib/web/pages/index_js.py
index 738c643..fcb27cd 100644
--- a/lib/web/pages/index_js.py
+++ b/lib/web/pages/index_js.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
@@ -16,113 +16,155 @@
 substantial portions of the Software.
 """
 
-import json
-import urllib
-
 import lib.common.utils as utils
 from lib.common.decorators import getrequest
 from lib.db.db_plugins import DBPlugins
-from lib.db.db_scheduler import DBScheduler
 
 
 @getrequest.route('/api/index.js')
 def pages_index_js(_webserver):
-    indexjs = IndexJS()
-    _webserver.do_mime_response(200, 'text/javascript', indexjs.get(_webserver.config))
+    indexjs = IndexJS(_webserver.config)
+    _webserver.do_mime_response(200, 'text/javascript', indexjs.get())
     return True
 
 
 class IndexJS:
 
-    @staticmethod
-    def get(_config):
+    def __init__(self, _config):
+        self.config = _config
+        self.plugin_db = DBPlugins(_config)
+
+    def check_upgrade_status(self):
+        plugin_defns = self.plugin_db.get_plugins(
+            True, None, None)
+        if plugin_defns:
+            for plugin_defn in plugin_defns:
+                latest_version = plugin_defn['version']['latest']
+                upgrade_available = ''
+                if plugin_defn['external'] and latest_version != plugin_defn['version']['current']:
+                    return '$(\"#pluginStatus\").text("Upgrade");'
+        return ''
+
+    def get(self):
         js = ''.join([
             'var upgrading = "running"; ',
-            '$(document).ready(setTimeout(function(){',
-                '$(\'head\').append(\'<link rel="stylesheet"',
-                    ' href="/modules/themes/',
-                    _config['display']['theme'],
-                    '/theme.css"',
-                    ' type="text/css" />',
-                    '<script type="text/javascript"',
-                    ' src="/modules/themes/',
-                    _config['display']['theme'],
-                    '/theme.js"></script>',
-                    '\');',
-                    
-                '$(\'#content\').html(\'<!DOCTYPE html><html><head>'
-                '<title>Dashboard</title>',
-                '<meta name="viewport" content="width=device-width, ',
-                'minimum-scale=1.0, maximum-scale=1.0"/>',
-                '<link rel=\"stylesheet\" type="text/css" href=\"/modules/dashboard/dashboard.css\">',
-                '<link rel=\"stylesheet\" type=\"text/css\" href=\"/modules/table/table.css\">',
-                '<script src=\"/modules/dashboard/dashboard.js\"></script>',
-                '</head>\');',
-                    
-                '$(\'#content\').append(\'<div id=\"logo\"></div>',
-                    IndexJS.get_version_div(_config),
-                    '<div id=\"dashboard\"></div>',
-                    '\');',
-                'logo = getComputedStyle(document.documentElement)',
-                    '.getPropertyValue("--logo-url");',
-                'if ( logo == \"\" ) { ',
-                    'setTimeout(function() {',
-                        'logo = getComputedStyle(document.documentElement)',
-                            '.getPropertyValue("--logo-url");',
-                        '$(\'#logo\').html(\'<img class=\"splash\" src=\"\'+logo+\'\">',
-                        '\');',
-                        '}, 2000);'
-                '} else {'
-                    '$(\'#logo\').html(\'<img class=\"splash\" src=\"\'+logo+\'\">',
-                    '\');',
-                '}',
-                '}, 1000));',
-            'function load_url(url) {',
-                '$(\"#content\").load(url);}',
+            'var lookup_title = new Map(); ',
+            'lookup_title.set("/html/links.html", "Cabernet Links"); ',
+            'lookup_title.set("/api/configform?area=general", "Cabernet Settings:Internal"); ',
+            'lookup_title.set("/api/configform?area=streams", "Cabernet Settings:Streams"); ',
+            'lookup_title.set("/api/configform?area=epg", "Cabernet Settings:EPG"); ',
+            'lookup_title.set("/api/configform?area=clients", "Cabernet Settings:Clients"); ',
+            'lookup_title.set("/api/configform?area=logging", "Cabernet Settings:Logging"); ',
+            'lookup_title.set("/api/channels", "Cabernet Channel Editor"); ',
+            'lookup_title.set("/api/schedulehtml", "Cabernet Scheduler"); ',
+            'lookup_title.set("/api/datamgmt", "Cabernet Data Management"); ',
+            'lookup_title.set("/api/plugins", "Cabernet Plugins"); ',
+            'function load_url(url, title) {',
+            '$(\"#content\").load(url);',
+            'document.title = title;',
+            'newurl = window.location.pathname+"?content="+encodeURIComponent(url);',
+            'window.history.pushState({}, null, newurl);',
+            '}',
+
             'function load_status_url(url) {',
-                'if ( upgrading == "running" ) { ',
-                '$(\"#status\").load(url, function( resp, s, xhr ) {',
-                'if ( s == \"error\" ) {',
-                '$(\"#status\").text( xhr.status + \" \" + xhr.statusText ); ',
-                '} else {setTimeout(function(){',
-                'load_status_url(url);}, 700);',
-                '}});} else if ( upgrading == "success" ) {$(\"#status\").append(\"Upgrade complete, reload page\");',
-                ' upgrading = "running";',
-                '} else {$(\"#status\").append(\"Upgrade aborted\"); upgrading = "running";}};'
+            'if ( upgrading == "running" ) { ',
+            '$(\"#status\").load(url, function( resp, s, xhr ) {',
+            'if ( s == \"error\" ) {',
+            '$(\"#status\").text( xhr.status + \" \" + xhr.statusText ); ',
+            '} else {setTimeout(function(){',
+            'load_status_url(url);}, 700);',
+            '}});} else if ( upgrading == "success" ) {$(\"#status\").append(\"Upgrade complete, reload page\");',
+            ' upgrading = "running";',
+            '} else {$(\"#status\").append(\"Upgrade aborted\"); upgrading = "running";}};',
+
+            '$(document).ready(setTimeout(function(){',
+            '$(\'head\').append(\'<link rel="stylesheet"',
+            ' href="/modules/themes/',
+            self.config['display']['theme'],
+            '/theme.css"',
+            ' type="text/css" />',
+            '<script type="text/javascript"',
+            ' src="/modules/themes/',
+            self.config['display']['theme'],
+            '/theme.js"></script>',
+            '\');',
+
+            'if ( !window.location.search ) {',
+            '$(\'#content\').html(\'<!DOCTYPE html><html><head>'
+            '<title>Dashboard</title>',
+            '<meta name="viewport" content="width=device-width, ',
+            'minimum-scale=1.0, maximum-scale=1.0"/>',
+            '<link rel=\"stylesheet\" type="text/css" href=\"/modules/dashboard/dashboard.css\">',
+            '<link rel=\"stylesheet\" type=\"text/css\" href=\"/modules/table/table.css\">',
+            '<script src=\"/modules/dashboard/dashboard.js\"></script>',
+            '</head>\');',
+
+            '$(\'#content\').append(\'<div id=\"logo\"></div>',
+            self.get_version_div(),
+            '<div id=\"dashboard\"></div>',
+            '\');',
+            '} else {',
+            'const urlSearchParams = new URLSearchParams(window.location.search);',
+            'const params = Object.fromEntries(urlSearchParams.entries());',
+            'if (params.content) {'
+            'load_url.call(this, params.content, ',
+            'lookup_title.get(params.content));', 
+            '}',
+            '}',
+            'logo = getComputedStyle(document.documentElement)',
+            '.getPropertyValue("--logo-url");',
+            'if ( logo == \"\" ) { ',
+            'setTimeout(function() {',
+            'logo = getComputedStyle(document.documentElement)',
+            '.getPropertyValue("--logo-url");',
+            '$(\'#logo\').html(\'<img class=\"splash\" src=\"\'+logo+\'\">',
+            '\');',
+            '}, 2000);'
+            '} else {'
+            '$(\'#logo\').html(\'<img class=\"splash\" src=\"\'+logo+\'\">',
+            '\');',
+            '}',
+            self.check_upgrade_status(),
+            '}, 1000));'
         ])
         return js
 
-
-    @staticmethod
-    def get_version_div(_config):
-        plugin_db = DBPlugins(_config)
-        manifest_list = plugin_db.get_plugins(utils.CABERNET_NAMESPACE)
-        if manifest_list is None:
+    def get_version_div(self):
+        manifest_list = self.plugin_db.get_repos(utils.CABERNET_ID)
+        if not manifest_list:
             current_version = utils.VERSION
-            next_version = None
-            latest_version = None
             upgrade_js = ''
         else:
-            current_version = manifest_list[0]['version']
-            next_version = manifest_list[0]['next_version']
-            latest_version = manifest_list[0]['latest_version']
+            current_version = manifest_list[0]['version']['current']
+            
+            next_version = manifest_list[0]['version'].get('next')
+            if not next_version:
+                current_version = 'TBD'
+                next_version = 'TBD'
+            latest_version = manifest_list[0]['version'].get('latest')
+            if not latest_version:
+                current_version = 'TBD'
+                latest_version = 'TBD'
             if current_version == next_version:
                 upgrade_js = ''
             else:
                 upgrade_js = ''.join([
                     'A new version of Cabernet is available!<br>',
                     'Latest Version ', latest_version, ' &nbsp; ',
-                    '<a style=\"border: 1px; border-radius: 0.5em; padding-bottom: 5px; padding-top: 5px; text-decoration: none; color: inherit; background: var(--theme-button-hover-color);\" ',
-                    ' href=\"#\" onClick=\"load_status_url(\\\'/api/upgrade?id=Cabernet\\\'',
+                    '<a style=\"border: 1px; border-radius: 0.5em;',
+                    ' padding-bottom: 5px; padding-top: 5px; text-decoration: none;',
+                    ' color: inherit; background: var(--theme-button-hover-color);\" ',
+                    ' href=\"#\" onClick=\"load_status_url(\\\'/api/upgrade?id=cabernet\\\'',
                     ');\" title=\"Upgrade Cabernet\">',
                     '<i style=\"font-size: 150%;\" class=\"md-icon\">upgrade</i>',
                     '<b>Upgrade to ', next_version, '</b> &nbsp; </a> '
                 ])
 
         version_js = ''.join([
-                '<div style=\"padding: 1em; background: var(--docked-drawer-background); margin-left: auto;margin-right: auto;width: max-content;\">',
-                'Version: ', current_version, '<br>',
-                upgrade_js,
-                '</div>'
+            '<div style=\"padding: 1em; background: var(--docked-drawer-background);',
+            ' margin-left: auto;margin-right: auto;width: max-content;\">',
+            'Version: ', current_version, '<br>',
+            upgrade_js,
+            '</div>'
         ])
         return version_js
diff --git a/lib/web/pages/manifest.py b/lib/web/pages/manifest.py
new file mode 100644
index 0000000..6b127e3
--- /dev/null
+++ b/lib/web/pages/manifest.py
@@ -0,0 +1,82 @@
+"""
+MIT License
+
+Copyright (C) 2023 ROCKY4546
+https://github.com/rocky4546
+
+This file is part of Cabernet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+"""
+
+import pathlib
+import os
+
+from lib.common.decorators import getrequest
+from lib.web.pages.templates import web_templates
+from lib.db.db_plugins import DBPlugins
+
+
+@getrequest.route('/api/manifest')
+def get_manifest_data(_webserver):
+    if 'plugin' not in _webserver.query_data:
+        pass
+    elif 'key' not in _webserver.query_data:
+        pass
+    elif 'repo' not in _webserver.query_data:
+        return send_file(_webserver)
+    else:
+        return send_file(_webserver)
+
+    _webserver.do_mime_response(404, 'text/html', web_templates['htmlError'].format('404 - Manifest Not Found'))
+    return False
+
+
+def send_file(_webserver):
+    repo = _webserver.query_data.get('repo')
+    plugin = _webserver.query_data['plugin']
+    key = _webserver.query_data['key']
+    
+    plugin_db = DBPlugins(_webserver.config)
+    plugin_defn = plugin_db.get_plugins_by_name(None, repo, plugin)
+    if not plugin_defn:
+        _webserver.do_mime_response(
+                404, 'text/html', web_templates['htmlError']
+                .format('404 - Plugin Not Found'))
+        return
+
+    if len(plugin_defn) != 1:
+        print('TOO MANY PLUGINS')
+        _webserver.do_mime_response(
+                404, 'text/html', web_templates['htmlError']
+                .format('404 - DUPLICATE PLUGINS'))
+        return
+    plugin_defn = plugin_defn[0]
+    if not plugin_defn['version']['installed']:
+        thumbnail_path = _webserver.config['paths']['thumbnails_dir']
+        plugin_id = plugin_defn['id']
+        image_path = plugin_defn[key]
+        full_cache = pathlib.Path(
+            thumbnail_path, plugin_id, image_path)
+
+        _webserver.do_file_response(200, None, full_cache)
+        return
+    else:
+        try:
+            base = os.path.dirname(_webserver.plugins.plugins[plugin].plugin_settings[key]).replace('/', '.')
+            image_filename = os.path.basename(_webserver.plugins.plugins[plugin].plugin_settings[key])
+            path_to_image = _webserver.plugins.plugins[plugin].plugin_path + '.' + base
+            _webserver.do_file_response(200, path_to_image, image_filename)
+        except KeyError:
+            _webserver.do_mime_response(
+                    404, 'text/html', web_templates['htmlError']
+                    .format('404 - Not Found'))
+    
+
diff --git a/lib/web/pages/templates.py b/lib/web/pages/templates.py
index 0203b17..7a5fd5e 100644
--- a/lib/web/pages/templates.py
+++ b/lib/web/pages/templates.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
diff --git a/lib/web/pages/web_urls.py b/lib/web/pages/web_urls.py
index 7b164c4..094a177 100644
--- a/lib/web/pages/web_urls.py
+++ b/lib/web/pages/web_urls.py
@@ -1,7 +1,7 @@
 """
 MIT License
 
-Copyright (C) 2021 ROCKY4546
+Copyright (C) 2023 ROCKY4546
 https://github.com/rocky4546
 
 This file is part of Cabernet
diff --git a/plugins/provider_video_123tv/__init__.py b/plugins/provider_video_123tv/__init__.py
deleted file mode 100755
index fd71a19..0000000
--- a/plugins/provider_video_123tv/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import lib.plugins.plugin as plugin
-from .lib.tv123 import TV123
-
-
-# register the init plugin function
-@plugin.register
-def start(_plugin, _plugins):
-    return TV123(_plugin, _plugins)
diff --git a/plugins/provider_video_123tv/config_defn.json b/plugins/provider_video_123tv/config_defn.json
deleted file mode 100755
index fecfb4f..0000000
--- a/plugins/provider_video_123tv/config_defn.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "streams":{
-        "id": null,
-        "icon": "cast",
-        "label": "Stream Providers",
-        "description": "Streaming Services",
-        "sections":{
-            "123tv":{
-                "label": "123TV",
-                "sort": "123TV1",
-                "icon": "cast",
-                "description": "Settings for 123TV",
-                "settings":{
-                    "enabled":{
-                        "label": "Enabled",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 1,
-                        "help": "Will disable if an error occurs; otherwise set to disable to disable plugin"
-                    },
-                    "player-tuner_count":{
-                        "label": "tuner_count",
-                        "type": "integer",
-                        "default": 10,
-                        "level": 2,
-                        "help": "Number of streams active at one time"
-                    },
-                    "epg-plugin":{
-                        "label": "EPG Plugin to Use",
-                        "type": "list",
-                        "default": "None",
-                        "values": ["None", "ALL"],
-                        "level": 1,
-                        "onChange": ".provider_video_123tv.lib.config_callbacks.license_confirmation",
-                        "help": "The EPG plugin to use to gather data for personal use"
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/plugins/provider_video_123tv/instance_defn.json b/plugins/provider_video_123tv/instance_defn.json
deleted file mode 100755
index a277d9f..0000000
--- a/plugins/provider_video_123tv/instance_defn.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-    "streams":{
-        "id": null,
-        "icon": "cast",
-        "label": "Stream Providers",
-        "description": "Streaming Services",
-        "sections":{
-            "123tv":{
-                "label": "123TV",
-                "sort": "123TV2",
-                "icon": "cast_connected",
-                "description": "Settings for 123TV Instances",
-                "settings":{
-                    "enabled":{
-                        "label": "Enabled",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 0,
-                        "help": "Will disable this instance only"
-                    },
-                    "label":{
-                        "label": "Label",
-                        "type": "string",
-                        "default": null,
-                        "level": 0,
-                        "onChange": "lib.config.config_callbacks.update_instance_label",
-                        "help": "Defines the tab name for this instance"
-                    },
-                    "channel-update_timeout":{
-                        "label": "Channel Update Timeout",
-                        "type": "integer",
-                        "default": 23,
-                        "level": 3,
-                        "help": "Channel list must be this old in hours for update to occur when requested"
-                    },
-                    "channel-import_groups":{
-                        "label": "Import Channel Groups",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 1,
-                        "help": "Imports groups from 123TV into the group other column"
-                    },
-                    "channel-group_name":{
-                        "label": "Group Name",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "By default, the m3u file contains the plugin as a group.  This allows an instance name to be added to the group list during the m3u request. Use simple single words, if possible. If empty, will not add group."
-                    },
-                    "channel-start_ch_num":{
-                        "label": "Starting Ch Number",
-                        "type": "integer",
-                        "default": 1,
-                        "level": 1,
-                        "onChange": "lib.config.config_callbacks.update_channel_num",
-                        "help": "When channel number is not provided, will use this incrementally."
-                    },
-                    "player-stream_type":{
-                        "label": "stream_type",
-                        "type": "list",
-                        "default": "internalproxy",
-                        "values": ["m3u8redirect", "internalproxy", "streamlinkproxy", "ffmpegproxy"],
-                        "level": 1,
-                        "help": "M3U8 send m3u8 file directly to client.  ffmpeg uses ffmpeg for m3u8 urls. streamlink uses the python module streamlink. internal uses internally coded modules."
-                    },
-                    "player-play_all_segments":{
-                        "label": "Play All (VOD)",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Plays all starting segments and ignores Non-VOD Segments to Start setting. Helpful when the VOD is not set in the provider stream."
-                    },
-                    "player-segments_to_play":{
-                        "label": "Non-VOD Segments to Start",
-                        "type": "integer",
-                        "default": 4,
-                        "level": 2,
-                        "help": "When starting, will play the last xxx segments. '1' means no buffering. Each increase means about 6 seconds of buffering. If the VOD flag is set in the stream, then setting is ignored."
-                    },
-                    "player-enable_url_filter":{
-                        "label": "Enable URL Filtering",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Only works with internalproxy. Filters out streams from URL addresses based on regular expression"
-                    },
-                    "player-url_filter":{
-                        "label": "URL Filter",
-                        "type": "string",
-                        "default": null,
-                        "level": 3,
-                        "help": "Only used with stream_type=internalproxy"
-                    },
-                    "player-enable_pts_filter":{
-                        "label": "Enable PTS Filtering",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Works with internalproxy and ffmpegproxy. Filters out corrupted PTS packets.  Requires ffprobe.exe"
-                    },
-                    "player-pts_minimum":{
-                        "label": "pts_minimum",
-                        "type": "integer",
-                        "default": 10000000,
-                        "level": 3,
-                        "help": "Default 10,000,000 or 108 seconds after midnight. Filters out non-standard streams that whose PTS starts at midnight."
-                    },
-                    "player-pts_max_delta":{
-                        "label": "pts_max_delta",
-                        "type": "integer",
-                        "default": 3000000,
-                        "level": 3,
-                        "help": "Default 3,000,000 or 32 seconds. when playing contiguous blocks of video, filters out any blocks that do not have a continuous PTS counter."
-                    },
-                    "player-enable_pts_resync":{
-                        "label": "Enable PTS/DTS Resync",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 2,
-                        "help": "Works with internalproxy and ffmpegproxy. Corrects timing issues with the video and audio streams and makes them contiguous"
-                    },
-                    "player-pts_resync_type":{
-                        "label": "PTS/DTS Resync Type",
-                        "type": "list",
-                        "default": "ffmpeg",
-                        "values": ["ffmpeg", "internal"],
-                        "level": 2,
-                        "help": "Uses either ffmpeg genpts or internal resequencing"
-                    },
-                    "epg-enabled":{
-                        "label": "XMLTV Enabled",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 1,
-                        "help": "If disabled, will not ingest or populate the XMLTV output with this instance"
-                    },
-                    "epg-prefix":{
-                        "label": "EPG Channel Prefix",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "If a number will ADD to the display channel number; otherwise, will prepend to the channel number as a string"
-                    },
-                    "epg-suffix":{
-                        "label": "EPG Channel Suffix",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "Will append to the channel number as a string"
-                    },
-                    "epg-episode_adjustment":{
-                        "label": "Adjusts Episode number",
-                        "type": "list",
-                        "default": 0,
-                        "values": [1000, 2000, 3000, 4000, 5000],
-                        "level": 1,
-                        "help": "Used to record the same episode on two different channels at the same time.  EX: Record the same channel from antenna and 123TV at the same time."
-                    },
-                    "epg-start_adjustment":{
-                        "label": "Start Time Adjustment",
-                        "type": "integer",
-                        "default": 0,
-                        "level": 2,
-                        "help": "Used to start each program x seconds after the program is suppose to start."
-                    },
-                    "epg-end_adjustment":{
-                        "label": "End Time Adjustment",
-                        "type": "integer",
-                        "default": 0,
-                        "level": 2,
-                        "help": "Used to start each program x seconds before the program is suppose to end."
-                    },
-                    "epg-min_refresh_rate":{
-                        "label": "EPG Min Refresh Rate",
-                        "type": "integer",
-                        "default": 3600,
-                        "level": 2,
-                        "help": "Default=3600 seconds (1 hour). When a HTTP request for epg data is received, will refresh the data if older than this value."
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/plugins/provider_video_123tv/lib/channels.py b/plugins/provider_video_123tv/lib/channels.py
deleted file mode 100755
index dd6593c..0000000
--- a/plugins/provider_video_123tv/lib/channels.py
+++ /dev/null
@@ -1,380 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import base64
-import datetime
-import hashlib
-import html
-import json
-import re
-import sys
-import threading
-import time
-import urllib
-from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-from cryptography.hazmat.primitives import padding
-from cryptography.hazmat.backends import default_backend
-from multiprocessing import Queue, Process
-
-import lib.clients.channels.channels as channels
-from lib.plugins.plugin_channels import PluginChannels
-from lib.db.db_epg_programs import DBEpgPrograms
-from lib.common.decorators import handle_json_except
-from lib.common.decorators import handle_url_except
-import lib.common.exceptions as exceptions
-import lib.common.utils as utils
-
-
-class Channels(PluginChannels):
-
-    def __init__(self, _instance_obj):
-        super().__init__(_instance_obj)
-        self.search_ch = re.compile(r'video-thumb\">\n\s*<a href=\".+watch/(.+)/\">\n\s*<img src=\"(.+)\" alt=\"(.+)\">')
-        self.search_m3u8 = re.compile(r'(https?:\/\/.*?\.m3u8\?embed=true)')
-        self.search2_m3u8 = re.compile(r'source:\'(https?:\/\/.*?\.m3u8)')
-        self.search_enc = re.compile(r"'#'\+'v'\+'i'\+'d'\+'eo'\+'-i'\+'d'\)\.val\(\)\)\;\n.+\n(.+)")
-        self.search_split = re.compile(r'(?<=\[)[^\]]+(?=\])')
-        self.search_key = re.compile(r'(?<=\[)[\d+\,]+(?=\])')
-        self.search_query = re.compile(r'(?<=\')\S+(?=\';}$)')
-        self.search_epg_id = re.compile(r'<iframe.+\/123tv\.live\/epg\/.+html#(\d+)')
-        self.ch_db_list = None
-
-    def get_channels(self):
-        is_ch_list_done = False
-        channels = []
-        ch_list = []
-
-        self.ch_db_list = self.db.get_channels(self.plugin_obj.name, self.instance_key)
-        if self.ch_db_list:
-            is_run_scans = False
-        else:
-            is_run_scans = True
-        
-        page = 0
-        while not is_ch_list_done:
-            ch_list = self.get_channel_list(page)
-            if ch_list is None:
-                is_ch_list_done = True
-                break
-            channels += ch_list
-            page += 1
-
-        if len(channels) == 0:
-            self.logger.warning('123TV channel list is empty from provider, not updating Cabernet')
-            return
-        self.logger.info("{}: Found {} stations on instance {}"
-            .format(self.plugin_obj.name, len(channels), self.instance_key))
-        channels = sorted(channels, key=lambda d: d['name'])
-        ch_num = 1
-        for ch in channels:
-            ch['number'] = ch_num
-            ch_num += 1
-
-        # run channel scans if first time
-        if is_run_scans:
-            # this will run the scan parallel and after this method completes
-            scan = threading.Thread(target=self.scan_channels)
-            scan.start()
-        return channels
-
-
-    def scan_channels(self):
-        results = True
-        self.ch_db_list = {}
-        count = 5
-        while not self.ch_db_list:
-            time.sleep(1)
-            self.ch_db_list = self.db.get_channels(self.plugin_obj.name, self.instance_key)
-            count -= 1
-            if count < 0:
-                self.logger.warning('{}: Channel DB empty, aborting scan'.format(self.plugin_obj.name))
-                results = False
-                break
-            
-        for ch_id in self.ch_db_list:
-            ch_enabled = self.ch_db_list[ch_id][0]['enabled']
-            ch_status = self.ch_db_list[ch_id][0]['json']['status']
-            
-            # scan channels where status is down
-            # status of down means the channel has never worked
-            if ch_status == 'down':
-                # standard case, rescan
-                url = self.get_channel_uri(ch_id)
-                self.logger.debug('{}: Completed scan for channel {}'.format(self.plugin_obj.name, ch_id))
-        self.logger.notice('{}: Disabled Channel Scan Completed'.format(self.plugin_obj.name))
-        time.sleep(1)
-        # sleep required to print out last log entry
-        return results
-
-    @handle_url_except(timeout=10.0)
-    @handle_json_except
-    def get_channel_uri(self, _channel_id):
-        self.logger.debug('{} : Getting video stream for channel {}' \
-            .format(self.plugin_obj.name, _channel_id))
-        uri = self.plugin_obj.unc_tv123_base + self.plugin_obj.unc_tv123_stream_channel.format(_channel_id)
-        json_needs_updating = False
-        
-        text = self.get_uri_data(_uri=uri).decode()
-
-        # Check if this is a normal m3u8 url in player
-        uri = self.get_m3u8_uri(text, uri)
-        if uri is not None:
-            self.logger.debug('{} : Regular M3U8 URL found {}'.format(self.plugin_obj.name, _channel_id))
-            ch_dict = self.db.get_channel(_channel_id, self.plugin_obj.name, self.instance_key)
-            ch_json = ch_dict['json']
-            if ch_json['status'] == 'down' and ch_dict['enabled']:
-                ch_json['status'] = 'up'
-                self.db.update_channel_json(ch_json, self.plugin_obj.name, self.instance_key)
-            return uri
-
-        # Check if this url is hidden and encrypted
-        uri = self.get_enc_uri(text, _channel_id)
-        if uri is None:
-            self.logger.info('{} : Unable to find encrypted URL stream, aborting {}'.format(self.plugin_obj.name, _channel_id))
-            return
-
-        # it takes 2 http pulls to obtain the m3u8 url
-        stream_url = self.get_enc_uri2(uri)
-        if stream_url is None:
-            self.logger.info('{} : Unable to find m3u8 URL from encrypted URL, aborting'.format(self.plugin_obj.name))
-            return
-
-        header = {
-            'User-agent': utils.DEFAULT_USER_AGENT,
-            'Referer': self.plugin_obj.unc_tv123_base }
-
-        ch_dict = self.db.get_channel(_channel_id, self.plugin_obj.name, self.instance_key)
-        ch_json = ch_dict['json']
-        text = self.get_uri_data(stream_url, _header=header)
-        if text is None:
-            # for possible PSP channels that are down, set the channel to disabled
-            # if channel has never been up
-            if ch_json['status'] == 'down' and ch_dict['enabled']:
-                ch_dict['enabled'] = False
-                ch_json['enabled'] = False
-                self.db.update_channel(ch_dict)
-                self.db.update_channel_json(ch_json, self.plugin_obj.name, self.instance_key)
-            self.logger.info('{}: Unable to open m3u8 enc stream URL, possible P2P issue, aborting {}'
-                .format(self.plugin_obj.name, ch_dict['uid']))
-            return
-        if not (ch_json['status'] == 'up' and ch_dict['enabled']):
-            if ch_json['status'] == 'down':
-                json_needs_updating = True
-                ch_json['status'] = 'up'
-            if not ch_dict['enabled']:
-                ch_dict['enabled'] = True
-                ch_json['enabled'] = True
-                json_needs_updating = True
-                self.db.update_channel(ch_dict)
-                self.logger.info('{} Enabling channel {}'.format(self.plugin_obj.name, ch_dict['uid']))
-        
-        videoUrlM3u = self.get_m3u8_data(stream_url, _header=header)
-        self.logger.debug('Found {} Playlist(s)'.format(str(len(videoUrlM3u.playlists))))
-        
-        bestStream = None
-        bestResolution = -1
-        if len(videoUrlM3u.playlists) > 0:
-            for videoStream in videoUrlM3u.playlists:
-                if bestStream is None:
-                    bestStream = videoStream
-                elif ((videoStream.stream_info.resolution[0] > bestStream.stream_info.resolution[0]) and
-                      (videoStream.stream_info.resolution[1] > bestStream.stream_info.resolution[1])):
-                    bestResolution = videoStream.stream_info.resolution[1]
-                    bestStream = videoStream
-                elif ((videoStream.stream_info.resolution[0] == bestStream.stream_info.resolution[0]) and
-                      (videoStream.stream_info.resolution[1] == bestStream.stream_info.resolution[1]) and
-                      (videoStream.stream_info.bandwidth > bestStream.stream_info.bandwidth)):
-                    bestResolution = videoStream.stream_info.resolution[1]
-                    bestStream = videoStream
-
-            if bestStream is not None:
-                if bestResolution >= 720 and ch_json['HD'] == 0:
-                    ch_json['HD'] = 1
-                    json_needs_updating = True
-                elif bestResolution < 720 and ch_json['HD'] == 1:
-                    ch_json['HD'] = 0
-                    json_needs_updating = True
-                
-                self.logger.info('{} will use {}x{} resolution at {}bps' \
-                    .format(_channel_id, str(bestStream.stream_info.resolution[0]), \
-                    str(bestStream.stream_info.resolution[1]), str(bestStream.stream_info.bandwidth)))
-                m3u8_uri = bestStream.absolute_uri
-            else:
-                m3u8_uri = None
-        else:
-            self.logger.debug('No variant streams found for this station.  Assuming single stream only.')
-            m3u8_uri = stream_url
-
-        if json_needs_updating:
-            self.db.update_channel_json(ch_json, self.plugin_obj.name, self.instance_key)
-        return m3u8_uri
-
-    def get_channel_list(self, page_num):
-
-        ch_list = []
-        data = { 'action': self.plugin_obj.unc_tv123_wp_more_ch_cmd,
-                 'chn_id': '1',
-                 'page_num': page_num
-               }
-
-        text = self.get_uri_data(_uri=self.plugin_obj.unc_tv123_base+self.plugin_obj.unc_tv123_additional_channels, 
-            _data=urllib.parse.urlencode(data).encode()).decode()
-        if text == "NO_MORE":
-            return None
-
-        match_list = re.findall(self.search_ch, text)
-        for m in match_list:
-            if len(m) != 3:
-                self.logger.warning('get_channel_list - 123TV channel extraction failed.  Updates to extraction procedure needs updating')
-                return None
-
-            ch_db_data = self.ch_db_list.get(m[0])
-            if ch_db_data is not None:
-                enabled = ch_db_data[0]['enabled']
-                hd = ch_db_data[0]['json']['HD']
-                thumb = ch_db_data[0]['thumbnail']
-                thumb_size = ch_db_data[0]['thumbnail_size']
-                epg_id = ch_db_data[0]['json']['epg_id']
-            else:
-                enabled = True
-                hd = 1
-                thumb = m[1]
-                thumb_size = self.get_thumbnail_size(m[1], m[0])
-                epg_id = self.get_epg_id(m[0])
-            
-            name = html.unescape(m[2])
-            if name.lower().startswith('the '):
-                name = name[4:]
-            
-            channel = {
-                'id': m[0],
-                'enabled': enabled,
-                'callsign': m[0],
-                'number': 0,
-                'name': name,
-                'HD': hd,
-                'group_hdtv': None,
-                'group_sdtv': None,
-                'groups_other': None,
-                'thumbnail': thumb,
-                'thumbnail_size': thumb_size,
-                'VOD': False,
-                'Header': { 'User-agent': utils.DEFAULT_USER_AGENT,
-                    'Referer': self.plugin_obj.unc_tv123_referer},
-                'status': 'down',
-                'epg_id': epg_id
-            }
-            ch_list.append(channel)
-            self.logger.debug('{} Added Channel {}:{}'.format(self.plugin_obj.name, m[0], name))
-        return ch_list
-
-    @handle_url_except(timeout=10.0)
-    def get_epg_id(self, _ch_id):
-        uri = self.plugin_obj.unc_tv123_base + self.plugin_obj.unc_tv123_stream_channel.format(_ch_id)
-        html = self.get_uri_data(_uri=uri).decode()
-        m = re.search(self.search_epg_id, html)
-        if m is None:
-            return None
-        return m.group(1)
-
-    def get_m3u8_uri(self, html, referer):
-        """
-        Used when 123tv uses the m3u8 link directly on the player
-        """
-
-        m = re.search(self.search_m3u8, html)
-        if m is not None:
-            m3u8_url = m.group(1)
-            header = {
-                'User-agent': utils.DEFAULT_USER_AGENT,
-                'Referer': referer}
-            text = self.get_uri_data(_uri=m3u8_url, _header=header).decode()
-            m2 = re.search(self.search2_m3u8, text)
-            if m2 is not None:
-                m3u8_url2 = m2.group(1)
-
-                referer_url = self.plugin_obj.unc_tv123_referer
-                header = {
-                    'User-agent': utils.DEFAULT_USER_AGENT,
-                    'Referer': referer_url}
-                text = self.get_uri_data(m3u8_url2, _header=header)
-                if text is None:
-                    return
-                text = text.decode()
-                if text.startswith('#EXTM3U'):
-                    return m3u8_url2
-            else:
-                self.logger.warning('{} : Unable to find m3u8 url. This should not happen...'.format(self.plugin_obj.name))
-        return
-
-    @handle_json_except
-    def get_enc_uri(self, text, _channel_id):
-        """
-        Used when 123tv uses encryption strings within javascript.
-        resulting in a m3u8 url that produces json data
-        """
-        m = re.search(self.search_enc, text)
-        try:
-            enc_text, enc_key, enc_query_str = m.group(1).split('};')
-        except ValueError:
-            self.logger.debug('{} : VALUE ERROR no encryption keys were found, aborting {}'.format(self.plugin_obj.name, _channel_id))
-            return
-
-        m2 = re.search(self.search_split, enc_text)
-        if not m2:
-            self.logger.debug('{} : Unable to split the encrypted text string, aborting {}'.format(self.plugin_obj.name, _channel_id))
-            return
-            
-        b64_str = ''.join(m2.group().replace("'",'').split(','))
-        json_dict = json.loads(base64.b64decode(b64_str))
-        
-        key = ''
-        key_list = ','.join(re.findall(self.search_key, enc_key)).split(',')
-        for chr_num in key_list:
-            key = chr(int(chr_num)) + key
-
-        json_dict['iterations'] = 999 if json_dict['iterations'] <= 0 else json_dict['iterations']
-        key_data = hashlib.pbkdf2_hmac('sha512', key.encode('utf8'), bytes.fromhex(json_dict['salt']),
-                                      json_dict['iterations'], dklen=256 // 8)
-
-        cipher = Cipher(algorithms.AES(key_data), modes.CBC(bytes.fromhex(json_dict['iv'])), default_backend())
-        decryptor = cipher.decryptor()
-        ciphertext = base64.b64decode(json_dict['ciphertext'])
-        m3u8_uri = b''
-        for i in range(0, len(ciphertext), 16):
-            m3u8_uri += decryptor.update(ciphertext[i: i + 16])
-
-        unpadder = padding.PKCS7(128).unpadder()
-        new_url = (unpadder.update(m3u8_uri) + unpadder.finalize()).decode('utf8')
-        str_query = re.search(self.search_query, enc_query_str)
-        if str_query:
-            new_url += str_query.group()
-        return new_url
-
-    @handle_json_except
-    def get_enc_uri2(self, uri):
-    
-        header = {
-            'User-agent': utils.DEFAULT_USER_AGENT,
-            'Referer': self.plugin_obj.unc_tv123_base }
-
-        text = self.get_uri_data(uri, _header=header)
-        if text is None:
-            return
-        json_dict = json.loads(text)
-        return json_dict[0]['file']
diff --git a/plugins/provider_video_123tv/lib/config_callbacks.py b/plugins/provider_video_123tv/lib/config_callbacks.py
deleted file mode 100755
index 78344ce..0000000
--- a/plugins/provider_video_123tv/lib/config_callbacks.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the “Software”), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-from lib.plugins.plugin_handler import PluginHandler
-
-def license_confirmation(_config_obj, _section, _key):
-    if _config_obj.data[_section][_key] == 'ALL':
-        return 'Make sure the EPG default instances used by 123TV are enabled<script>confirm_r = confirm("Licensing for these EPG plugins are for personal use only.  Change to None if Cabernet is being used for non-personal use");</script>'
-    else:
-        return 'EPG plugin usage has been disabled'
-
diff --git a/plugins/provider_video_123tv/lib/epg.py b/plugins/provider_video_123tv/lib/epg.py
deleted file mode 100755
index a2e33aa..0000000
--- a/plugins/provider_video_123tv/lib/epg.py
+++ /dev/null
@@ -1,301 +0,0 @@
-# pylama:ignore=E722
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-import json
-import re
-import time
-import urllib.request
-
-import lib.common.exceptions as exceptions
-import lib.common.utils as utils
-from lib.common.decorators import handle_url_except
-from lib.common.decorators import handle_json_except
-from lib.db.db_epg_programs import DBEpgPrograms
-from lib.db.db_channels import DBChannels
-from lib.plugins.plugin_epg import PluginEPG
-from .translations import tv_genres
-
-
-class EPG(PluginEPG):
-
-    def __init__(self, _instance_obj):
-        super().__init__(_instance_obj)
-        self.db_programs = DBEpgPrograms(self.config_obj.data)
-        self.db_channels = DBChannels(self.config_obj.data)
-        self.provider_channel_epg_dict = {}
-        self.current_time = datetime.datetime.now(datetime.timezone.utc)
-
-    def dates_to_pull(self):
-        """
-        123tv provides upto 3 days of EPG.  Each channel is different.
-        """
-        return [0,1,2], []
-
-    def refresh_programs(self, _epg_day, use_cache=True):
-        self.current_time = datetime.datetime.now(datetime.timezone.utc)
-        midnight = self.current_time.replace(hour=0, minute=0, second=0, microsecond=0)
-        start_time = midnight + datetime.timedelta(days=_epg_day)
-        start_seconds = int(start_time.timestamp())
-        start_date = start_time.date()
-
-        program_list = []
-        program_list = self.get_fullday_programs(program_list, start_seconds)
-        if program_list:
-            self.db.save_program_list(self.plugin_obj.name, self.instance_key, start_date, program_list)
-            self.logger.debug('Refreshed EPG data for {}:{} day {}'
-                .format(self.plugin_obj.name, self.instance_key, start_date))
-        program_list = None
-        return
-
-    def get_fullday_programs(self, _program_list, _start_seconds):
-        """
-        Returns a days (from midnight to midnight UTC) of programs for all channels
-        enabled.  Also adds epg data for any channel with no epg data.
-        Will return the original _program_list passed in if no epg data was found
-        """
-        epg_list = {}
-        missing_ch_list = []
-        prog_ids = {}
-        is_data_found = False
-        current_time_sec = self.current_time.timestamp()
-        channel_list = self.db_channels.get_channels(self.plugin_obj.name, self.instance_key)
-        for ch in channel_list.values():
-            ch_id = ch[0]['uid']
-            ch_name = ch[0]['display_name']
-            epg_id = ch[0]['json']['epg_id']
-            if not ch[0]['enabled']:
-                # skip if channel is disabled
-                continue
-            if epg_id is None:
-                # if no epg is found from 123tv, add to missing epg list
-                missing_ch_list.append(ch_id)
-                continue
-
-            # maintain memory cache of channel list for faster processing
-            if epg_id not in self.provider_channel_epg_dict:
-                # get provider epg data and cache it.
-                provider_ch_epg = self.get_uri_data(self.plugin_obj.unc_tv123_base 
-                    + self.plugin_obj.unc_tv123_ch_epg.format(epg_id))
-                self.provider_channel_epg_dict[epg_id] = provider_ch_epg
-            else:
-                provider_ch_epg = self.provider_channel_epg_dict[epg_id]
-            epg_day = provider_ch_epg['items'].get(str(_start_seconds))
-            if epg_day is None:
-                # no data available for day requested
-                if is_data_found:
-                    # epg for this day has been found for other channels, so 
-                    # add to missing channel list
-                    missing_ch_list.append(ch_id)
-                continue
-
-            self.logger.debug('{}:{} Processing EPG for Channel {}'
-                .format(self.plugin_obj.name, self.instance_key, ch[0]['display_name']))
-
-            # are there any programs that are current or in the future?
-            # if none are, then add to missing list
-            is_new_data = False
-            for prog in epg_day:
-                if prog['end_timestamp'] > current_time_sec:
-                    is_new_data = True
-                    break
-            if not is_new_data:
-                missing_ch_list.append(ch_id)
-                continue
-
-            is_data_found = True
-            # create the list of events to add to the epg for the day
-            for prog in epg_day:
-                start_time = utils.tm_local_parse(prog['start_timestamp'] * 1000)
-                key = (ch_id, start_time)
-                if key not in epg_list.keys():
-                    epg_list[key] = {
-                        'id': prog['id'],
-                        'channelId': ch_id,
-                        'start': prog['start_timestamp'],
-                        'end': prog['end_timestamp']
-                        }
-                    prog_ids[prog['id']] = None
-
-        self.logger.info('{}:{} Processing {} Programs for day' \
-                .format(self.plugin_obj.name, self.instance_key, len(prog_ids.keys())))
-        for listing_data in epg_list.values():
-            program_json = None
-            ch_data = channel_list[str(listing_data['channelId'])][0]
-            program_json = self.get_program(ch_data,
-                    listing_data)
-            if program_json is not None:
-                _program_list.append(program_json)
-
-        # add default epg for all channels having no epg data
-        if _program_list:
-            for ch_id in missing_ch_list:
-                ch_data = channel_list[ch_id][0]
-                program_json = self.get_missing_program(ch_data,
-                        ch_id, _start_seconds)
-                if program_json is not None:
-                    _program_list.extend(program_json)
-
-        return _program_list
-
-    def get_missing_program(self, _ch_data, _ch_id, _start_seconds):
-        """
-        For a channel, will create a set of program events 1 hour apart
-        for 24 hours based on the _start_seconds starting point. Most of the 
-        event data are defaults.
-        """
-        if not _ch_data['enabled']:
-            return None
-        self.logger.debug('{}:{} Adding minimal EPG data for channel {}'
-            .format(self.plugin_obj.name, self.instance_key, _ch_id))
-        event_list = []
-        start_date = datetime.datetime.fromtimestamp(_start_seconds, datetime.timezone.utc)
-        for incr_hr in range(0,24):
-            start_time = start_date + datetime.timedelta(hours=incr_hr)
-            start_fmt = utils.tm_local_parse(start_time.timestamp()*1000)
-            end_time = start_time + datetime.timedelta(hours=1)
-            end_fmt = utils.tm_local_parse(end_time.timestamp()*1000)
-            dur_min = 60
-            event = {'channel': _ch_id, 'progid': None, 'start': start_fmt, 'stop': end_fmt,
-                    'length': dur_min, 'title': _ch_data['display_name'], 'subtitle': None, 'entity_type': None,
-                    'desc': 'Unavailable', 'short_desc': 'Unavailable',
-                    'video_quality': None, 'cc': None, 'live': None, 'finale': None,
-                    'premiere': None, 'air_date': None, 'formatted_date': None, 'icon': None,
-                    'rating': None, 'is_new': None, 'genres': None, 
-                    'directors': None, 'actors': None,
-                    'season': None, 'episode': None, 'se_common': None, 'se_xmltv_ns': None,
-                    'se_progid': None
-                    }
-            event_list.append(event)
-        return event_list
-
-    def get_program(self, _ch_data, _event_data):
-        """
-        Takes a single channel data with the program event and 
-        returns a json program event object
-        Assumes the prog_id data is already present in the
-        epg program database
-        """
-        if not _ch_data['enabled']:
-            return None
-        prog_id = _event_data['id']
-        if self.config_obj.data[self.plugin_obj.namespace.lower()]['epg-plugin'] == 'ALL':
-            prog_details = self.plugin_obj.plugins['TVGuide'].plugin_obj \
-                    .get_program_info_ext(prog_id)
-        else:
-            return None
-        if len(prog_details) == 0:
-            self.logger.warning('Program error: EPG program details missing {} {}' \
-                .format(self.plugin_obj.name, prog_id))
-            return None
-
-        prog_details = json.loads(prog_details[0]['json'])
-
-        start_time = utils.tm_local_parse(
-            (_event_data['start']
-            + self.config_obj.data[self.config_section]['epg-start_adjustment'])
-            * 1000)
-        end_time = utils.tm_local_parse(
-            (_event_data['end']
-            + self.config_obj.data[self.config_section]['epg-end_adjustment'])
-            * 1000)
-        dur_min = int((_event_data['end'] - _event_data['start']) / 60)
-        if not prog_details['date']:
-            if prog_details['year']:
-                air_date = str(prog_details['year'])
-                formatted_date = str(air_date)
-            else:
-                air_date = None
-                formatted_date = None
-        else:
-            air_date_msec = int(prog_details['date'])
-            air_date = utils.date_parse(air_date_msec, '%Y%m%d')
-            formatted_date = utils.date_parse(air_date_msec, '%Y/%m/%d')
-
-        sid = str(_event_data['channelId'])
-        title = prog_details['title']
-        entity_type = prog_details['type']
-
-        if prog_details['desc']:
-            description = prog_details['desc']
-        else:
-            description = 'Unavailable'
-        if prog_details['short_desc']:
-            short_desc = prog_details['short_desc']
-        else:
-            short_desc = description
-
-        if prog_details['episode']:
-            episode = prog_details['episode'] + self.episode_adj
-        else:
-            episode = None
-        season = prog_details['season']
-
-        if (season is None) and (episode is None):
-            se_common = None
-            se_xmltv_ns = None
-            se_prog_id = None
-        elif (season is not None) and (episode is not None):
-            se_common = 'S%02dE%02d' % (season, episode)
-            se_xmltv_ns = ''.join([str(season - 1), '.', str(episode - 1), '.0/1'])
-            se_prog_id = None
-        elif (season is None) and (episode is not None):
-            se_common = None
-            se_xmltv_ns = None
-            se_prog_id = None
-        else:  # (season is not None) and (episode is None):
-            se_common = 'S%02dE%02d' % (season, 0)
-            se_xmltv_ns = ''.join([str(season - 1), '.', '0', '.0/1'])
-            se_prog_id = None
-
-        if prog_details['subtitle']:
-            if season and episode:
-                subtitle = 'S%02dE%02d ' % (season, episode)
-            elif episode:
-                subtitle = 'E%02d ' % (episode)
-            else:
-                subtitle = ''
-            subtitle += prog_details['subtitle']
-        else:
-            subtitle = None
-
-        rating = prog_details['rating']
-        
-        video_quality = None
-        cc = False
-        live = None
-        is_new = None
-        finale = None
-        premiere = None
-
-        icon = prog_details['image']
-        genres = prog_details['genres']
-        directors = None
-        actors = None
-
-        json_result = {'channel': sid, 'progid': prog_id, 'start': start_time, 'stop': end_time,
-            'length': dur_min, 'title': title, 'subtitle': subtitle, 'entity_type': entity_type,
-            'desc': description, 'short_desc': short_desc,
-            'video_quality': video_quality, 'cc': cc, 'live': live, 'finale': finale,
-            'premiere': premiere,
-            'air_date': air_date, 'formatted_date': formatted_date, 'icon': icon,
-            'rating': rating, 'is_new': is_new, 'genres': genres, 'directors': directors, 'actors': actors,
-            'season': season, 'episode': episode, 'se_common': se_common, 'se_xmltv_ns': se_xmltv_ns,
-            'se_progid': se_prog_id}
-        return json_result
diff --git a/plugins/provider_video_123tv/lib/translations.py b/plugins/provider_video_123tv/lib/translations.py
deleted file mode 100755
index 815be29..0000000
--- a/plugins/provider_video_123tv/lib/translations.py
+++ /dev/null
@@ -1,54 +0,0 @@
-# pylama:ignore=E203,E221
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-from lib.tvheadend.epg_category import groups
-from lib.tvheadend.epg_category import tvh_genres
-
-tv123_base = 'gfpMXf5BjIHL56lMzYSEgst7'
-tv123_additional_channels = 'jRzGjbdoyb7FjNdoyb7FjbdAkseFXx3G'
-tv123_wp_more_ch_cmd = 'sK9I5RpNsNLQkbp1ybUItrUNgbp7yRl1t8iQyrU6gxdFyZrE'
-tv123_stream_channel = 'jRz3zxl+jRPU'
-tv123_referer = 'gfpMXf5BjIU8tsnF542KzfkFyx7NtqH='
-tv123_ch_epg = 'jNrGtIUAXNUFjRPUjZ/KyNJ='
-tv123_agpigee_referer = 'gfpMXf5BjIU8yNU8yxhFkNUP'
-tv123_prog_details = 'gfpMXf5BjIU6ybXPXfiQtwS3Xx78tbhFyZrMjRkLjR33XxoQzftKkN37tfrEts5Qzft8zb7otqUGXZU8XZdPtxrMkb7EXIUT1qURtb2='
-tv123_image = 'gfpMXf5BjIURzRXFzft8zb7otqS6yNMQkqU/ybXQkNdMkbLQtG=='
-
-
-tv_genres = {
-    "Action & Adventure": [ tvh_genres['THRILLER'] ],
-    "Comedy": [ tvh_genres['COMEDY'] ],
-    "Documentary": [ tvh_genres['DOCUMENTARY'] ],
-    "Drama": [ tvh_genres['MOVIE'] ],
-    "Family": [ tvh_genres['KIDS_6_14'] ],
-    "Fantasy": [ tvh_genres['SF'] ],
-    "Game Show": [ tvh_genres['GAME'] ],
-    "Horror": [ tvh_genres['SF'] ],
-    "Music": [ tvh_genres['MUSIC'] ],
-    "Business": [ tvh_genres['NEWS'] ],
-    "Other": None,
-    "Pro Sports": [ tvh_genres['SPORT'] ],
-    "Reality": [ tvh_genres['GAME'] ],
-    "Science": [ tvh_genres['SCIENCE'] ],
-    "Science Fiction": [ tvh_genres['SF'] ],
-    "Suspense": [ tvh_genres['THRILLER'] ],
-    "Talk & Interview": [ tvh_genres['TALK_SHOW'] ],
-    "Travel" : [ tvh_genres['TRAVEL'] ]
-    
- }
\ No newline at end of file
diff --git a/plugins/provider_video_123tv/lib/tv123.py b/plugins/provider_video_123tv/lib/tv123.py
deleted file mode 100755
index ae10c08..0000000
--- a/plugins/provider_video_123tv/lib/tv123.py
+++ /dev/null
@@ -1,163 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-import random
-import time
-import urllib.request
-
-import lib.common.exceptions as exceptions
-from lib.plugins.plugin_obj import PluginObj
-
-from .tv123_instance import TV123Instance
-from ..lib import translations
-
-
-class TV123(PluginObj):
-
-    def __init__(self, _plugin, _plugins):
-        super().__init__(_plugin)
-
-        self.plugins = _plugins
-
-        if self.config_obj.data[self.namespace.lower()]['epg-plugin'] == 'ALL':
-            self.enable_instance('TVGuide', 'default')
-        for inst in _plugin.instances:
-            self.instances[inst] = TV123Instance(self, inst)
-        self.unc_tv123_base = self.uncompress(translations.tv123_base)
-        self.unc_tv123_additional_channels = self.uncompress(translations.tv123_additional_channels)
-        self.unc_tv123_wp_more_ch_cmd = self.uncompress(translations.tv123_wp_more_ch_cmd)
-        self.unc_tv123_stream_channel = self.uncompress(translations.tv123_stream_channel)
-        self.unc_tv123_referer = self.uncompress(translations.tv123_referer)
-        self.unc_tv123_ch_epg = self.uncompress(translations.tv123_ch_epg)
-        self.unc_tv123_agpigee_referer = self.uncompress(translations.tv123_agpigee_referer)
-        self.unc_tv123_prog_details = self.uncompress(translations.tv123_prog_details)
-        self.unc_tv123_image = self.uncompress(translations.tv123_image)
-
-            
-    def scan_channels(self, _instance=None):
-        """
-        Called from the scheduler
-        Requests a stream for each of the disabled channels to see if they
-        are up
-        """
-        try:
-            if not self.enabled:
-                self.logger.debug('{} Plugin disabled, not scanning channels' \
-                    .format(self.plugin.name))
-                return False
-            if _instance is None:
-                for key, instance in self.instances.items():
-                    instance.scan_channels()
-            else:
-                self.instances[_instance].scan_channels()
-            return True
-        except exceptions.CabernetException:
-            self.logger.debug('CabernetException channel scan task: Setting plugin {} to disabled'
-                .format(self.plugin.name))
-            self.enabled = False
-            self.plugin.enabled = False
-            return False
-
-    def scheduler_tasks(self):
-        sched_epg_local1_hours = 1
-        sched_epg_local2_hours = 12
-        sched_epg_hours = self.utc_to_local_time(0)
-        sched_epg_mins = random.randint(1,55)
-        sched_epg_local1 = '{:0>2d}:{:0>2d}'.format(sched_epg_local1_hours, sched_epg_mins)
-        sched_epg_local2 = '{:0>2d}:{:0>2d}'.format(sched_epg_local2_hours, sched_epg_mins)
-        sched_epg = '{:0>2d}:{:0>2d}'.format(sched_epg_hours, sched_epg_mins)
-        sched_ch_hours = self.utc_to_local_time(23)
-        sched_ch_mins = random.randint(1,55)
-        sched_ch = '{:0>2d}:{:0>2d}'.format(sched_ch_hours, sched_ch_mins)
-        sched_scan_local_hours = 1
-        sched_scan_mins = random.randint(1,55)
-        sched_scan = '{:0>2d}:{:0>2d}'.format(sched_scan_local_hours, sched_scan_mins)
-        
-        if self.scheduler_db.save_task(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                self.name,
-                None,
-                'refresh_channels',
-                20,
-                'inline',
-                'Pulls channel lineup from {}'.format(self.namespace)
-                ):
-            self.scheduler_db.save_trigger(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                'startup')
-            self.scheduler_db.save_trigger(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                'daily',
-                timeofday=sched_ch
-                )
-        if self.scheduler_db.save_task(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                self.name,
-                None,
-                'refresh_epg',
-                10,
-                'thread',
-                'Pulls channel program data from {}'.format(self.namespace)
-                ):
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                'startup')
-            # update after midnight local time
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                'daily',
-                timeofday=sched_epg
-                )
-            # update after midnight gmt time
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                'daily',
-                timeofday=sched_epg_local1
-                )
-            # update after noon gmt time
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                'daily',
-                timeofday=sched_epg_local2
-                )
-        if self.scheduler_db.save_task(
-                'Unique',
-                'Scan {} Disabled Channels'.format(self.namespace),
-                self.name,
-                None,
-                'scan_channels',
-                5,
-                'thread',
-                'Scans disabled channels to see if they are up'
-                ):
-            self.scheduler_db.save_trigger(
-                'Unique',
-                'Scan {} Disabled Channels'.format(self.namespace),
-                'weekly',
-                dayofweek='Sunday',
-                timeofday=sched_scan
-                )
diff --git a/plugins/provider_video_123tv/lib/tv123_instance.py b/plugins/provider_video_123tv/lib/tv123_instance.py
deleted file mode 100755
index 5c27d05..0000000
--- a/plugins/provider_video_123tv/lib/tv123_instance.py
+++ /dev/null
@@ -1,52 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import logging
-
-import lib.common.utils as utils
-import lib.common.exceptions as exceptions
-from lib.plugins.plugin_instance_obj import PluginInstanceObj
-
-from .channels import Channels
-from .epg import EPG
-
-
-class TV123Instance(PluginInstanceObj):
-
-    def __init__(self, _tv123, _instance):
-        super().__init__(_tv123, _instance)
-        if not self.config_obj.data[_tv123.name.lower()]['enabled']:
-            return
-        if not self.config_obj.data[self.config_section]['enabled']:
-            return
-
-        self.channels = Channels(self)
-        self.epg = EPG(self)
-
-    def scan_channels(self):
-        """
-        Scans the channels that are disabled or untested to see if they should be disabled
-        """
-        self.config_obj.refresh_config_data()
-        if self.channels is not None and \
-                self.config_obj.data[self.config_section]['enabled']:
-            return self.channels.scan_channels()
-        else:
-            self.logger.debug('{}:{} Plugin instance disabled, not scanning Channels' \
-                .format(self.plugin_obj.name, self.instance_key))
-            return False
diff --git a/plugins/provider_video_123tv/plugin.json b/plugins/provider_video_123tv/plugin.json
deleted file mode 100755
index a015f24..0000000
--- a/plugins/provider_video_123tv/plugin.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "id": "provider_video_123tv",
-    "name": "123TV",
-    "version": "0.9.7",
-    "provider-name": "rocky4546",
-    "summary": "Watch TV channels from 123tv.live website.",
-    "description": "Watch Free TV! Stream 123TV TV's channels of news, sports, and the Internet's best, completely free.",
-    "category": ["video"],
-    "license": "MIT License, Copyright (C) 2023 ROCKY4546",
-    "source": "https://github.com/cabernetwork/cabernet",
-    "forum": "https://tvheadend.org/boards/5/topics/43052",
-    "website": "https://123tv.live/",
-    "icon": "resources/images/icon.jpg",
-    "fanart": "resources/images/fanart.png"
-}
diff --git a/plugins/provider_video_123tv/resources/LICENSE b/plugins/provider_video_123tv/resources/LICENSE
deleted file mode 100755
index 73176c5..0000000
--- a/plugins/provider_video_123tv/resources/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-Creative Commons Attribution 4.0 License (CC-BY)
-
-Images for this application are licensed under a Creative Commons Attribution 4.0 License (CC-BY)
-To view a copy of this license, visit https://creativecommons.org/licenses/by/4.0/legalcode
diff --git a/plugins/provider_video_123tv/resources/fanart.png b/plugins/provider_video_123tv/resources/fanart.png
deleted file mode 100755
index ff4ec81..0000000
Binary files a/plugins/provider_video_123tv/resources/fanart.png and /dev/null differ
diff --git a/plugins/provider_video_123tv/resources/icon.jpg b/plugins/provider_video_123tv/resources/icon.jpg
deleted file mode 100755
index a195cda..0000000
Binary files a/plugins/provider_video_123tv/resources/icon.jpg and /dev/null differ
diff --git a/plugins/provider_video_daddylive/__init__.py b/plugins/provider_video_daddylive/__init__.py
deleted file mode 100755
index b74487e..0000000
--- a/plugins/provider_video_daddylive/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import lib.plugins.plugin as plugin
-from .lib.daddylive import DaddyLive
-
-
-# register the init plugin function
-@plugin.register
-def start(_plugin, _plugins):
-    return DaddyLive(_plugin, _plugins)
diff --git a/plugins/provider_video_daddylive/config_defn.json b/plugins/provider_video_daddylive/config_defn.json
deleted file mode 100755
index 3f320a2..0000000
--- a/plugins/provider_video_daddylive/config_defn.json
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-    "streams":{
-        "id": null,
-        "icon": "cast",
-        "label": "Stream Providers",
-        "description": "Streaming Services",
-        "sections":{
-            "daddylive":{
-                "label": "DaddyLive",
-                "sort": "DaddyLive1",
-                "icon": "cast",
-                "description": "Settings for DaddyLive",
-                "settings":{
-                    "enabled":{
-                        "label": "Enabled",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 1,
-                        "help": "Will disable if an error occurs; otherwise set to disable to disable plugin"
-                    },
-                    "player-tuner_count":{
-                        "label": "tuner_count",
-                        "type": "integer",
-                        "default": 10,
-                        "level": 2,
-                        "help": "Number of streams active at one time"
-                    },
-                    "epg-plugin":{
-                        "label": "EPG Plugin to Use",
-                        "type": "list",
-                        "default": "None",
-                        "values": ["None", "ALL"],
-                        "level": 1,
-                        "onChange": ".provider_video_daddylive.lib.config_callbacks.license_confirmation",
-                        "help": "The EPG plugin to use to gather data for personal use"
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/plugins/provider_video_daddylive/instance_defn.json b/plugins/provider_video_daddylive/instance_defn.json
deleted file mode 100755
index 1e44ab1..0000000
--- a/plugins/provider_video_daddylive/instance_defn.json
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-    "streams":{
-        "id": null,
-        "icon": "cast",
-        "label": "Stream Providers",
-        "description": "Streaming Services",
-        "sections":{
-            "daddylive":{
-                "label": "DaddyLive",
-                "sort": "DaddyLive2",
-                "icon": "cast_connected",
-                "description": "Settings for DaddyLive Instances",
-                "settings":{
-                    "enabled":{
-                        "label": "Enabled",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 0,
-                        "help": "Will disable this instance only"
-                    },
-                    "label":{
-                        "label": "Label",
-                        "type": "string",
-                        "default": null,
-                        "level": 0,
-                        "onChange": "lib.config.config_callbacks.update_instance_label",
-                        "help": "Defines the tab name for this instance"
-                    },
-                    "channel-update_timeout":{
-                        "label": "Channel Update Timeout",
-                        "type": "integer",
-                        "default": 23,
-                        "level": 3,
-                        "help": "Channel list must be this old in hours for update to occur when requested"
-                    },
-                    "channel-import_groups":{
-                        "label": "Import Channel Groups",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 1,
-                        "help": "Imports groups from DaddyLive into the group other column"
-                    },
-                    "channel-group_name":{
-                        "label": "Group Name",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "By default, the m3u file contains the plugin as a group.  This allows an instance name to be added to the group list during the m3u request. Use simple single words, if possible. If empty, will not add group."
-                    },
-                    "channel-start_ch_num":{
-                        "label": "Starting Ch Number",
-                        "type": "integer",
-                        "default": 1,
-                        "level": 1,
-                        "onChange": "lib.config.config_callbacks.update_channel_num",
-                        "help": "When channel number is not provided, will use this incrementally."
-                    },
-                    "player-stream_type":{
-                        "label": "stream_type",
-                        "type": "list",
-                        "default": "internalproxy",
-                        "values": ["m3u8redirect", "internalproxy", "streamlinkproxy", "ffmpegproxy"],
-                        "level": 1,
-                        "help": "M3U8 send m3u8 file directly to client.  ffmpeg uses ffmpeg for m3u8 urls. streamlink uses the python module streamlink. internal uses internally coded modules."
-                    },
-                    "player-play_all_segments":{
-                        "label": "Play All (VOD)",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Plays all starting segments and ignores Non-VOD Segments to Start setting. Helpful when the VOD is not set in the provider stream."
-                    },
-                    "player-segments_to_play":{
-                        "label": "Non-VOD Segments to Start",
-                        "type": "integer",
-                        "default": 8,
-                        "level": 2,
-                        "help": "When starting, will play the last xxx segments. '1' means no buffering. Each increase means about 1-4 seconds of buffering. If the VOD flag is set in the stream, then setting is ignored."
-                    },
-                    "player-enable_url_filter":{
-                        "label": "Enable URL Filtering",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Only works with internalproxy. Filters out streams from URL addresses based on regular expression"
-                    },
-                    "player-url_filter":{
-                        "label": "URL Filter",
-                        "type": "string",
-                        "default": null,
-                        "level": 3,
-                        "help": "Only used with stream_type=internalproxy"
-                    },
-                    "player-enable_pts_filter":{
-                        "label": "Enable PTS Filtering",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Works with internalproxy and ffmpegproxy. Filters out corrupted PTS packets.  Requires ffprobe.exe"
-                    },
-                    "player-pts_minimum":{
-                        "label": "pts_minimum",
-                        "type": "integer",
-                        "default": 10000000,
-                        "level": 3,
-                        "help": "Default 10,000,000 or 108 seconds after midnight. Filters out non-standard streams that whose PTS starts at midnight."
-                    },
-                    "player-pts_max_delta":{
-                        "label": "pts_max_delta",
-                        "type": "integer",
-                        "default": 3000000,
-                        "level": 3,
-                        "help": "Default 3,000,000 or 32 seconds. when playing contiguous blocks of video, filters out any blocks that do not have a continuous PTS counter."
-                    },
-                    "player-enable_pts_resync":{
-                        "label": "Enable PTS/DTS Resync",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 2,
-                        "help": "Works with internalproxy and ffmpegproxy. Corrects timing issues with the video and audio streams and makes them contiguous"
-                    },
-                    "player-pts_resync_type":{
-                        "label": "PTS/DTS Resync Type",
-                        "type": "list",
-                        "default": "ffmpeg",
-                        "values": ["ffmpeg", "internal"],
-                        "level": 2,
-                        "help": "Uses either ffmpeg genpts or internal resequencing"
-                    },
-                    "epg-enabled":{
-                        "label": "XMLTV Enabled",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 1,
-                        "help": "If disabled, will not ingest or populate the XMLTV output with this instance"
-                    },
-                    "epg-prefix":{
-                        "label": "EPG Channel Prefix",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "If a number will ADD to the display channel number; otherwise, will prepend to the channel number as a string"
-                    },
-                    "epg-suffix":{
-                        "label": "EPG Channel Suffix",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "Will append to the channel number as a string"
-                    },
-                    "epg-days":{
-                        "label": "EPG days to load",
-                        "type": "list",
-                        "default": "2",
-                        "values": ["2", "6", "8", "10", "12", "14"],
-                        "level": 1,
-                        "help": "Number of days to retrieve from today"
-                    },
-                    "epg-episode_adjustment":{
-                        "label": "Adjusts Episode number",
-                        "type": "list",
-                        "default": 0,
-                        "values": [1000, 2000, 3000, 4000, 5000],
-                        "level": 2,
-                        "help": "Used to record the same episode on two different channels at the same time.  EX: Record the same channel from antenna and DaddyLive at the same time."
-                    },
-                    "epg-start_adjustment":{
-                        "label": "Start Time Adjustment",
-                        "type": "integer",
-                        "default": 0,
-                        "level": 2,
-                        "help": "Used to start each program x seconds after the program is suppose to start."
-                    },
-                    "epg-end_adjustment":{
-                        "label": "End Time Adjustment",
-                        "type": "integer",
-                        "default": 0,
-                        "level": 2,
-                        "help": "Used to start each program x seconds before the program is suppose to end."
-                    },
-                    "epg-min_refresh_rate":{
-                        "label": "EPG Min Refresh Rate",
-                        "type": "integer",
-                        "default": 3600,
-                        "level": 2,
-                        "help": "Default=3600 seconds (1 hour). When a HTTP request for epg data is received, will refresh the data if older than this value."
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/plugins/provider_video_daddylive/lib/channels.py b/plugins/provider_video_daddylive/lib/channels.py
deleted file mode 100755
index 6003188..0000000
--- a/plugins/provider_video_daddylive/lib/channels.py
+++ /dev/null
@@ -1,323 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import base64
-import datetime
-import hashlib
-import html
-import importlib
-import json
-import os
-import re
-import socket
-import sys
-import threading
-import time
-import timeit
-import urllib
-from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
-from cryptography.hazmat.primitives import padding
-from cryptography.hazmat.backends import default_backend
-from multiprocessing import Queue, Process
-
-import lib.clients.channels.channels as channels
-from lib.plugins.plugin_channels import PluginChannels
-from lib.db.db_epg_programs import DBEpgPrograms
-from lib.common.decorators import handle_json_except
-from lib.common.decorators import handle_url_except
-import lib.common.exceptions as exceptions
-import lib.common.utils as utils
-from ..lib import daddylive
-
-
-class Channels(PluginChannels):
-
-    def __init__(self, _instance_obj):
-        super().__init__(_instance_obj)
-
-        self.search_url = re.compile(b'iframe src=\"(.*?)\" width')
-        self.search_m3u8 = re.compile(b'source:\'(.*?)\'')
-        self.search_ch = re.compile(r'div class="grid-item">'
-            + '<a href=\"([^\d]+(\d+).php.*?)\" target.*?<strong>(.*?)<\/strong>')
-        self.ch_db_list = None
-
-
-    def get_channels(self):
-        self.ch_db_list = self.db.get_channels(self.plugin_obj.name, self.instance_key)
-        if self.ch_db_list:
-            is_run_scans = False
-        else:
-            is_run_scans = True
-        
-        ch_list = self.get_channel_list()
-        if len(ch_list) == 0:
-            self.logger.warning('DaddyLive channel list is empty from provider, not updating Cabernet')
-            return
-        self.logger.info("{}: Found {} stations on instance {}"
-            .format(self.plugin_obj.name, len(ch_list), self.instance_key))
-        ch_list = sorted(ch_list, key=lambda d: d['name'])
-        ch_num = 1
-        for ch in ch_list:
-            ch['number'] = ch_num
-            ch_num += 1
-        return ch_list
-
-
-    @handle_url_except(timeout=10.0)
-    @handle_json_except
-    def get_channel_ref(self, _channel_id):
-        """
-        gets the referer required to obtain the ts or stream files from server
-        """
-        text = self.get_uri_data(self.plugin_obj.unc_daddylive_base + \
-            self.plugin_obj.unc_daddylive_stream.format(_channel_id))
-        m = re.search(self.search_url, text)
-        if not m:
-            #unable to obtain the url, abort
-            self.logger.info('{}: {} Unable to obtain url, aborting'
-                .format(self.plugin_obj.name, _channel_id))
-            return
-        return m[1].decode('utf8')
-
-
-    @handle_url_except(timeout=10.0)
-    @handle_json_except
-    def get_channel_uri(self, _channel_id):
-        json_needs_updating = False
-        ch_url = self.get_channel_ref(_channel_id)
-        if not ch_url:
-            return
-
-        header = {
-            'User-agent': utils.DEFAULT_USER_AGENT,
-            'Referer': self.plugin_obj.unc_daddylive_base + self.plugin_obj.unc_daddylive_stream.format(_channel_id) }
-
-        text = self.get_uri_data(ch_url, _header=header)
-        m = re.search(self.search_m3u8, text)
-        if not m:
-            #unable to obtain the url, abort
-            self.logger.notice('{}: {} Unable to obtain m3u8, aborting'
-                .format(self.plugin_obj.name, _channel_id))
-            return
-        stream_url = m[1].decode('utf8')
-        header = {
-            'User-agent': utils.DEFAULT_USER_AGENT,
-            'Referer': ch_url }
-        videoUrlM3u = self.get_m3u8_data(stream_url, _header=header)
-        if not videoUrlM3u:
-            self.logger.notice('{}:{} Unable to obtain m3u file, aborting stream {}'
-                .format(self.plugin_obj.name, self.instance_key, _channel_id))
-            return            
-        self.logger.debug('{}: Found {} Playlist(s)'
-            .format(self.plugin_obj.name, str(len(videoUrlM3u.playlists))))
-
-        ch_dict = self.db.get_channel(_channel_id, self.plugin_obj.name, self.instance_key)
-        ch_json = ch_dict['json']
-        
-        bestStream = None
-        bestResolution = -1
-        if len(videoUrlM3u.playlists) > 0:
-            for videoStream in videoUrlM3u.playlists:
-                if videoStream.stream_info.resolution is not None:
-                    if bestStream is None:
-                        bestStream = videoStream
-                        bestResolution = videoStream.stream_info.resolution[1]
-                    elif ((videoStream.stream_info.resolution[0] > bestStream.stream_info.resolution[0]) and
-                          (videoStream.stream_info.resolution[1] > bestStream.stream_info.resolution[1])):
-                        bestResolution = videoStream.stream_info.resolution[1]
-                        bestStream = videoStream
-                    elif ((videoStream.stream_info.resolution[0] == bestStream.stream_info.resolution[0]) and
-                          (videoStream.stream_info.resolution[1] == bestStream.stream_info.resolution[1]) and
-                          (videoStream.stream_info.bandwidth > bestStream.stream_info.bandwidth)):
-                        bestResolution = videoStream.stream_info.resolution[1]
-                        bestStream = videoStream
-
-            if bestStream is not None:
-                if bestResolution >= 720 and ch_json['HD'] == 0:
-                    ch_json['HD'] = 1
-                    json_needs_updating = True
-                elif bestResolution < 720 and ch_json['HD'] == 1:
-                    ch_json['HD'] = 0
-                    json_needs_updating = True
-                
-                self.logger.notice('{}: {} will use {}x{} resolution at {}bps' \
-                    .format(self.plugin_obj.name, _channel_id, str(bestStream.stream_info.resolution[0]), \
-                    str(bestStream.stream_info.resolution[1]), str(bestStream.stream_info.bandwidth)))
-                m3u8_uri = bestStream.absolute_uri
-            else:
-                m3u8_uri = None
-        else:
-            self.logger.debug('{}: {} No variant streams found for this station.  Assuming single stream only.'
-                .format(self.plugin_obj.name, _channel_id))
-            m3u8_uri = stream_url
-
-        if json_needs_updating:
-            self.db.update_channel_json(ch_json, self.plugin_obj.name, self.instance_key)
-        return m3u8_uri
-
-    def get_channel_list(self):
-        ch_list = []
-        results = []
-
-        # first get the list of channels to get from the epg plugin
-        tvg_list = self.get_TVG_reference()
-        epg_plugins = {u['plugin']: u for u in tvg_list}.keys()
-        for plugin in epg_plugins:
-            zones = {u['zone']: u for u in tvg_list if u['plugin'] == plugin}.keys()
-            for zone in zones:
-                ch_ids = [n['id'] for n in tvg_list if n['zone'] == zone]
-                chs = self.plugin_obj.plugins[plugin].plugin_obj \
-                    .get_channel_list_ext(zone, ch_ids)
-                if chs is None:
-                    return
-                ch_list.extend(chs)
-
-        # Get the list of channels daddylive provides by channel name
-        uri = self.plugin_obj.unc_daddylive_base + self.plugin_obj.unc_daddylive_channels
-        text = self.get_uri_data(_uri=uri).decode()
-        if text is None:
-            return
-        text = text.replace('\n',' ')
-        match_list = re.findall(self.search_ch, text)
-        # url, id, name
-        for m in match_list:
-            if len(m) != 3:
-                self.logger.warning('get_channel_list - DaddyLive channel extraction failed. Extraction procedure needs updating')
-                return None
-            uid = m[1]
-            name = html.unescape(m[2])
-            if name.lower().startswith('the '):
-                name = name[4:]
-            ch = [d for d in tvg_list if d['name'] == name]
-            if len(ch):
-                tvg_id = ch[0]['id']
-                ch = [d for d in ch_list if d['id'] == tvg_id]
-                
-                if len(ch):
-                    ch = ch[0]
-                    ch_db_data = self.ch_db_list.get(uid)
-                    if ch_db_data is not None:
-                        ch['enabled'] = ch_db_data[0]['enabled']
-                        ch['id'] = ch_db_data[0]['uid']
-                        ch['name'] = ch_db_data[0]['display_name']
-                        ch['HD'] = ch_db_data[0]['json']['HD']
-                        if ch_db_data[0]['thumbnail'] == ch['thumbnail']:
-                            thumb = ch_db_data[0]['thumbnail']
-                            thumb_size = ch_db_data[0]['thumbnail_size']
-                        else:
-                            thumb = ch['thumbnail']
-                            thumb_size = self.get_thumbnail_size(thumb, uid)
-                        ch['thumbnail'] = thumb
-                        ch['thumbnail_size'] = thumb_size
-                        ch['ref_url'] = ch_db_data[0]['json']['ref_url']
-                        ch['Header'] = ch_db_data[0]['json']['Header']
-                        ch['use_date_on_m3u8_key'] = False
-                    else:
-                        ch['id'] = uid
-                        ch['name'] = name
-                        ch['thumbnail_size'] = self.get_thumbnail_size(ch['thumbnail'], uid)
-
-                        ref_url = self.get_channel_ref(uid)
-                        if not ref_url:
-                            self.logger.notice('{} BAD CHANNEL found {}:{}'
-                                .format(self.plugin_obj.name, _channel_id,  name))
-                            header = None
-                        else:
-                            header = { 'User-agent': utils.DEFAULT_USER_AGENT,
-                                'Referer': ref_url }
-                        ch['Header'] = header
-                        ch['ref_url'] = ref_url
-                        ch['use_date_on_m3u8_key'] = False
-                        self.logger.debug('{} 1 Added Channel {}:{}'.format(self.plugin_obj.name, uid, name))
-                    results.append(ch)
-                    ch['found'] = True
-                    continue
-
-            url = m[0]
-            ch_db_data = self.ch_db_list.get(uid)
-            if ch_db_data is not None:
-                enabled = ch_db_data[0]['enabled']
-                hd = ch_db_data[0]['json']['HD']
-                thumb = ch_db_data[0]['thumbnail']
-                thumb_size = ch_db_data[0]['thumbnail_size']
-                ref_url = ch_db_data[0]['json'].get('ref_url')
-            else:
-                self.logger.debug('{} 2 Added Channel {}:{}'.format(self.plugin_obj.name, uid, name))
-                enabled = True
-                hd = 0
-                thumb = None
-                thumb_size = None
-                epg_id = None
-                ref_url = self.get_channel_ref(uid)
-
-            if not ref_url:
-                self.logger.notice('{} BAD CHANNEL found {}:{}'
-                    .format(self.plugin_obj.name, uid,  name))
-                header = None
-            else:
-                header = { 'User-agent': utils.DEFAULT_USER_AGENT,
-                    'Referer': ref_url }
-            
-            channel = {
-                'id': uid,
-                'enabled': enabled,
-                'callsign': uid,
-                'number': 0,
-                'name': name,
-                'HD': hd,
-                'group_hdtv': None,
-                'group_sdtv': None,
-                'groups_other': None,
-                'thumbnail': thumb,
-                'thumbnail_size': thumb_size,
-                'VOD': False,
-                'Header': header,
-                'ref_url': ref_url,
-                'use_date_on_m3u8_key' : False,
-            }
-            results.append(channel)
-
-        found_tvg_list = [u for u in ch_list if u.get('found') is None]
-        for ch in found_tvg_list:
-            self.logger.warning('{} Channel {} {} from channel_list.json not found on providers site'.format(self.plugin_obj.name, ch['id'], ch['name']))
-        found_tvg_list = [u for u in ch_list if u.get('found') is not None]
-        for ch in found_tvg_list:
-            del ch['found']
-
-        return results
-
-
-    def get_TVG_reference(self):
-        """
-        Returns a list of channels with zone and channel id info
-        This is sorted so we can get all channels from each zone together
-        """
-        if self.config_obj.data[self.plugin_obj.name.lower()]['epg-plugin'] == 'ALL':
-            ch_list = json.loads(importlib.resources.read_text(package=daddylive.RESOURCE_PATH, resource='channel_list.json'))
-            ch_list = sorted(ch_list, key=lambda d: d['zone'])
-            return ch_list
-        else:
-            return []
-
-
-    def get_TVG_ch_id(self, _ch_name):
-        """
-        Returns an empty array if not found or the item as a array of dict
-        """
-        return [details for details in self.tvg_list if details['name'] == _ch_name]
-        
diff --git a/plugins/provider_video_daddylive/lib/config_callbacks.py b/plugins/provider_video_daddylive/lib/config_callbacks.py
deleted file mode 100644
index 55f3751..0000000
--- a/plugins/provider_video_daddylive/lib/config_callbacks.py
+++ /dev/null
@@ -1,25 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the “Software”), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-from lib.plugins.plugin_handler import PluginHandler
-
-def license_confirmation(_config_obj, _section, _key):
-    if _config_obj.data[_section][_key] == 'ALL':
-        return 'Make sure the EPG default instances used by DaddyLive are enabled<script>confirm_r = confirm("Licensing for these EPG plugins are for personal use only.  Change to None if Cabernet is being used for non-personal use");</script>'
-    else:
-        return 'EPG plugin usage has been disabled'
-
diff --git a/plugins/provider_video_daddylive/lib/daddylive.py b/plugins/provider_video_daddylive/lib/daddylive.py
deleted file mode 100755
index 86c46e6..0000000
--- a/plugins/provider_video_daddylive/lib/daddylive.py
+++ /dev/null
@@ -1,119 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-import random
-import time
-import urllib.request
-
-import lib.common.exceptions as exceptions
-from lib.plugins.plugin_obj import PluginObj
-
-from .daddylive_instance import DaddyLiveInstance
-from ..lib import translations
-
-RESOURCE_PATH = 'plugins.provider_video_daddylive.resources'
-
-class DaddyLive(PluginObj):
-
-    def __init__(self, _plugin, _plugins):
-        super().__init__(_plugin)
-        self.plugins = _plugins
-        if self.config_obj.data[self.namespace.lower()]['epg-plugin'] == 'ALL':
-            self.enable_instance('TVGuide', 'default')
-        for inst in _plugin.instances:
-            self.instances[inst] = DaddyLiveInstance(self, inst)
-        self.unc_daddylive_base = self.uncompress(translations.daddylive_base)
-        self.unc_daddylive_channels = self.uncompress(translations.daddylive_channels)
-        self.unc_daddylive_stream = self.uncompress(translations.daddylive_stream)
-
-
-    def scan_channels(self, _instance=None):
-        """
-        Called from the scheduler
-        Requests a stream for each of the disabled channels to see if they
-        are up
-        """
-        try:
-            if not self.enabled:
-                self.logger.debug('{} Plugin disabled, not scanning channels' \
-                    .format(self.plugin.name))
-                return
-            if _instance is None:
-                for key, instance in self.instances.items():
-                    instance.scan_channels()
-            else:
-                self.instances[_instance].scan_channels()
-        except exceptions.CabernetException:
-            self.logger.debug('CabernetException channel scan task: Setting plugin {} to disabled'
-                .format(self.plugin.name))
-            self.enabled = False
-            self.plugin.enabled = False
-
-    def scheduler_tasks(self):
-        sched_epg_hours = 6
-        sched_epg_mins = random.randint(1,55)
-        sched_epg = '{:0>2d}:{:0>2d}'.format(sched_epg_hours, sched_epg_mins)
-        sched_ch_hours = self.utc_to_local_time(23)
-        sched_ch_mins = random.randint(1,55)
-        sched_ch = '{:0>2d}:{:0>2d}'.format(sched_ch_hours, sched_ch_mins)
-        sched_scan_local_hours = 1
-        sched_scan_mins = random.randint(1,55)
-        sched_scan = '{:0>2d}:{:0>2d}'.format(sched_scan_local_hours, sched_scan_mins)
-        
-        if self.scheduler_db.save_task(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                self.name,
-                None,
-                'refresh_channels',
-                20,
-                'inline',
-                'Pulls channel lineup from {}'.format(self.namespace)
-                ):
-            self.scheduler_db.save_trigger(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                'startup')
-            self.scheduler_db.save_trigger(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                'daily',
-                timeofday=sched_ch
-                )
-        if self.scheduler_db.save_task(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                self.name,
-                None,
-                'refresh_epg',
-                10,
-                'thread',
-                'Pulls channel program data from {}'.format(self.namespace)
-                ):
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                'startup')
-            # update after midnight local time
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                'daily',
-                timeofday=sched_epg
-                )
diff --git a/plugins/provider_video_daddylive/lib/daddylive_instance.py b/plugins/provider_video_daddylive/lib/daddylive_instance.py
deleted file mode 100755
index dbc9154..0000000
--- a/plugins/provider_video_daddylive/lib/daddylive_instance.py
+++ /dev/null
@@ -1,51 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import logging
-
-import lib.common.utils as utils
-import lib.common.exceptions as exceptions
-from lib.plugins.plugin_instance_obj import PluginInstanceObj
-
-from .channels import Channels
-from .epg import EPG
-
-
-class DaddyLiveInstance(PluginInstanceObj):
-
-    def __init__(self, _daddylive, _instance):
-        super().__init__(_daddylive, _instance)
-        if not self.config_obj.data[_daddylive.name.lower()]['enabled']:
-            return
-        if not self.config_obj.data[self.config_section]['enabled']:
-            return
-
-        self.channels = Channels(self)
-        self.epg = EPG(self)
-
-    def scan_channels(self):
-        """
-        Scans the channels that are disabled or untested to see if they should be disabled
-        """
-        self.config_obj.refresh_config_data()
-        if self.channels is not None and \
-                self.config_obj.data[self.config_section]['enabled']:
-            self.channels.scan_channels()
-        else:
-            self.logger.debug('{}:{} Plugin instance disabled, not scanning Channels' \
-                .format(self.plugin_obj.name, self.instance_key))
diff --git a/plugins/provider_video_daddylive/lib/epg.py b/plugins/provider_video_daddylive/lib/epg.py
deleted file mode 100755
index 0b0c33c..0000000
--- a/plugins/provider_video_daddylive/lib/epg.py
+++ /dev/null
@@ -1,419 +0,0 @@
-# pylama:ignore=E722
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-import json
-import re
-import time
-import urllib.request
-
-import lib.common.exceptions as exceptions
-import lib.common.utils as utils
-from lib.common.decorators import handle_url_except
-from lib.common.decorators import handle_json_except
-from lib.db.db_epg_programs import DBEpgPrograms
-from lib.db.db_channels import DBChannels
-from lib.plugins.plugin_epg import PluginEPG
-
-
-class EPG(PluginEPG):
-
-    def __init__(self, _instance_obj):
-        super().__init__(_instance_obj)
-        self.db_programs = DBEpgPrograms(self.config_obj.data)
-        self.db_channels = DBChannels(self.config_obj.data)
-        self.provider_channel_epg_dict = {}
-        self.current_time = datetime.datetime.now(datetime.timezone.utc)
-        self.last_day_to_refresh = self.config_obj.data[self.config_section]['epg-days'] - 1
-
-    def dates_to_pull(self):
-        """
-        daddylive provides upto 3 days of EPG.  Each channel is different.
-        return (forced date, aging dates)
-        For now request all days to be forced
-        """
-        return list(range(0, self.config_obj.data[self.config_section]['epg-days'])), []
-
-    def refresh_programs(self, _epg_day, use_cache=True):
-        """
-        if use_cache is true, then use cached data in the database for those days
-        EPG plugin should detrmine how to use cache...
-        """
-        self.current_time = datetime.datetime.now(datetime.timezone.utc)
-        self.midnight = self.current_time.replace(hour=0, minute=0, second=0, microsecond=0)
-        start_time = self.midnight + datetime.timedelta(days=_epg_day)
-        start_seconds = int(start_time.timestamp())
-        start_date = start_time.date()
-
-        program_list = self.get_fullday_programs(_epg_day)
-        if program_list:
-            self.db.save_program_list(self.plugin_obj.name, self.instance_key, start_date, program_list)
-            self.logger.debug('Refreshed EPG data for {}:{} day {}'
-                .format(self.plugin_obj.name, self.instance_key, start_date))
-        program_list = None
-
-    def get_fullday_programs(self, _epg_day):
-        """
-        Returns a days (from midnight to midnight UTC) of programs for all channels
-        enabled.  Also adds epg data for any channel with no epg data.
-        """
-        epg_list = {}
-        missing_ch_list = []
-        program_list = []
-        prog_ids = {}
-        is_data_found = False
-
-        start_time = self.midnight + datetime.timedelta(days=_epg_day)
-        start_seconds = int(start_time.timestamp())
-        start_date = start_time.date()
-
-        current_time_sec = self.current_time.timestamp()
-        channel_list = self.db_channels.get_channels(self.plugin_obj.name, self.instance_key)
-
-        for ch in channel_list.values():
-            ch = ch[0]
-            ch_id = ch['uid']
-            ch_name = ch['display_name']
-            epg_id = ch['json'].get('epg_id')
-            if self.config_obj.data[self.plugin_obj.name.lower()]['epg-plugin'] == 'None':
-                # make sure if the epg plugin is not set, then skip it
-                epg_id = None
-            if not ch['enabled']:
-                # skip if channel is disabled
-                continue
-            if epg_id is None:
-                # daddylive has no epg, so if epg_id is not listed, then 
-                # add to missing list
-                missing_ch_list.append(ch_id)
-                continue
-
-            # at this point, the epg points to a plugin to obtain the data
-            ch_sched = self.plugin_obj.plugins[ch['json']['plugin']].plugin_obj \
-                    .get_channel_day_ext(epg_id[0], epg_id[1], start_seconds)
-            if ch_sched is None:
-                # Either no data for the days requested or an error from the provider
-                missing_ch_list.append(ch_id)
-                continue
-
-            for prog in ch_sched:
-                program_json = self.gen_program(ch, prog)
-                if program_json is not None:
-                    program_list.append(program_json)
-
-        # if program_list for the day has data, also fill in for missing channels
-        if program_list:
-            for ch_id in missing_ch_list:
-                ch_data = channel_list[ch_id][0]
-                program_json = self.get_missing_program(ch_data,
-                        ch_id, start_seconds)
-                if program_json is not None:
-                    program_list.extend(program_json)
-        return program_list
-
-
-        for i in range(0,10):
-            # maintain memory cache of channel list for faster processing
-            if epg_id not in self.provider_channel_epg_dict:
-                # get provider epg data and cache it.
-                provider_ch_epg = self.get_uri_data(self.plugin_obj.unc_daddylive_base 
-                    + self.plugin_obj.unc_daddylive_ch_epg.format(epg_id))
-                self.provider_channel_epg_dict[epg_id] = provider_ch_epg
-            else:
-                provider_ch_epg = self.provider_channel_epg_dict[epg_id]
-            epg_day = provider_ch_epg['items'].get(str(_start_seconds))
-            if epg_day is None:
-                # no data available for day requested
-                if is_data_found:
-                    # epg for this day has been found for other channels, so 
-                    # add to missing channel list
-                    missing_ch_list.append(ch_id)
-                continue
-
-            self.logger.debug('{}:{} Processing EPG for Channel {}'
-                .format(self.plugin_obj.name, self.instance_key, ch[0]['display_name']))
-
-            # are there any programs that are current or in the future?
-            # if none are, then add to missing list
-            is_new_data = False
-            for prog in epg_day:
-                if prog['end_timestamp'] > current_time_sec:
-                    is_new_data = True
-                    break
-            if not is_new_data:
-                missing_ch_list.append(ch_id)
-                continue
-
-            is_data_found = True
-            # create the list of events to add to the epg for the day
-            for prog in epg_day:
-                start_time = utils.tm_local_parse(prog['start_timestamp'] * 1000)
-                key = (ch_id, start_time)
-                if key not in epg_list.keys():
-                    epg_list[key] = {
-                        'id': prog['id'],
-                        'channelId': ch_id,
-                        'start': prog['start_timestamp'],
-                        'end': prog['end_timestamp']
-                        }
-                    prog_ids[prog['id']] = None
-
-        self.logger.info('{}:{} Processing {} Programs for day' \
-                .format(self.plugin_obj.name, self.instance_key, len(prog_ids.keys())))
-        for prog_id in prog_ids.keys():
-            program = self.db_programs.get_program(self.plugin_obj.name, prog_id)
-            if len(program) == 0:
-                self.update_program_info(prog_id)
-        program = None
-
-        self.logger.debug('{}:{} Finalizing EPG updates for day' \
-            .format(self.plugin_obj.name, self.instance_key))
-        for listing_data in epg_list.values():
-            program_json = None
-            ch_data = channel_list[str(listing_data['channelId'])][0]
-            program_json = self.get_program(ch_data,
-                    listing_data)
-            if program_json is not None:
-                program_list.append(program_json)
-
-        # add default epg for all channels having no epg data
-        if program_list:
-            for ch_id in missing_ch_list:
-                ch_data = channel_list[ch_id][0]
-                program_json = self.get_missing_program(ch_data,
-                        ch_id, _start_seconds)
-                if program_json is not None:
-                    program_list.extend(program_json)
-
-        return program_list
-
-    def get_missing_program(self, _ch_data, _ch_id, _start_seconds):
-        """
-        For a channel, will create a set of program events 1 hour apart
-        for 24 hours based on the _start_seconds starting point. Most of the 
-        event data are defaults.
-        """
-        if not _ch_data['enabled']:
-            return None
-        self.logger.debug('{}:{} Adding minimal EPG data for channel {}'
-            .format(self.plugin_obj.name, self.instance_key, _ch_id))
-        event_list = []
-        start_date = datetime.datetime.fromtimestamp(_start_seconds, datetime.timezone.utc)
-        for incr_hr in range(0,24):
-            start_time = start_date + datetime.timedelta(hours=incr_hr)
-            start_fmt = utils.tm_local_parse(start_time.timestamp()*1000)
-            end_time = start_time + datetime.timedelta(hours=1)
-            end_fmt = utils.tm_local_parse(end_time.timestamp()*1000)
-            dur_min = 60
-            event = {'channel': _ch_id, 'progid': None, 'start': start_fmt, 'stop': end_fmt,
-                    'length': dur_min, 'title': _ch_data['display_name'], 'subtitle': None, 'entity_type': None,
-                    'desc': 'Unavailable', 'short_desc': 'Unavailable',
-                    'video_quality': None, 'cc': None, 'live': None, 'finale': None,
-                    'premiere': None, 'air_date': None, 'formatted_date': None, 'icon': None,
-                    'rating': None, 'is_new': None, 'genres': None, 
-                    'directors': None, 'actors': None,
-                    'season': None, 'episode': None, 'se_common': None, 'se_xmltv_ns': None,
-                    'se_progid': None
-                    }
-            event_list.append(event)
-        return event_list
-
-    def gen_program(self, _ch_data, _event_data):
-        """
-        Takes a single channel data with the program event and 
-        returns a json program event object
-        """
-        if not _ch_data['enabled']:
-            return None
-        prog_id = _event_data['id']
-        
-        
-        prog_details = self.plugin_obj.plugins[_ch_data['json']['plugin']].plugin_obj \
-                .get_program_info_ext(prog_id)
-        if len(prog_details) == 0:
-            self.logger.warning('Program error: EPG program details missing {} {}' \
-                .format(self.plugin_obj.name, prog_id))
-            return None
-
-        prog_details = json.loads(prog_details[0]['json'])
-
-        start_time = utils.tm_local_parse(
-            (_event_data['start']
-            + self.config_obj.data[self.config_section]['epg-start_adjustment'])
-            * 1000)
-        end_time = utils.tm_local_parse(
-            (_event_data['end']
-            + self.config_obj.data[self.config_section]['epg-end_adjustment'])
-            * 1000)
-        dur_min = int((_event_data['end'] - _event_data['start']) / 60)
-
-        if not prog_details['date']:
-            if prog_details['year']:
-                air_date = str(prog_details['year'])
-                formatted_date = str(air_date)
-            else:
-                air_date = None
-                formatted_date = None
-        else:
-            air_date_msec = int(prog_details['date'])
-            air_date = utils.date_parse(air_date_msec, '%Y%m%d')
-            formatted_date = utils.date_parse(air_date_msec, '%Y/%m/%d')
-
-        sid = str(_event_data['channelId'])
-        title = prog_details['title']
-        entity_type = prog_details['type']
-
-        if prog_details['desc']:
-            description = prog_details['desc']
-        else:
-            description = 'Unavailable'
-        if prog_details['short_desc']:
-            short_desc = prog_details['short_desc']
-        else:
-            short_desc = description
-
-        if prog_details['episode']:
-            episode = prog_details['episode'] + self.episode_adj
-        else:
-            episode = None
-        season = prog_details['season']
-
-        if (season is None) and (episode is None):
-            se_common = None
-            se_xmltv_ns = None
-            se_prog_id = None
-        elif (season is not None) and (episode is not None):
-            se_common = 'S%02dE%02d' % (season, episode)
-            se_xmltv_ns = ''.join([str(season - 1), '.', str(episode - 1), '.0/1'])
-            se_prog_id = None
-        elif (season is None) and (episode is not None):
-            se_common = None
-            se_xmltv_ns = None
-            se_prog_id = None
-        else:  # (season is not None) and (episode is None):
-            se_common = 'S%02dE%02d' % (season, 0)
-            se_xmltv_ns = ''.join([str(season - 1), '.', '0', '.0/1'])
-            se_prog_id = None
-
-        if prog_details['subtitle']:
-            if season and episode:
-                subtitle = 'S%02dE%02d ' % (season, episode)
-            elif episode:
-                subtitle = 'E%02d ' % (episode)
-            else:
-                subtitle = ''
-            subtitle += prog_details['subtitle']
-        else:
-            subtitle = None
-
-        rating = prog_details['rating']
-        
-        video_quality = None
-        cc = False
-        live = None
-        is_new = None
-        finale = None
-        premiere = None
-
-        icon = prog_details['image']
-
-        if prog_details['genres'] is None:
-                genres = None
-        else:
-            genres = prog_details['genres']
-
-        directors = None
-        actors = None
-
-        json_result = {'channel': _ch_data['uid'], 'progid': prog_id, 'start': start_time, 'stop': end_time,
-            'length': dur_min, 'title': title, 'subtitle': subtitle, 'entity_type': entity_type,
-            'desc': description, 'short_desc': short_desc,
-            'video_quality': video_quality, 'cc': cc, 'live': live, 'finale': finale,
-            'premiere': premiere,
-            'air_date': air_date, 'formatted_date': formatted_date, 'icon': icon,
-            'rating': rating, 'is_new': is_new, 'genres': genres, 'directors': directors, 'actors': actors,
-            'season': season, 'episode': episode, 'se_common': se_common, 'se_xmltv_ns': se_xmltv_ns,
-            'se_progid': se_prog_id}
-        return json_result
-
-    def update_program_info(self, _prog_id):
-        """
-        Assumes the prog_id is not in the database, obtains the 
-        data from online provider and place info into the epg programs database
-        """
-        header = {
-            'User-agent': utils.DEFAULT_USER_AGENT,
-            'Referer': self.plugin_obj.unc_daddylive_agpigee_referer }
-        uri = self.plugin_obj.unc_daddylive_prog_details.format(_prog_id)
-        prog_details = self.get_uri_data(uri)
-
-        prog_details = prog_details['data']['item']
-        if prog_details['title'] is None:
-            prog_details['title'] = prog_details['name']
-
-        self.logger.debug('{}:{} Adding Program {} {} to db' \
-            .format(self.plugin_obj.name, self.instance_key, _prog_id, prog_details['title']))
-
-        if len(prog_details['images']) != 0:
-            image_bucket = prog_details['images'][0]['bucketPath']
-            image_url = self.plugin_obj.unc_daddylive_image + image_bucket
-        else:
-            image_url = None
-
-        if len(prog_details['genres']) != 0:
-            genres = prog_details['genres'][0]['name']
-        else:
-            genres = None
-        if prog_details['episodeNumber'] == 0:
-            episode = None
-        else:
-            episode = prog_details['episodeNumber']
-
-        if prog_details['episodeAirDate'] is None:
-            pass
-        elif prog_details['episodeAirDate'].startswith('/Date'):
-            m = re.search('Date\((\d*)\)', prog_details['episodeAirDate'])
-            if m is None:
-                prog_details['episodeAirDate'] = None
-            else:
-                prog_details['episodeAirDate'] = m.group(1)
-        else:
-            self.logger.warning('{}:{} Unknown format for episodeAirDate. Program:{}  Date:{}' \
-                .format(self.plugin_obj.name, self.instance_key, _prog_id, prog_details['episodeAirDate']))
-
-        if prog_details['releaseYear']:
-            year = str(prog_details['releaseYear'])
-        else:
-            year = prog_details['releaseYear']
-
-        program = { 
-            'title':      prog_details['title'], 
-            'desc':       prog_details['description'],
-            'short_desc': prog_details['description'],
-            'rating':     prog_details['tvRating'],
-            'year':       prog_details['releaseYear'],
-            'date':       prog_details['episodeAirDate'],
-            'type':       prog_details['type'],
-            'episode':    episode,
-            'season':     prog_details['seasonNumber'],
-            'subtitle':   prog_details['episodeTitle'],
-            'genres':     genres,
-            'image':      image_url}
-
-        self.db_programs.save_program(self.plugin_obj.name, _prog_id, program)
-        return program
diff --git a/plugins/provider_video_daddylive/lib/translations.py b/plugins/provider_video_daddylive/lib/translations.py
deleted file mode 100755
index 62c7082..0000000
--- a/plugins/provider_video_daddylive/lib/translations.py
+++ /dev/null
@@ -1,26 +0,0 @@
-# pylama:ignore=E203,E221
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-from lib.tvheadend.epg_category import groups
-from lib.tvheadend.epg_category import tvh_genres
-
-daddylive_base = 'gfpMXf5BjIUokbpo0bL/zZr+twSK0wH='
-daddylive_channels = '56nPlIC6gxdFyZrEXISGgfW='
-daddylive_stream = 'XRpItbdPjRlMXZr3yqCT1qSGgfW='
-
diff --git a/plugins/provider_video_daddylive/plugin.json b/plugins/provider_video_daddylive/plugin.json
deleted file mode 100755
index 11d605c..0000000
--- a/plugins/provider_video_daddylive/plugin.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "id": "provider_video_daddylive",
-    "name": "DaddyLive",
-    "version": "0.9.8",
-    "provider-name": "rocky4546",
-    "summary": "Watch TV channels from daddylivehd.sx website.",
-    "description": "Watch Free TV! Stream daddylivehd.sx TV's channels of news, sports, and the Internet's best, completely free.",
-    "category": ["video"],
-    "license": "MIT License, Copyright (C) 2023 ROCKY4546",
-    "source": "https://github.com/cabernetwork/cabernet",
-    "forum": "https://tvheadend.org/boards/5/topics/43052",
-    "website": "https://daddylivehd.sx/",
-    "icon": "resources/images/icon.jpg",
-    "fanart": "resources/images/fanart.png"
-}
diff --git a/plugins/provider_video_daddylive/resources/LICENSE b/plugins/provider_video_daddylive/resources/LICENSE
deleted file mode 100755
index 73176c5..0000000
--- a/plugins/provider_video_daddylive/resources/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-Creative Commons Attribution 4.0 License (CC-BY)
-
-Images for this application are licensed under a Creative Commons Attribution 4.0 License (CC-BY)
-To view a copy of this license, visit https://creativecommons.org/licenses/by/4.0/legalcode
diff --git a/plugins/provider_video_daddylive/resources/__init__.py b/plugins/provider_video_daddylive/resources/__init__.py
deleted file mode 100755
index e69de29..0000000
diff --git a/plugins/provider_video_daddylive/resources/channel_list.json b/plugins/provider_video_daddylive/resources/channel_list.json
deleted file mode 100755
index ff34214..0000000
--- a/plugins/provider_video_daddylive/resources/channel_list.json
+++ /dev/null
@@ -1,72 +0,0 @@
-[ 
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9200006923, "name": "ABC USA" },
-{"plugin": "TVGuide", "zone": 9133001172, "id": 9233000439, "name": "CBS USA" },
-{"plugin": "TVGuide", "zone": 9100002046, "id": 9233011926, "name": "FOX USA" },
-{"plugin": "TVGuide", "zone": 9100002933, "id": 9200007005, "name": "NBC USA" },
-{"plugin": "TVGuide", "zone": 9100002825, "id": 9200020077, "name": "CW USA" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200004889, "name": "A&E Tv" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233011832, "name": "AMC Tv" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200018479, "name": "Animal Planet" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200014701, "name": "BBC America" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233005931, "name": "BET Network" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9200018130, "name": "BIG TEN Network (BTN)" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200002886, "name": "Bravo TV" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9233013235, "name": "CBS Sports Network (CBSSN)" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200009413, "name": "CNBC" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233013812, "name": "CNN USA" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200004848, "name": "Cartoon Network" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200000657, "name": "Comedy Central" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233004102, "name": "Discovery HD" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233013857, "name": "Discovery Life" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200018475, "name": "Disney Channel" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200004852, "name": "Disney XD" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200012343, "name": "E! Entertainment" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9233000478, "name": "ESPN Deportes" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200006937, "name": "ESPN USA" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200012351, "name": "ESPN2 USA" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233011350, "name": "ESPNU USA" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233013967, "name": "FX Movie Channel" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200006932, "name": "FX TV" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233009448, "name": "Food Network" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233000410, "name": "Fox News" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233004104, "name": "Fox News Channel" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233008440, "name": "Fox Sports 1 USA" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200006942, "name": "Freeform" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200019858, "name": "Game Show Network" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233005443, "name": "Golf Channel" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200004886, "name": "HBO USA" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200016034, "name": "Hallmark Channel" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9200016601, "name": "Headline News (HLN)" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233008002, "name": "History TV" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233011910, "name": "ION Television" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200002243, "name": "Investigation Discovery (ID)" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200020452, "name": "Lifetime Movie Network" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233009825, "name": "Lifetime Movies Network" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9200009223, "name": "MLB Network" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233006803, "name": "MSNBC" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200014754, "name": "MTV USA" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9200000070, "name": "NBA TV USA" },
-{"plugin": "TVGuide", "zone": 9100002825, "id": 9200004330, "name": "NFL Network" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200006939, "name": "NICK" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9233007153, "name": "NICK JR" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233002310, "name": "National Geographic (NGC)" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200002736, "name": "Oprah Winfrey Network" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200004949, "name": "Oxygen Tv" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233013810, "name": "Paramount Network" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9233008517, "name": "SEC Network USA" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200016599, "name": "Showtime USA" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233013809, "name": "Starz" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233000403, "name": "TBS" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233004112, "name": "TLC" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233011830, "name": "TNT USA" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9200018577, "name": "TUDN USA" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233005468, "name": "TVLAND" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9200017917, "name": "Tennis Channel" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233000035, "name": "Travel Channel" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233004106, "name": "USA Network" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9200007132, "name": "Unimas" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9200006768, "name": "Univision" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9233000037, "name": "VH1 USA" },
-{"plugin": "TVGuide", "zone": 9133003818, "id": 9233013815, "name": "Weather Channel" },
-{"plugin": "TVGuide", "zone": 9100002013, "id": 9200009547, "name": "tru TV" }
-]
diff --git a/plugins/provider_video_daddylive/resources/fanart.png b/plugins/provider_video_daddylive/resources/fanart.png
deleted file mode 100755
index f9d8217..0000000
Binary files a/plugins/provider_video_daddylive/resources/fanart.png and /dev/null differ
diff --git a/plugins/provider_video_daddylive/resources/icon.jpg b/plugins/provider_video_daddylive/resources/icon.jpg
deleted file mode 100755
index 886bd29..0000000
Binary files a/plugins/provider_video_daddylive/resources/icon.jpg and /dev/null differ
diff --git a/plugins/provider_video_m3u/__init__.py b/plugins/provider_video_m3u/__init__.py
deleted file mode 100644
index 313b4d6..0000000
--- a/plugins/provider_video_m3u/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import lib.plugins.plugin as plugin
-from .lib.m3u_generic import M3UGeneric
-
-
-# register the init plugin function
-@plugin.register
-def start(_plugin, _plugins):
-    return M3UGeneric(_plugin)
diff --git a/plugins/provider_video_m3u/config_defn.json b/plugins/provider_video_m3u/config_defn.json
deleted file mode 100644
index 860cbd9..0000000
--- a/plugins/provider_video_m3u/config_defn.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-    "streams":{
-        "id": null,
-        "icon": "cast",
-        "label": "Stream Providers",
-        "description": "Streaming Services",
-        "sections":{
-            "m3u":{
-                "label": "M3U",
-                "sort": "M3U1",
-                "icon": "cast",
-                "description": "Settings for M3U",
-                "settings":{
-                    "enabled":{
-                        "label": "Enabled",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 1,
-                        "help": "Will disable if an error occurs; otherwise set to disable to disable plugin"
-                    },
-                    "player-tuner_count":{
-                        "label": "tuner_count",
-                        "type": "integer",
-                        "default": 10,
-                        "level": 2,
-                        "help": "Number of streams active at one time"
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/plugins/provider_video_m3u/instance_defn.json b/plugins/provider_video_m3u/instance_defn.json
deleted file mode 100644
index 08b8e3e..0000000
--- a/plugins/provider_video_m3u/instance_defn.json
+++ /dev/null
@@ -1,228 +0,0 @@
-{
-    "streams":{
-        "id": null,
-        "icon": "cast",
-        "label": "Stream Providers",
-        "description": "Streaming Services",
-        "sections":{
-            "m3u":{
-                "label": "M3U",
-                "sort": "M3U2",
-                "icon": "cast_connected",
-                "description": "Settings for M3U Instances",
-                "settings":{
-                    "enabled":{
-                        "label": "Enabled",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 0,
-                        "help": "Will disable this instance only"
-                    },
-                    "label":{
-                        "label": "Label",
-                        "type": "string",
-                        "default": null,
-                        "level": 0,
-                        "onChange": "lib.config.config_callbacks.update_instance_label",
-                        "help": "OnChange: The scheduler instance tasks are removed.  Please restart app following a change."
-                    },
-                    "channel-m3u_file":{
-                        "label": "M3U File",
-                        "type": "string",
-                        "default": null,
-                        "level": 0,
-                        "help": "Use http:// https:// or (Linux) file:/// (Windows) file:///C:/ Be careful when using spaces in the path"
-                    },
-                    "channel-m3u_file_type":{
-                        "label": "M3U File Type",
-                        "type": "list",
-                        "default": "autodetect",
-                        "values": ["autodetect", "gzip", "zip", "m3u"],
-                        "level": 1,
-                        "help": "When the extension of the file is not provided from the url, set this to define the type of file"
-                    },
-                    "channel-m3u_filter":{
-                        "label": "M3U Filter",
-                        "type": "string",
-                        "default": null,
-                        "level": 2,
-                        "help": "When True adds to channel list. Works with tvg* and group* args; Value is regex Format: 'name=value,name=value' EX:'tvg-chno=13.*, tvg-country=US' for all channels that start with 13 and country is US. No quotes are needed. All items are ANDed together."
-                    },
-                    "channel-update_timeout":{
-                        "label": "Channel Update Timeout",
-                        "type": "integer",
-                        "default": 23,
-                        "level": 3,
-                        "help": "Channel list must be this old for update to occur when requested"
-                    },
-                    "channel-import_groups":{
-                        "label": "Import Channel Groups",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 1,
-                        "help": "Imports groups from M3U into the group other column"
-                    },
-                    "channel-group_name":{
-                        "label": "Group Name",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "By default, the m3u file contains the plugin as a group.  This allows an instance name to be added to the group list during the m3u request. Use simple single words, if possible. If empty, will not add group."
-                    },
-                    "channel-start_ch_num":{
-                        "label": "Starting Ch Number",
-                        "type": "integer",
-                        "default": 1,
-                        "level": 1,
-                        "onChange": "lib.config.config_callbacks.update_channel_num",
-                        "help": "When channel number is not provided, will use this incrementally."
-                    },
-                    "player-stream_type":{
-                        "label": "stream_type",
-                        "type": "list",
-                        "default": "internalproxy",
-                        "values": ["m3u8redirect", "internalproxy", "streamlinkproxy", "ffmpegproxy"],
-                        "level": 1,
-                        "help": "M3U8 send m3u8 file directly to client.  ffmpeg uses ffmpeg for m3u8 urls. streamlink uses the python module streamlink. internal uses internally coded modules."
-                    },
-                    "player-play_all_segments":{
-                        "label": "Play All (VOD)",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Plays all starting segments and ignores Non-VOD Segments to Start setting. Helpful when the VOD is not set in the provider stream."
-                    },
-                    "player-segments_to_play":{
-                        "label": "Non-VOD Segments to Start",
-                        "type": "integer",
-                        "default": 2,
-                        "level": 2,
-                        "help": "When starting, will play the last xxx segments. '1' means no buffering. Each increase means about 6 seconds of buffering. If the VOD flag is set in the stream, then setting is ignored."
-                    },
-                    "player-decode_url":{
-                        "label": "Decode M3U8 URL",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Sometimes the provider M3U8 URL must be decoded before the HTTP request can be made.  Most of the time, it does not need to be decoded."
-                    },
-                    "player-enable_url_filter":{
-                        "label": "Enable URL Filtering",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Only works with internalproxy. Filters out streams from URL addresses based on regular expression"
-                    },
-                    "player-url_filter":{
-                        "label": "URL Filter",
-                        "type": "string",
-                        "default": null,
-                        "level": 3,
-                        "help": "Only used with stream_type=internalproxy"
-                    },
-                    "player-enable_pts_filter":{
-                        "label": "Enable PTS Filtering",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Works with internalproxy and ffmpegproxy. Filters out corrupted PTS packets.  Requires ffprobe.exe"
-                    },
-                    "player-pts_minimum":{
-                        "label": "pts_minimum",
-                        "type": "integer",
-                        "default": 10000000,
-                        "level": 3,
-                        "help": "Default 10,000,000 or 108 seconds after midnight. Filters out non-standard streams that whose PTS starts at midnight."
-                    },
-                    "player-pts_max_delta":{
-                        "label": "pts_max_delta",
-                        "type": "integer",
-                        "default": 3000000,
-                        "level": 3,
-                        "help": "Default 3,000,000 or 32 seconds. when playing contiguous blocks of video, filters out any blocks that do not have a continuous PTS counter."
-                    },
-                    "player-enable_pts_resync":{
-                        "label": "Enable PTS/DTS Resync",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 2,
-                        "help": "Works with internalproxy and ffmpegproxy. Corrects timing issues with the video and audio streams and makes them contiguous"
-                    },
-                    "player-pts_resync_type":{
-                        "label": "PTS/DTS Resync Type",
-                        "type": "list",
-                        "default": "ffmpeg",
-                        "values": ["ffmpeg", "internal"],
-                        "level": 2,
-                        "help": "Uses either ffmpeg genpts or internal resequencing"
-                    },
-                    "epg-enabled":{
-                        "label": "XMLTV Enabled",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 1,
-                        "help": "If disabled, will not ingest or populate the XMLTV output with this instance"
-                    },
-                    "epg-xmltv_file":{
-                        "label": "XMLTV File",
-                        "type": "string",
-                        "default": null,
-                        "level": 0,
-                        "help": "Use http:// https:// or (Linux) file:/// (Windows) file:///C:/ Be careful when using spaces in the path"
-                    },
-                    "epg-xmltv_file_type":{
-                        "label": "XMLTV File Type",
-                        "type": "list",
-                        "default": "autodetect",
-                        "values": ["autodetect", "gzip", "zip", "xml"],
-                        "level": 1,
-                        "help": "When the extension of the file is not provided from the url, set this to define the type of file"
-                    },
-                    "epg-prefix":{
-                        "label": "EPG Channel Prefix",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "If a number will ADD to the display channel number; otherwise, will prepend to the channel number as a string"
-                    },
-                    "epg-suffix":{
-                        "label": "EPG Channel Suffix",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "Will append to the channel number as a string"
-                    },
-                    "epg-episode_adjustment":{
-                        "label": "Adjusts Episode number",
-                        "type": "list",
-                        "default": 0,
-                        "values": [1000, 2000, 3000, 4000, 5000],
-                        "level": 1,
-                        "help": "Used to record the same episode on two different channels at the same time.  EX: Record the same channel from antenna and M3U at the same time."
-                    },
-                    "epg-start_adjustment":{
-                        "label": "Start Time Adjustment",
-                        "type": "integer",
-                        "default": 0,
-                        "level": 2,
-                        "help": "Used to start each program x seconds after the program is suppose to start."
-                    },
-                    "epg-end_adjustment":{
-                        "label": "End Time Adjustment",
-                        "type": "integer",
-                        "default": 0,
-                        "level": 2,
-                        "help": "Used to start each program x seconds before the program is suppose to end."
-                    },
-                    "epg-min_refresh_rate":{
-                        "label": "EPG Min Refresh Rate",
-                        "type": "integer",
-                        "default": 3600,
-                        "level": 2,
-                        "help": "Default=3600 seconds (1 hours). When a HTTP request for epg data is received, will refresh the data if older than this value."
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/plugins/provider_video_m3u/lib/__init__.py b/plugins/provider_video_m3u/lib/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/plugins/provider_video_m3u/lib/channels.py b/plugins/provider_video_m3u/lib/channels.py
deleted file mode 100644
index 11d61f4..0000000
--- a/plugins/provider_video_m3u/lib/channels.py
+++ /dev/null
@@ -1,210 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import json
-import mimetypes
-import os
-import pathlib
-import re
-import urllib.request
-import urllib.parse
-
-import lib.m3u8 as m3u8
-import lib.common.exceptions as exceptions
-import lib.clients.channels.channels as channels
-import lib.common.utils as utils
-from lib.plugins.plugin_channels import PluginChannels
-from lib.common.decorators import handle_url_except
-from lib.common.tmp_mgmt import TMPMgmt
-from lib.db.db_scheduler import DBScheduler
-
-from .translations import plutotv_groups
-
-TMP_FOLDERNAME = 'm3u'
-
-class Channels(PluginChannels):
-
-    def __init__(self, _instance_obj):
-        super().__init__(_instance_obj)
-        self.tmp_mgmt = TMPMgmt(self.config_obj.data)
-        self.filter_dict = self.compile_m3u_filter(
-            self.config_obj.data[self.config_section]['channel-m3u_filter'])
-        self.url_chars = re.compile('[^\-\.\_\~0-9a-zA-z]')
-        
-    def compile_m3u_filter(self, _str):
-        """
-        _dict contains a 
-        """
-        if _str is None:
-            return None
-        nv_dict = {}
-        split_nv = re.compile(r'([^ =]+)=([^,]+),*')
-        nv_pairs = re.findall(split_nv, _str)
-        for nv in nv_pairs:
-            nv_dict[nv[0]] = re.compile(nv[1])
-        return nv_dict
-
-    def get_channels(self):
-        global TMP_FOLDERNAME
-        if self.config_obj.data[self.config_section]['channel-m3u_file'] is None:
-            raise exceptions.CabernetException('{}:{} M3U File config not set, unable to get channel list' \
-                .format(self.plugin_obj.name, self.instance_key))
-        url = self.config_obj.data[self.config_section]['channel-m3u_file']
-        file_type = self.detect_filetype(url)
-        try:
-            dn_filename = self.tmp_mgmt.download_file(url, TMP_FOLDERNAME, None, file_type)
-            if dn_filename is None:
-                raise exceptions.CabernetException('{} M3U Channel Request Failed for instance {}' \
-                    .format(self.plugin_obj.name, self.instance_key))
-            m3u_file = self.extract_file(dn_filename, file_type)
-            m3u8_obj = m3u8.load(str(m3u_file))
-
-            ch_list = []
-            if len(m3u8_obj.segments) == 0:
-                raise exceptions.CabernetException('{} M3U Channel Request Failed for instance {}' \
-                    .format(self.plugin_obj.name, self.instance_key))
-            self.logger.info("{}: Found {} stations on instance {}"
-                .format(self.plugin_obj.name, len(m3u8_obj.segments),
-                self.instance_key))
-            for seg in m3u8_obj.segments:
-                if self.is_m3u_filtered(seg):
-                    continue
-                ch_number = None
-                if 'tvg-num' in seg.additional_props:
-                    ch_number = seg.additional_props['tvg-num']
-                elif 'tvg-chno' in seg.additional_props:
-                    ch_number = seg.additional_props['tvg-chno']
-                else:
-                    ch_number = self.set_channel_num(ch_number)
-
-                if 'channelID' in seg.additional_props and \
-                        len(seg.additional_props['channelID']) != 0:
-                    ch_id = seg.additional_props['channelID']
-                elif 'tvg-id' in seg.additional_props and \
-                        len(seg.additional_props['tvg-id']) != 0:
-                    ch_id = seg.additional_props['tvg-id']
-                elif ch_number is not None:
-                    ch_id = str(ch_number)
-                ch_id = re.sub(self.url_chars, '_', ch_id)
-
-                if 'tvg-logo' in seg.additional_props and seg.additional_props['tvg-logo'] != '':
-                    thumbnail = seg.additional_props['tvg-logo']
-                    if self.config_obj.data[self.config_section]['player-decode_url']:
-                        thumbnail = urllib.parse.unquote(thumbnail)
-                    thumbnail_size = self.get_thumbnail_size(thumbnail, ch_id)
-                else:
-                    thumbnail = None
-                    thumbnail_size = None
-                stream_url = seg.absolute_uri
-                
-                if 'group-title' in seg.additional_props:
-                    groups_other = seg.additional_props['group-title']
-                else:
-                    groups_other = None
-                
-                ch_callsign = seg.title
-                channel = {
-                    'id': ch_id,
-                    'enabled': True,
-                    'callsign': ch_callsign,
-                    'number': ch_number,
-                    'name': ch_callsign,
-                    'HD': 0,
-                    'group_hdtv': None,
-                    'group_sdtv': None,
-                    'groups_other': groups_other,
-                    'thumbnail': thumbnail,
-                    'thumbnail_size': thumbnail_size,
-                    'stream_url': stream_url
-                }
-                ch_list.append(channel)
-
-            sched_db = DBScheduler(self.config_obj.data)
-            active = sched_db.get_num_active()
-            if active < 2:
-                self.tmp_mgmt.cleanup_tmp(TMP_FOLDERNAME)
-            return ch_list
-        except exceptions.CabernetException as ex:
-            self.tmp_mgmt.cleanup_tmp(TMP_FOLDERNAME)
-            raise
-    
-    def get_channel_uri(self, _channel_id):
-        ch_dict = self.db.get_channel(_channel_id, self.plugin_obj.name, self.instance_key)
-        if self.config_obj.data[self.config_section]['player-decode_url']:
-            stream_url = urllib.parse.unquote(ch_dict['json']['stream_url'])
-        else:
-            stream_url = ch_dict['json']['stream_url']
-        return self.get_best_stream(stream_url, _channel_id)
-
-    def detect_filetype(self, _filename):
-        file_type = self.config_obj.data[self.config_section]['channel-m3u_file_type']
-        if file_type == 'autodetect':
-            extension = pathlib.Path(_filename).suffix
-            if extension == '.gz':
-                file_type = '.gz'
-            elif extension == '.zip':
-                file_type = '.zip'
-            elif extension == '.m3u':
-                file_type = '.m3u'
-            elif extension == '.m3u8':
-                file_type = '.m3u'
-            else:
-                raise exceptions.CabernetException(
-                    '{}:{} M3U File unknown File Type.  Set the M3U File Type in config.' \
-                    .format(self.plugin_obj.name, self.instance_key))
-        elif file_type == 'gzip':
-            file_type = '.gz'
-        elif file_type == 'zip':
-            file_type = '.zip'
-        elif file_type == 'm3u':
-            file_type = '.m3u'
-        elif file_type == 'm3u8':
-            file_type = '.m3u'
-        else:
-            raise exceptions.CabernetException(
-                '{}:{} M3U File unknown File Type in config.' \
-                .format(self.plugin_obj.name, self.instance_key))
-        return file_type
-
-    def extract_file(self, _filename, _file_type):
-        if _file_type == '.zip':
-            return self.tmp_mgmt.extract_zip(_filename)
-        elif _file_type == '.gz':
-            return self.tmp_mgmt.extract_gzip(_filename)
-        elif _file_type == '.m3u':
-            return _filename
-        else:
-            raise exceptions.CabernetException(
-                '{}:{} M3U File unknown File Type {}' \
-                .format(self.plugin_obj.name, self.instance_key, _file_type))
-    
-    def is_m3u_filtered(self, _segment):
-        """
-        format: name=regexvalue, Note: regex string cannot have a comma in it...
-        """
-        all_matched = True
-        if self.filter_dict is not None:
-            for filter in self.filter_dict:
-                if filter in _segment.additional_props:
-                    if not bool(re.search(self.filter_dict[filter], _segment.additional_props[filter])):
-                        all_matched = False
-                        break
-                else:
-                    all_matched = False
-                    break
-        return not all_matched
\ No newline at end of file
diff --git a/plugins/provider_video_m3u/lib/epg.py b/plugins/provider_video_m3u/lib/epg.py
deleted file mode 100644
index 918dc4e..0000000
--- a/plugins/provider_video_m3u/lib/epg.py
+++ /dev/null
@@ -1,169 +0,0 @@
-# pylama:ignore=E722
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-from xml.etree import ElementTree
-import json
-import pathlib
-import re
-import time
-import urllib.request
-
-import lib.common.exceptions as exceptions
-import lib.common.utils as utils
-from lib.common.decorators import handle_url_except
-from lib.common.decorators import handle_json_except
-from lib.common.xmltv import XMLTV
-from lib.plugins.plugin_epg import PluginEPG
-from lib.db.db_channels import DBChannels
-from lib.db.db_scheduler import DBScheduler
-
-from .translations import plutotv_tv_genres
-
-
-class EPG(PluginEPG):
-
-    def __init__(self, _instance_obj):
-        super().__init__(_instance_obj)
-        self.url_chars = re.compile('[^\-\.\_\~0-9a-zA-z]')
-
-    def dates_to_pull(self):
-        """
-        Since epg is a single file, will have to parce through the data and split it into days.
-        """
-        return [1], []
-        
-    def refresh_programs(self, _epg_day, use_cache=True):
-    
-        ch_db = DBChannels(self.config_obj.data)
-        if self.config_obj.data[self.config_section]['epg-xmltv_file'] is None:
-            raise exceptions.CabernetException('{}:{} XMLTV File config not set, unable to get epg list' \
-                .format(self.plugin_obj.name, self.instance_key))
-        url = self.config_obj.data[self.config_section]['epg-xmltv_file']
-        file_type = self.detect_filetype(url)
-        xmltv = XMLTV(self.config_obj.data, url, file_type)
-        start_date = datetime.datetime.utcnow().date()
-        while True:
-            xmltv.set_date(start_date)
-            iterator = iter(xmltv)
-            program_list = []
-            epg_ch_list = {}
-            while True:
-                prog_one = next(iterator)
-                if prog_one is None:
-                    break
-                program_list.append(prog_one)
-                ch_id = re.sub(self.url_chars, '_', prog_one['channel'])
-                epg_ch_list[ch_id] = None
-            ch_list = ch_db.get_channels(self.plugin_obj.name, self.instance_key)
-            for ch in ch_list.keys():
-                if not ch_list[ch][0]['enabled']:
-                    continue
-                if ch in epg_ch_list:
-                    continue
-                self.logger.debug('{}:{} Channel {} missing program data, adding default for day {}' \
-                    .format(self.plugin_obj.name, self.instance_key, ch, start_date))
-                # fill in default program data
-                start_hour = datetime.datetime.utcnow().hour - 2
-                if start_hour < 0:
-                    start_hour = 0
-                dt_start_day = datetime.datetime.combine(start_date, datetime.time())
-                for hr in range(start_hour,24):
-                    dt_start_time = dt_start_day.replace(
-                        tzinfo=datetime.timezone.utc, hour=hr, minute=0, second=0, microsecond=0)
-                    start = round(dt_start_time.timestamp())
-                    end = round(dt_start_time.timestamp()+3600)
-                    ch_data = ch_list[str(ch)][0]
-                    if ch_data['json']['groups_other'] is None:
-                        genres = None
-                    else:
-                        genres = [ ch_data['json']['groups_other'] ]
-                    prog_one = self.get_blank_program(start, end, 
-                        ch_data['uid'], ch_data['display_name'], genres)
-                    program_list.append(prog_one)
-            if len(program_list) == 0:
-                if xmltv.has_future_dates:
-                    start_date += datetime.timedelta(days=1)
-                    continue
-                else:
-                    break
-            self.db.save_program_list(self.plugin_obj.name, 
-                self.instance_key, start_date, program_list)
-            self.logger.debug('Refreshed EPG data for {}:{} day {}'
-                .format(self.plugin_obj.name, self.instance_key, start_date))
-            if xmltv.has_future_dates:
-                start_date += datetime.timedelta(days=1)
-            else:
-                break
-        sched_db = DBScheduler(self.config_obj.data)
-        active = sched_db.get_num_active()
-        if active < 2:
-            xmltv.cleanup_tmp_folder()
-        self.logger.debug('Refreshed EPG Completed for {}:{}'
-            .format(self.plugin_obj.name, self.instance_key))
-
-    def get_blank_program(self, _start, _end, _ch_id, _ch_title, _groups):    
-        start_time = utils.tm_local_parse(
-            (_start
-            + self.config_obj.data[self.config_section]['epg-start_adjustment'])
-            * 1000)
-        end_time = utils.tm_local_parse(
-            (_end
-            + self.config_obj.data[self.config_section]['epg-start_adjustment'])
-            * 1000)
-        dur_min = int((_end - _start) / 60)
-        sid = str(_ch_id)
-        title = _ch_title
-        json_result = {'channel': sid, 'progid': None, 'start': start_time, 'stop': end_time,
-            'length': dur_min, 'title': title, 'subtitle': None, 'entity_type': None,
-            'desc': 'Not Available', 'short_desc': 'Not Available',
-            'video_quality': None, 'cc': None, 'live': None, 'finale': None,
-            'premiere': None,
-            'air_date': None, 'formatted_date': None, 'icon': None,
-            'rating': None, 'is_new': False, 'genres': _groups, 'directors': None, 'actors': None,
-            'season': None, 'episode': None, 'se_common': None, 'se_xmltv_ns': None,
-            'se_progid': None}
-        return json_result
-    
-
-    def detect_filetype(self, _filename):
-        file_type = self.config_obj.data[self.config_section]['epg-xmltv_file_type']
-        if file_type == 'autodetect':
-            extension = pathlib.Path(_filename).suffix
-            if extension == '.gz':
-                file_type = '.gz'
-            elif extension == '.zip':
-                file_type = '.zip'
-            elif extension == '.xml':
-                file_type = '.xml'
-            else:
-                raise exceptions.CabernetException(
-                    '{}:{} XMLTV File unknown File Type.  Set the XMLTV File Type in config.' \
-                    .format(self.plugin_obj.name, self.instance_key))
-        elif file_type == 'gzip':
-            file_type = '.gz'
-        elif file_type == 'zip':
-            file_type = '.zip'
-        elif file_type == 'xml':
-            file_type = '.xml'
-        else:
-            raise exceptions.CabernetException(
-                '{}:{} XMLTV File unknown File Type in config.' \
-                .format(self.plugin_obj.name, self.instance_key))
-        return file_type
diff --git a/plugins/provider_video_m3u/lib/m3u_generic.py b/plugins/provider_video_m3u/lib/m3u_generic.py
deleted file mode 100644
index cc12506..0000000
--- a/plugins/provider_video_m3u/lib/m3u_generic.py
+++ /dev/null
@@ -1,37 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-import random
-import time
-import urllib.request
-
-from lib.plugins.plugin_obj import PluginObj
-
-from .m3u_generic_instance import M3UGenericInstance
-from ..lib import translations
-
-class M3UGeneric(PluginObj):
-
-    def __init__(self, _plugin):
-        super().__init__(_plugin)
-        if not self.config_obj.data[_plugin.name.lower()]['enabled']:
-            return
-        for inst in _plugin.instances:
-            self.instances[inst] = M3UGenericInstance(self, inst)
-        self.unc_pluto_base = self.uncompress(translations.pluto_base)
diff --git a/plugins/provider_video_m3u/lib/m3u_generic_instance.py b/plugins/provider_video_m3u/lib/m3u_generic_instance.py
deleted file mode 100644
index ee83973..0000000
--- a/plugins/provider_video_m3u/lib/m3u_generic_instance.py
+++ /dev/null
@@ -1,78 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2022 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-
-import random
-
-from .channels import Channels
-from .epg import EPG
-from lib.plugins.plugin_instance_obj import PluginInstanceObj
-
-
-class M3UGenericInstance(PluginInstanceObj):
-
-    def __init__(self, _plugin, _instance):
-        super().__init__(_plugin, _instance)
-        self.config_obj = _plugin.config_obj
-        if not self.config_obj.data[_plugin.name.lower()]['enabled']:
-            return
-        if not self.config_obj.data[self.config_section]['enabled']:
-            return
-
-        self.channels = Channels(self)
-        self.epg = EPG(self)
-
-    def scheduler_tasks(self):
-        sched_ch_hours = random.randint(4,6)
-        sched_ch_mins = random.randint(1,55)
-        sched_ch = '{:0>2d}:{:0>2d}'.format(sched_ch_hours, sched_ch_mins)
-        label = self.config_obj.data[self.config_section]['label']
-        if self.scheduler_db.save_task(
-                'Channels',
-                'Refresh {} Channels'.format(label),
-                self.plugin_obj.name,
-                self.instance_key,
-                'refresh_channels',
-                20,
-                'inline',
-                'Pulls channel lineup from M3U'
-                ):
-            self.scheduler_db.save_trigger(
-                'Channels',
-                'Refresh {} Channels'.format(label),
-                'startup')
-            self.scheduler_db.save_trigger(
-                'Channels',
-                'Refresh {} Channels'.format(label),
-                'daily',
-                timeofday=sched_ch
-                )
-        if self.scheduler_db.save_task(
-                'EPG',
-                'Refresh {} EPG'.format(label),
-                self.plugin_obj.name,
-                self.instance_key,
-                'refresh_epg',
-                10,
-                'thread',
-                'Add triggers to the EPG Refresh based on when the m3u is updated online.'
-                ):
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(label),
-                'startup')
diff --git a/plugins/provider_video_m3u/lib/translations.py b/plugins/provider_video_m3u/lib/translations.py
deleted file mode 100644
index cac8200..0000000
--- a/plugins/provider_video_m3u/lib/translations.py
+++ /dev/null
@@ -1,79 +0,0 @@
-# pylama:ignore=E203,E221
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-from lib.tvheadend.epg_category import groups
-from lib.tvheadend.epg_category import tvh_genres
-
-
-#https://github.com/zang74/PlutoIPTV-for-TVH/blob/master/pluto.py
-
-pluto_base = 'gfpMXf5BjIU3XxoFXxLCzxHFzfkQz62QkN33yZS7yf5='
-
-plutotv_groups = {
-    'Classic TV':     groups['CLASSICS'],
-    'Comedy':         groups['COMEDY'],
-    'Crime':          groups['MYSTERY'],
-    'Curiosity':      groups['DOCUMENTARIES'],
-    'Drama':          groups['MYSTERY'],
-    'En Español':     groups['SPANISH'],
-    'Entertainment':  groups['ENTERTAINMENT'],
-    'Explore':        groups['DOCUMENTARIES'],
-    'Gaming + Anime': groups['GAMING'],
-    'Home + DIY':     groups['DIY'],
-    'Kids':           groups['KIDS'],
-    'Local':          groups['NEWS'],
-    'Life + Style':   groups['LIFESTYLE'],
-    'Motor':          groups['SPORTS'],
-    'Movies':         groups['MOVIES'],
-    'Music':          groups['MUSIC'],
-    'New on Pluto TV': groups['NEW'],
-    'News + Opinion': groups['NEWS'],
-    'News + Info':    groups['NEWS'],
-    'Paranormal':     groups['MYSTERY'],
-    'Pluto TV':       groups['CLASSICS'],
-    'Reality':        groups['REALITY'],
-    'Samsung':        groups['SPORTS'],
-    'Sports':         groups['SPORTS'],
-    'Sports & Gaming': groups['SPORTS'],
-    'Vizio':          groups['MOVIES']
-    }
-
-plutotv_tv_genres = {
-    "Action & Adventure": [ tvh_genres['ADVENTURE'] ],
-    "Anime": [ tvh_genres['CARTOON'] ],
-    "Children & Family": [ tvh_genres['KIDS'] ],
-    "Classics": [ tvh_genres['MOVIE'] ],
-    "Comedy": [ tvh_genres['COMEDY'] ],
-    "Documentaries": [ tvh_genres['DOCUMENTARY'] ],
-    "Drama": [ tvh_genres['MOVIE'] ],
-    "Faith and Spirituality": [ tvh_genres['RELIGION'] ],
-    "Horror": [ tvh_genres['SF'] ],
-    "Independent": [ tvh_genres['NEWS_MAGAZINE'] ],
-    "Instructional & Educational": [ tvh_genres['EDUCATIONAL'] ],
-    "Music": [ tvh_genres['MUSIC'] ],
-    "Musicals": [ tvh_genres['MUSIC'] ],
-    "News and Information": [ tvh_genres['NEWS'] ],
-    "Reality": [ tvh_genres['GAME'] ],
-    "Romance": [ tvh_genres['ROMANCE'] ],
-    "Sci-Fi & Fantasy": [ tvh_genres['SF'] ],
-    "Thrillers": [ tvh_genres['THRILLER'] ],
-    "No information available": None,
-    "Other": None,
-    "Gay & Lesbian": None
-    }
\ No newline at end of file
diff --git a/plugins/provider_video_m3u/plugin.json b/plugins/provider_video_m3u/plugin.json
deleted file mode 100644
index 13b3e53..0000000
--- a/plugins/provider_video_m3u/plugin.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "id": "provider_video_m3u",
-    "name": "M3U",
-    "version": "0.9.4",
-    "provider-name": "rocky4546",
-    "summary": "This is real internet television",
-    "description": "Watch Free TV! Using M3U and XMLTV formats.",
-    "category": ["video"],
-    "license": "MIT License, Copyright (C) 2021 ROCKY4546",
-    "source": "https://github.com/cabernetwork/cabernet",
-    "forum": "https://tvheadend.org/boards/5/topics/43052",
-    "website": "https://docs.fileformat.com/audio/m3u/",
-    "icon": "resources/images/icon.png",
-    "fanart": "resources/images/fanart.jpg"
-}
diff --git a/plugins/provider_video_m3u/resources/LICENSE b/plugins/provider_video_m3u/resources/LICENSE
deleted file mode 100644
index 73176c5..0000000
--- a/plugins/provider_video_m3u/resources/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-Creative Commons Attribution 4.0 License (CC-BY)
-
-Images for this application are licensed under a Creative Commons Attribution 4.0 License (CC-BY)
-To view a copy of this license, visit https://creativecommons.org/licenses/by/4.0/legalcode
diff --git a/plugins/provider_video_m3u/resources/fanart.jpg b/plugins/provider_video_m3u/resources/fanart.jpg
deleted file mode 100644
index 1babe6a..0000000
Binary files a/plugins/provider_video_m3u/resources/fanart.jpg and /dev/null differ
diff --git a/plugins/provider_video_m3u/resources/icon.png b/plugins/provider_video_m3u/resources/icon.png
deleted file mode 100644
index 2b8de97..0000000
Binary files a/plugins/provider_video_m3u/resources/icon.png and /dev/null differ
diff --git a/plugins/provider_video_plutotv/__init__.py b/plugins/provider_video_plutotv/__init__.py
deleted file mode 100644
index 25ab3fb..0000000
--- a/plugins/provider_video_plutotv/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import lib.plugins.plugin as plugin
-from .lib.plutotv import PlutoTV
-
-
-# register the init plugin function
-@plugin.register
-def start(_plugin, _plugins):
-    return PlutoTV(_plugin)
diff --git a/plugins/provider_video_plutotv/config_defn.json b/plugins/provider_video_plutotv/config_defn.json
deleted file mode 100644
index 28b550a..0000000
--- a/plugins/provider_video_plutotv/config_defn.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-    "streams":{
-        "id": null,
-        "icon": "cast",
-        "label": "Stream Providers",
-        "description": "Streaming Services",
-        "sections":{
-            "plutotv":{
-                "label": "PlutoTV",
-                "sort": "PlutoTV1",
-                "icon": "cast",
-                "description": "Settings for PlutoTV",
-                "settings":{
-                    "enabled":{
-                        "label": "Enabled",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 1,
-                        "help": "Will disable if an error occurs; otherwise set to disable to disable plugin"
-                    },
-                    "program_thumbnail":{
-                        "label": "Program Thumbnail",
-                        "type": "list",
-                        "default": "featuredImage",
-                        "values": ["featuredImage", "poster", "thumbnail"],
-                        "level": 1,
-                        "help": "M3U8 only used with subscriptions.  TVHeadend has bugs with the M3U8 file from PlutoTV. ffmpeg uses ffmpeg and ffprobe.  Internal is the most efficient and cleanest solution."
-                    },
-                    "channel-thumbnail":{
-                        "label": "Channel Thumbnail",
-                        "type": "list",
-                        "default": "colorLogoPNG",
-                        "values": ["colorLogoPNG", "colorLogoSVG", "solidLogoSVG",
-                            "solidLogoPNG", "thumbnail", "logo",
-                            "featuredImage"],
-                        "level": 1,
-                        "help": "M3U8 only used with subscriptions.  TVHeadend has bugs with the M3U8 file from PlutoTV. ffmpeg uses ffmpeg and ffprobe.  Internal is the most efficient and cleanest solution."
-                    },                    
-                    "player-tuner_count":{
-                        "label": "tuner_count",
-                        "type": "integer",
-                        "default": 10,
-                        "level": 2,
-                        "help": "Number of streams active at one time"
-                    },
-                    "epg-hours":{
-                        "label": "EPG Hours to Pull",
-                        "type": "integer",
-                        "default": 14,
-                        "level": 3,
-                        "help": "PlutoTV max is 14 hours including 2 hours in the past."
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/plugins/provider_video_plutotv/instance_defn.json b/plugins/provider_video_plutotv/instance_defn.json
deleted file mode 100644
index 132bd65..0000000
--- a/plugins/provider_video_plutotv/instance_defn.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-    "streams":{
-        "id": null,
-        "icon": "cast",
-        "label": "Stream Providers",
-        "description": "Streaming Services",
-        "sections":{
-            "plutotv":{
-                "label": "PlutoTV",
-                "sort": "PlutoTV2",
-                "icon": "cast_connected",
-                "description": "Settings for PlutoTV Instances",
-                "settings":{
-                    "enabled":{
-                        "label": "Enabled",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 0,
-                        "help": "Will disable this instance only"
-                    },
-                    "label":{
-                        "label": "Label",
-                        "type": "string",
-                        "default": null,
-                        "level": 0,
-                        "onChange": "lib.config.config_callbacks.update_instance_label",
-                        "help": "Defines the tab name for this instance"
-                    },
-                    "channel-update_timeout":{
-                        "label": "Channel Update Timeout",
-                        "type": "integer",
-                        "default": 23,
-                        "level": 3,
-                        "help": "Channel list must be this old for update to occur when requested"
-                    },
-                    "channel-import_groups":{
-                        "label": "Import Channel Groups",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 1,
-                        "help": "Imports groups from PlutoTV into the group other column"
-                    },
-                    "channel-group_name":{
-                        "label": "Group Name",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "By default, the m3u file contains the plugin as a group.  This allows an instance name to be added to the group list during the m3u request. Use simple single words, if possible. If empty, will not add group."
-                    },
-                    "channel-start_ch_num":{
-                        "label": "Starting Ch Number",
-                        "type": "integer",
-                        "default": 1,
-                        "level": 1,
-                        "onChange": "lib.config.config_callbacks.update_channel_num",
-                        "help": "When channel number is not provided, will use this incrementally."
-                    },
-                    "player-stream_type":{
-                        "label": "stream_type",
-                        "type": "list",
-                        "default": "internalproxy",
-                        "values": ["m3u8redirect", "internalproxy", "streamlinkproxy", "ffmpegproxy"],
-                        "level": 1,
-                        "help": "M3U8 send m3u8 file directly to client.  ffmpeg uses ffmpeg for m3u8 urls. streamlink uses the python module streamlink. internal uses internally coded modules."
-                    },
-                    "player-play_all_segments":{
-                        "label": "Play All (VOD)",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Plays all starting segments and ignores Non-VOD Segments to Start setting. Helpful when the VOD is not set in the provider stream."
-                    },
-                    "player-segments_to_play":{
-                        "label": "Non-VOD Segments to Start",
-                        "type": "integer",
-                        "default": 4,
-                        "level": 2,
-                        "help": "When starting, will play the last xxx segments. '1' means no buffering. Each increase means about 6 seconds of buffering. If the VOD flag is set in the stream, then setting is ignored."
-                    },
-                    "player-enable_url_filter":{
-                        "label": "Enable URL Filtering",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 3,
-                        "help": "Only works with internalproxy. Filters out streams from URL addresses based on regular expression"
-                    },
-                    "player-url_filter":{
-                        "label": "URL Filter",
-                        "type": "string",
-                        "default": "^.*(_ad/|google.com|plutotv_filler|Well_be_right|_AdPod|_Promo).*$",
-                        "level": 3,
-                        "help": "Only used with stream_type=internalproxy"
-                    },
-                    "player-enable_pts_filter":{
-                        "label": "Enable PTS Filtering",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Works with internalproxy and ffmpegproxy. Filters out corrupted PTS packets.  Requires ffprobe.exe"
-                    },
-                    "player-pts_minimum":{
-                        "label": "pts_minimum",
-                        "type": "integer",
-                        "default": 10000000,
-                        "level": 3,
-                        "help": "Default 10,000,000 or 108 seconds after midnight. Filters out non-standard streams that whose PTS starts at midnight."
-                    },
-                    "player-pts_max_delta":{
-                        "label": "pts_max_delta",
-                        "type": "integer",
-                        "default": 3000000,
-                        "level": 3,
-                        "help": "Default 3,000,000 or 32 seconds. when playing contiguous blocks of video, filters out any blocks that do not have a continuous PTS counter."
-                    },
-                    "player-enable_pts_resync":{
-                        "label": "Enable PTS/DTS Resync",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 2,
-                        "help": "Works with internalproxy and ffmpegproxy. Corrects timing issues with the video and audio streams and makes them contiguous"
-                    },
-                    "player-pts_resync_type":{
-                        "label": "PTS/DTS Resync Type",
-                        "type": "list",
-                        "default": "ffmpeg",
-                        "values": ["ffmpeg", "internal"],
-                        "level": 2,
-                        "help": "Uses either ffmpeg genpts or internal resequencing"
-                    },
-                    "epg-enabled":{
-                        "label": "XMLTV Enabled",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 1,
-                        "help": "If disabled, will not ingest or populate the XMLTV output with this instance"
-                    },
-                    "epg-prefix":{
-                        "label": "EPG Channel Prefix",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "If a number will ADD to the display channel number; otherwise, will prepend to the channel number as a string"
-                    },
-                    "epg-suffix":{
-                        "label": "EPG Channel Suffix",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "Will append to the channel number as a string"
-                    },
-                    "epg-episode_adjustment":{
-                        "label": "Adjusts Episode number",
-                        "type": "list",
-                        "default": 0,
-                        "values": [1000, 2000, 3000, 4000, 5000],
-                        "level": 1,
-                        "help": "Used to record the same episode on two different channels at the same time.  EX: Record the same channel from antenna and PlutoTV at the same time."
-                    },
-                    "epg-start_adjustment":{
-                        "label": "Start Time Adjustment",
-                        "type": "integer",
-                        "default": 0,
-                        "level": 2,
-                        "help": "Used to start each program x seconds after the program is suppose to start."
-                    },
-                    "epg-end_adjustment":{
-                        "label": "End Time Adjustment",
-                        "type": "integer",
-                        "default": 0,
-                        "level": 2,
-                        "help": "Used to start each program x seconds before the program is suppose to end."
-                    },
-                    "epg-min_refresh_rate":{
-                        "label": "EPG Min Refresh Rate",
-                        "type": "integer",
-                        "default": 3600,
-                        "level": 2,
-                        "help": "Default=3600 seconds (1 hours). When a HTTP request for epg data is received, will refresh the data if older than this value."
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/plugins/provider_video_plutotv/lib/__init__.py b/plugins/provider_video_plutotv/lib/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/plugins/provider_video_plutotv/lib/channels.py b/plugins/provider_video_plutotv/lib/channels.py
deleted file mode 100644
index 7223e80..0000000
--- a/plugins/provider_video_plutotv/lib/channels.py
+++ /dev/null
@@ -1,107 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2022 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import json
-import re
-
-import lib.common.exceptions as exceptions
-from lib.db.db_channels import DBChannels
-from lib.plugins.plugin_channels import PluginChannels
-
-from .translations import plutotv_groups
-
-class Channels(PluginChannels):
-
-    def __init__(self, _instance_obj):
-        super().__init__(_instance_obj)
-
-    def get_channels(self):
-        channels_url = ''.join([self.plugin_obj.unc_pluto_base, '.json'])
-        ch_json = self.get_uri_json_data(channels_url)
-        ch_list = []
-        if ch_json is None or len(ch_json) == 0:
-            self.logger.warning('{} HTTP Channel Request Failed for instance {}' \
-                .format(self.plugin_obj.name, self.instance_key))
-            raise exceptions.CabernetException('{} HTTP Channel Request Failed' \
-                .format(self.plugin_obj.name))
-        self.logger.info("{}: Found {} stations on instance {}"
-            .format(self.plugin_obj.name, len(ch_json),
-            self.instance_key))
-        counter=0
-        for channel_dict in ch_json:
-            if (channel_dict["isStitched"]
-                   and channel_dict["visibility"] in ["everyone"]
-                   and channel_dict["name"] != "Announcement"
-                   and not channel_dict['onDemand']):
-        
-                hd = 0
-                ch_id = str(channel_dict['_id'])
-                ch_callsign = channel_dict['name']
-                thumbnail = None
-                thumbnail_size = None
-                for tn in [self.config_obj.data[self.plugin_obj.name.lower()]['channel-thumbnail'],
-                    "colorLogoPNG", "colorLogoSVG", "solidLogoSVG",
-                    "solidLogoPNG", "thumbnail", "logo", "featuredImage"]:
-                    if tn in channel_dict.keys():
-                        thumbnail = channel_dict[tn]['path']
-                        thumbnail_size = self.get_thumbnail_size(thumbnail, ch_id)
-                        break
-
-                stream_url = channel_dict['stitched']['urls'][0]['url']
-                stream_url = stream_url.replace('&appName=', '&appName=web') \
-                    .replace('&deviceMake=', '&deviceMake=Chrome') \
-                    .replace('&deviceModel=', '&deviceModel=Chrome') \
-                    .replace('&deviceType=', '&deviceType=web') \
-                    .replace('&sid=', '&sid=' + \
-                    self.config_obj.data['main']['uuid'] + \
-                    str(counter))
-                counter += 1
-                channel = channel_dict['number']
-                friendly_name = channel_dict['name']
-                if channel_dict['category'] in plutotv_groups:
-                    groups_other = plutotv_groups[channel_dict['category']]
-                else:
-                    # Need to replace spaces with "_" and remove special characters.
-                    self.logger.warning('Missing PlutoTV group translation for: {}' \
-                        .format(channel_dict['category']))
-                    groups_other = re.sub('[ +&*%$#@!:;,<>?]', '', channel_dict['category'])
-                
-                channel = {
-                    'id': ch_id,
-                    'enabled': True,
-                    'callsign': ch_callsign,
-                    'number': channel,
-                    'name': friendly_name,
-                    'HD': hd,
-                    'group_hdtv': None,
-                    'group_sdtv': None,
-                    'groups_other': groups_other,
-                    'thumbnail': thumbnail,
-                    'thumbnail_size': thumbnail_size,
-                    'stream_url': stream_url
-                }
-                ch_list.append(channel)
-        return ch_list
-    
-    def get_channel_uri(self, _channel_id):
-        self.logger.info('{}: Getting video stream info for {}' \
-            .format(self.plugin_obj.name, _channel_id))
-        ch_dict = self.db.get_channel(_channel_id, self.plugin_obj.name, self.instance_key)
-        stream_url = ch_dict['json']['stream_url']
-        return self.get_best_stream(stream_url, _channel_id)
-
diff --git a/plugins/provider_video_plutotv/lib/config_callbacks.py b/plugins/provider_video_plutotv/lib/config_callbacks.py
deleted file mode 100644
index 6104de7..0000000
--- a/plugins/provider_video_plutotv/lib/config_callbacks.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from lib.plugins.plugin_handler import PluginHandler
diff --git a/plugins/provider_video_plutotv/lib/epg.py b/plugins/provider_video_plutotv/lib/epg.py
deleted file mode 100644
index 56864a6..0000000
--- a/plugins/provider_video_plutotv/lib/epg.py
+++ /dev/null
@@ -1,234 +0,0 @@
-# pylama:ignore=E722
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-import json
-import urllib.request
-
-import lib.common.exceptions as exceptions
-import lib.common.utils as utils
-from lib.common.decorators import handle_url_except
-from lib.common.decorators import handle_json_except
-from lib.plugins.plugin_epg import PluginEPG
-
-from .translations import plutotv_tv_genres
-
-
-class EPG(PluginEPG):
-
-    def __init__(self, _instance_obj):
-        super().__init__(_instance_obj)
-
-    def dates_to_pull(self):
-        """
-        Since epg is less than one day, return a forced day item with no
-        aging items        
-        """
-        return [1], []
-    
-    def get_day_data(self):
-        stime = datetime.datetime.utcnow() - datetime.timedelta(hours=2)
-        # back up 2 hours
-        start = str(stime.strftime('%Y-%m-%dT%H:00:00.000Z'))
-        etime = stime + datetime.timedelta(
-            hours=self.config_obj.data[self.plugin_obj.name.lower()]['epg-hours'])
-        end = str(etime.strftime('%Y-%m-%dT%H:00:00.000Z'))
-        results = {}
-        epg_urls = ''.join([self.plugin_obj.unc_pluto_base, '?start={}&stop={}'])
-        if stime.date() != etime.date():
-            # crosses midnight
-            mstime = str(stime.strftime('%Y-%m-%dT23:59:00.000Z'))
-            metime = str(etime.strftime('%Y-%m-%dT00:00:00.000Z'))
-            url = (epg_urls.format(start, mstime))
-            results[stime.date()] = self.get_uri_data(url)
-            url = (epg_urls.format(metime, end))
-            results[etime.date()] = self.get_uri_data(url)
-        else:
-            url = (epg_urls.format(start, end))
-            results[stime.date()] = self.get_uri_data(url)
-        return results
-
-    def refresh_programs(self, _epg_day, use_cache=True):
-        try:
-            json_data = self.get_day_data()
-            for day, day_data in json_data.items():
-                if day_data is None:
-                    self.logger.info('{}:{} Unable to update EPG, no data for day {}' \
-                        .format(self.plugin_obj.name, self.instance_key, day))                
-                    continue
-                program_list = []
-                for ch_data in day_data:
-                    if 'timelines' in ch_data:
-                        for listing_data in ch_data['timelines']:
-                            program_json = self.get_program(ch_data, listing_data)
-                            if program_json is not None:
-                                program_list.append(program_json)
-                # push the update to the database
-                if len(program_list) == 0:
-                    self.logger.info('{}:{} Unable to update EPG, no timelines for day {}' \
-                        .format(self.plugin_obj.name, self.instance_key, day))
-                    continue
-                self.db.save_program_list(self.plugin_obj.name, self.instance_key, day, program_list)
-                self.logger.debug('Refreshed EPG data for {}:{} day {}'
-                    .format(self.plugin_obj.name, self.instance_key, day))
-        except KeyError as e:
-            self.logger.info('Unable to update PlutoTV EPG, no timelines. Key Error: {}'.format(e))
-
-    def get_program(self, _ch_data, _program_data):
-        # https://github.com/XMLTV/xmltv/blob/master/xmltv.dtd
-
-        # a duration of 0 means dummy program, so skip
-        if _program_data['episode']['duration'] == 0:
-            return None
-            
-        dur_min = int(_program_data['episode']['duration'] / 60 / 1000)
-
-        sid = str(_ch_data['_id'])
-        start_time = datetime.datetime.fromisoformat(_program_data['start'] \
-            .replace('Z', '+00:00')).timestamp() \
-            + self.config_obj.data[self.config_section]['epg-start_adjustment']
-        start_time = utils.tm_local_parse(start_time * 1000)
-        end_time = datetime.datetime.fromisoformat(_program_data['stop'] \
-            .replace('Z', '+00:00')).timestamp() \
-            + self.config_obj.data[self.config_section]['epg-end_adjustment']
-        end_time = utils.tm_local_parse(end_time * 1000)
-        title = _program_data['title']
-        entity_type = None
-        prog_id = None
-
-        if 'description' not in _program_data['episode'].keys():
-            description = 'Unavailable'
-        elif not _program_data['episode']['description']:
-            description = 'Unavailable None'
-        else:
-            description = _program_data['episode']['description']
-
-        short_desc = description
-        video_quality = None
-        cc = False
-
-        live = False
-        is_new = False
-        if 'liveBroadcast' in _program_data['episode'].keys():
-            if _program_data['episode']['liveBroadcast']:
-                live = True
-                is_new = True
-
-        finale = False
-        premiere = False
-
-        air_date = None
-        formatted_date = None
-        if 'clip' in _program_data['episode'].keys():
-            air_date_msec = datetime.datetime.fromisoformat(
-                _program_data['episode']['clip']['originalReleaseDate']
-                .replace('Z', '+00:00')).timestamp() * 1000
-            air_date = utils.date_parse(air_date_msec, '%Y%m%d')
-            formatted_date = utils.date_parse(air_date_msec, '%Y/%m/%d')
-        else:
-            air_date = None
-            formatted_date = None
-
-        icon = None
-        icon_type = self.config_obj.data[self.plugin_obj.name.lower()]['program_thumbnail']
-        if icon_type == 'featuredImage' and \
-            icon_type in _program_data['episode']['series'].keys():
-                icon = _program_data['episode']['series'][icon_type]['path']
-        elif icon_type in _program_data['episode'].keys():
-                icon = _program_data['episode'][icon_type]['path']
-        elif 'featuredImage' in _program_data['episode']['series'].keys():
-            icon = _program_data['episode']['series']['featuredImage']['path']
-        elif 'poster' in _program_data['episode'].keys():
-            icon = _program_data['episode']['poster']['path']
-
-        if 'rating' in _program_data['episode'].keys():
-            rating = _program_data['episode']['rating']
-        else:
-            rating = None
-
-        if 'genre' in _program_data['episode'].keys():
-            if _program_data['episode']['genre'] in plutotv_tv_genres:
-                genres = plutotv_tv_genres[_program_data['episode']['genre']]
-            else:
-                self.logger.info('Missing PlutoTV genre translation for: {}' \
-                        .format(_program_data['episode']['genre']))
-                genres = [x.strip() for x in _program_data['episode']['genre'].split(' and ')]
-        else:
-            genres = None
-
-        directors = None
-        actors = None
-
-        if 'season' in _program_data['episode'].keys():
-            if 'number' in _program_data['episode'].keys():
-                if _program_data['episode']['season'] == 1 and \
-                        _program_data['episode']['number'] ==  1:
-                    season = None
-                    episode = None
-                else:
-                    season = _program_data['episode']['season']
-                    episode = _program_data['episode']['number'] + self.episode_adj
-            else:
-                season = None
-                episode = None
-        elif 'number' in _program_data['episode'].keys():
-            season = None
-            episode = None
-        
-
-        if (season is None) and (episode is None):
-            se_common = None
-            se_xmltv_ns = None
-            se_prog_id = None
-        elif (season is not None) and (episode is not None):
-            se_common = 'S%02dE%02d' % (season, episode)
-            se_xmltv_ns = ''.join([str(season - 1), '.', str(episode - 1), '.0/1'])
-            se_prog_id = None
-
-        elif (season is None) and (episode is not None):
-            se_common = None
-            se_xmltv_ns = None
-            se_prog_id = None
-        else:  # (season is not None) and (episode is None):
-            se_common = 'S%02dE%02d' % (season, 0)
-            se_xmltv_ns = ''.join([str(season - 1), '.', '0', '.0/1'])
-            se_prog_id = None
-
-        if season is not None:
-            subtitle = 'S%02dE%02d ' % (season, episode)
-        elif episode is not None:
-            subtitle = 'E%02d ' % (episode)
-        else:
-            subtitle = ''
-        if 'name' in _program_data['episode'].keys():
-            subtitle += _program_data['episode']['name']
-        else:
-            subtitle = None
-
-        json_result = {'channel': sid, 'progid': prog_id, 'start': start_time, 'stop': end_time,
-            'length': dur_min, 'title': title, 'subtitle': subtitle, 'entity_type': entity_type,
-            'desc': description, 'short_desc': short_desc,
-            'video_quality': video_quality, 'cc': cc, 'live': live, 'finale': finale,
-            'premiere': premiere,
-            'air_date': air_date, 'formatted_date': formatted_date, 'icon': icon,
-            'rating': rating, 'is_new': is_new, 'genres': genres, 'directors': directors, 'actors': actors,
-            'season': season, 'episode': episode, 'se_common': se_common, 'se_xmltv_ns': se_xmltv_ns,
-            'se_progid': se_prog_id}
-        return json_result
-
diff --git a/plugins/provider_video_plutotv/lib/plutotv.py b/plugins/provider_video_plutotv/lib/plutotv.py
deleted file mode 100644
index 75dd687..0000000
--- a/plugins/provider_video_plutotv/lib/plutotv.py
+++ /dev/null
@@ -1,83 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-import random
-import time
-import urllib.request
-
-from lib.plugins.plugin_obj import PluginObj
-
-from .plutotv_instance import PlutoTVInstance
-from ..lib import translations
-
-class PlutoTV(PluginObj):
-
-    def __init__(self, _plugin):
-        super().__init__(_plugin)
-        if not self.config_obj.data[_plugin.name.lower()]['enabled']:
-            return
-        for inst in _plugin.instances:
-            self.instances[inst] = PlutoTVInstance(self, inst)
-        self.unc_pluto_base = self.uncompress(translations.pluto_base)
-
-    def scheduler_tasks(self):
-        sched_ch_hours = self.utc_to_local_time(23)
-        sched_ch_mins = random.randint(1,55)
-        sched_ch = '{:0>2d}:{:0>2d}'.format(sched_ch_hours, sched_ch_mins)
-        if self.scheduler_db.save_task(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                self.name,
-                None,
-                'refresh_channels',
-                20,
-                'inline',
-                'Pulls channel lineup from {}'.format(self.namespace)
-                ):
-            self.scheduler_db.save_trigger(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                'startup')
-            self.scheduler_db.save_trigger(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                'daily',
-                timeofday=sched_ch
-                )
-        if self.scheduler_db.save_task(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                self.name,
-                None,
-                'refresh_epg',
-                10,
-                'thread',
-                'Pulls channel program data from {}'.format(self.namespace)
-                ):
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                'startup')
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                'interval',
-                interval=200,
-                randdur=80
-                )
diff --git a/plugins/provider_video_plutotv/lib/plutotv_instance.py b/plugins/provider_video_plutotv/lib/plutotv_instance.py
deleted file mode 100644
index 1b8302f..0000000
--- a/plugins/provider_video_plutotv/lib/plutotv_instance.py
+++ /dev/null
@@ -1,35 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2022 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-from .channels import Channels
-from .epg import EPG
-from lib.plugins.plugin_instance_obj import PluginInstanceObj
-
-
-class PlutoTVInstance(PluginInstanceObj):
-
-    def __init__(self, _plutotv, _instance):
-        super().__init__(_plutotv, _instance)
-        self.config_obj = _plutotv.config_obj
-        if not self.config_obj.data[_plutotv.name.lower()]['enabled']:
-            return
-        if not self.config_obj.data[self.config_section]['enabled']:
-            return
-        self.channels = Channels(self)
-        self.epg = EPG(self)
-        
diff --git a/plugins/provider_video_plutotv/lib/translations.py b/plugins/provider_video_plutotv/lib/translations.py
deleted file mode 100644
index 45c5b62..0000000
--- a/plugins/provider_video_plutotv/lib/translations.py
+++ /dev/null
@@ -1,89 +0,0 @@
-# pylama:ignore=E203,E221
-"""
-MIT License
-
-Copyright (C) 2023 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-from lib.tvheadend.epg_category import groups
-from lib.tvheadend.epg_category import tvh_genres
-
-
-#https://github.com/zang74/PlutoIPTV-for-TVH/blob/master/pluto.py
-
-pluto_base = 'gfpMXf5BjIU3XxoFXxLCzxHFzfkQz62QkN33yZS7yf5='
-
-plutotv_groups = {
-    'Black Voices. Black Stories.': groups['ENTERTAINMENT'],
-    'Classic TV':     groups['CLASSICS'],
-    'Comedy':         groups['COMEDY'],
-    'Crime':          groups['MYSTERY'],
-    'Curiosity':      groups['DOCUMENTARIES'],
-    'Daytime TV':     groups['LIFESTYLE'],
-    'Drama':          groups['MYSTERY'],
-    'En Español':     groups['SPANISH'],
-    'Entertainment':  groups['ENTERTAINMENT'],
-    'Explore':        groups['DOCUMENTARIES'],
-    'Food':           groups['LIFESTYLE'],
-    'Game Shows':     groups['GAMING'],
-    'Gaming + Anime': groups['GAMING'],
-    'Home + DIY':     groups['DIY'],
-    'Home':           groups['DIY'],
-    'Kids':           groups['KIDS'],
-    'Local':          groups['NEWS'],
-    'Life + Style':   groups['LIFESTYLE'],
-    'Lifestyle + Culture': groups['LIFESTYLE'],
-    'Local News':     groups['NEWS'],
-    'Motor':          groups['SPORTS'],
-    'Movies':         groups['MOVIES'],
-    'Music':          groups['MUSIC'],
-    'New on Pluto TV': groups['NEW'],
-    'News + Opinion': groups['NEWS'],
-    'News + Info':    groups['NEWS'],
-    'Paranormal':     groups['MYSTERY'],
-    'Pluto TV':       groups['CLASSICS'],
-    'Reality':        groups['REALITY'],
-    'Samsung':        groups['SPORTS'],
-    "Season's Greetings": groups['HOLIDAY'],
-    'Sports':         groups['SPORTS'],
-    'Sports & Gaming': groups['SPORTS'],
-    'Vizio':          groups['MOVIES']
-    }
-
-plutotv_tv_genres = {
-    "Action & Adventure": [ tvh_genres['ADVENTURE'] ],
-    "Anime": [ tvh_genres['CARTOON'] ],
-    "Children & Family": [ tvh_genres['KIDS'] ],
-    "Classics": [ tvh_genres['MOVIE'] ],
-    "Comedy": [ tvh_genres['COMEDY'] ],
-    "Documentaries": [ tvh_genres['DOCUMENTARY'] ],
-    "Drama": [ tvh_genres['MOVIE'] ],
-    "Entertainment": [ tvh_genres['GAME'] ],
-    "Faith and Spirituality": [ tvh_genres['RELIGION'] ],
-    "Horror": [ tvh_genres['SF'] ],
-    "Independent": [ tvh_genres['NEWS_MAGAZINE'] ],
-    "Instructional & Educational": [ tvh_genres['EDUCATIONAL'] ],
-    "Music": [ tvh_genres['MUSIC'] ],
-    "Musicals": [ tvh_genres['MUSIC'] ],
-    "News and Information": [ tvh_genres['NEWS'] ],
-    "Reality": [ tvh_genres['GAME'] ],
-    "Romance": [ tvh_genres['ROMANCE'] ],
-    "Sci-Fi & Fantasy": [ tvh_genres['SF'] ],
-    "Sports": [ tvh_genres['SPORT'] ],
-    "Thrillers": [ tvh_genres['THRILLER'] ],
-    "No information available": None,
-    "Other": None,
-    "Gay & Lesbian": None
-    }
\ No newline at end of file
diff --git a/plugins/provider_video_plutotv/plugin.json b/plugins/provider_video_plutotv/plugin.json
deleted file mode 100644
index cfa9aa3..0000000
--- a/plugins/provider_video_plutotv/plugin.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "id": "provider_video_plutotv",
-    "name": "PlutoTV",
-    "version": "0.5.4",
-    "provider-name": "rocky4546",
-    "summary": "This is real internet television",
-    "description": "Watch Free TV! Stream Pluto TV's 100+ channels of news, sports, and the Internet's best, completely free.",
-    "category": ["video"],
-    "license": "MIT License, Copyright (C) 2021 ROCKY4546",
-    "source": "https://github.com/cabernetwork/cabernet",
-    "forum": "https://tvheadend.org/boards/5/topics/43052",
-    "website": "https://pluto.tv/",
-    "icon": "resources/images/icon.jpg",
-    "fanart": "resources/images/fanart.png"
-}
diff --git a/plugins/provider_video_plutotv/resources/LICENSE b/plugins/provider_video_plutotv/resources/LICENSE
deleted file mode 100644
index 73176c5..0000000
--- a/plugins/provider_video_plutotv/resources/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-Creative Commons Attribution 4.0 License (CC-BY)
-
-Images for this application are licensed under a Creative Commons Attribution 4.0 License (CC-BY)
-To view a copy of this license, visit https://creativecommons.org/licenses/by/4.0/legalcode
diff --git a/plugins/provider_video_plutotv/resources/fanart.png b/plugins/provider_video_plutotv/resources/fanart.png
deleted file mode 100644
index 777d8ed..0000000
Binary files a/plugins/provider_video_plutotv/resources/fanart.png and /dev/null differ
diff --git a/plugins/provider_video_plutotv/resources/icon.jpg b/plugins/provider_video_plutotv/resources/icon.jpg
deleted file mode 100644
index b94789a..0000000
Binary files a/plugins/provider_video_plutotv/resources/icon.jpg and /dev/null differ
diff --git a/plugins/provider_video_xumo/__init__.py b/plugins/provider_video_xumo/__init__.py
deleted file mode 100644
index c76f20e..0000000
--- a/plugins/provider_video_xumo/__init__.py
+++ /dev/null
@@ -1,26 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import lib.plugins.plugin as plugin
-from .lib.xumo import XUMO
-
-
-# register the init plugin function
-@plugin.register
-def start(_plugin, _plugins):
-    return XUMO(_plugin)
diff --git a/plugins/provider_video_xumo/config_defn.json b/plugins/provider_video_xumo/config_defn.json
deleted file mode 100644
index 4f100d3..0000000
--- a/plugins/provider_video_xumo/config_defn.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "streams":{
-        "id": null,
-        "icon": "cast",
-        "label": "Stream Providers",
-        "description": "Streaming Services",
-        "sections":{
-            "xumo":{
-                "label": "XUMO",
-                "sort": "XUMO1",
-                "icon": "cast",
-                "description": "Settings for XUMO",
-                "settings":{
-                    "enabled":{
-                        "label": "Enabled",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 1,
-                        "help": "Will disable if an error occurs; otherwise set to disable to disable plugin"
-                    },
-                    "geoid": {
-                        "label": "geoId",
-                        "type": "string",
-                        "default": null,
-                        "level": 4,
-                        "writable": false,
-                        "help": "Set by XUMO"
-                    },
-                    "channelListId": {
-                        "label": "channelListId",
-                        "type": "string",
-                        "default": null,
-                        "level": 4,
-                        "writable": false,
-                        "help": "Set by XUMO"
-                    },
-                    "player-tuner_count":{
-                        "label": "tuner_count",
-                        "type": "integer",
-                        "default": 10,
-                        "level": 2,
-                        "help": "Number of streams active at one time"
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/plugins/provider_video_xumo/instance_defn.json b/plugins/provider_video_xumo/instance_defn.json
deleted file mode 100644
index 67a1a85..0000000
--- a/plugins/provider_video_xumo/instance_defn.json
+++ /dev/null
@@ -1,185 +0,0 @@
-{
-    "streams":{
-        "id": null,
-        "icon": "cast",
-        "label": "Stream Providers",
-        "description": "Streaming Services",
-        "sections":{
-            "xumo":{
-                "label": "XUMO",
-                "sort": "XUMO2",
-                "icon": "cast_connected",
-                "description": "Settings for XUMO Instances",
-                "settings":{
-                    "enabled":{
-                        "label": "Enabled",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 0,
-                        "help": "Will disable this instance only"
-                    },
-                    "label":{
-                        "label": "Label",
-                        "type": "string",
-                        "default": null,
-                        "level": 0,
-                        "onChange": "lib.config.config_callbacks.update_instance_label",
-                        "help": "Defines the tab name for this instance"
-                    },
-                    "channel-update_timeout":{
-                        "label": "Channel Update Timeout",
-                        "type": "integer",
-                        "default": 23,
-                        "level": 3,
-                        "help": "Channel list must be this old for update to occur when requested"
-                    },
-                    "channel-import_groups":{
-                        "label": "Import Channel Groups",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 1,
-                        "help": "Imports groups from provider into the group other column"
-                    },
-                    "channel-group_name":{
-                        "label": "Group Name",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "By default, the m3u file contains the plugin as a group.  This allows an instance name to be added to the group list during the m3u request. Use simple single words, if possible. If empty, will not add group."
-                    },
-                    "channel-start_ch_num":{
-                        "label": "Starting Ch Number",
-                        "type": "integer",
-                        "default": 1,
-                        "level": 1,
-                        "onChange": "lib.config.config_callbacks.update_channel_num",
-                        "help": "When channel number is not provided, will use this incrementally."
-                    },
-                    "player-stream_type":{
-                        "label": "stream_type",
-                        "type": "list",
-                        "default": "internalproxy",
-                        "values": ["m3u8redirect", "internalproxy", "streamlinkproxy", "ffmpegproxy"],
-                        "level": 1,
-                        "help": "M3U8 send m3u8 file directly to client.  ffmpeg uses ffmpeg for m3u8 urls. streamlink uses the python module streamlink. internal uses internally coded modules."
-                    },
-                    "player-play_all_segments":{
-                        "label": "Play All (VOD)",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Plays all starting segments and ignores Non-VOD Segments to Start setting. Helpful when the VOD is not set in the provider stream."
-                    },
-                    "player-segments_to_play":{
-                        "label": "Non-VOD Segments to Start",
-                        "type": "integer",
-                        "default": 2,
-                        "level": 2,
-                        "help": "When starting, will play the last xxx segments. '1' means no buffering. Each increase means about 6 seconds of buffering. If the VOD flag is set in the stream, then setting is ignored."
-                    },
-                    "player-enable_url_filter":{
-                        "label": "Enable URL Filtering",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Only works with internalproxy. Filters out streams from URL addresses based on regular expression"
-                    },
-                    "player-url_filter":{
-                        "label": "URL Filter",
-                        "type": "string",
-                        "default": null,
-                        "level": 3,
-                        "help": "Only used with stream_type=internalproxy.  Based on the URL uses standard regular expressions"
-                    },
-                    "player-enable_pts_filter":{
-                        "label": "Enable PTS Filtering",
-                        "type": "boolean",
-                        "default": false,
-                        "level": 3,
-                        "help": "Works with internalproxy and ffmpegproxy. Filters out corrupted PTS packets.  Requires ffprobe.exe"
-                    },
-                    "player-pts_minimum":{
-                        "label": "pts_minimum",
-                        "type": "integer",
-                        "default": 10000000,
-                        "level": 3,
-                        "help": "Default 10,000,000 or 108 seconds after midnight. Filters out non-standard streams that whose PTS starts at midnight."
-                    },
-                    "player-pts_max_delta":{
-                        "label": "pts_max_delta",
-                        "type": "integer",
-                        "default": 3000000,
-                        "level": 3,
-                        "help": "Default 3,000,000 or 32 seconds. when playing contiguous blocks of video, filters out any blocks that do not have a continuous PTS counter."
-                    },
-                    "player-enable_pts_resync":{
-                        "label": "Enable PTS/DTS Resync",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 2,
-                        "help": "Works with internalproxy and ffmpegproxy. Corrects timing issues with the video and audio streams and makes them contiguous"
-                    },
-                    "player-pts_resync_type":{
-                        "label": "PTS/DTS Resync Type",
-                        "type": "list",
-                        "default": "ffmpeg",
-                        "values": ["ffmpeg", "internal"],
-                        "level": 2,
-                        "help": "Uses either ffmpeg genpts or internal resequencing"
-                    },
-                    "epg-enabled":{
-                        "label": "XMLTV Enabled",
-                        "type": "boolean",
-                        "default": true,
-                        "level": 1,
-                        "help": "If disabled, will not ingest or populate the XMLTV output with this instance"
-                    },
-                    "epg-prefix":{
-                        "label": "EPG Channel Prefix",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "If a number will ADD to the display channel number; otherwise, will prepend to the channel number as a string"
-                    },
-                    "epg-suffix":{
-                        "label": "EPG Channel Suffix",
-                        "type": "string",
-                        "default": null,
-                        "level": 1,
-                        "help": "Will append to the channel number as a string"
-                    },
-                    "epg-episode_adjustment":{
-                        "label": "Adjusts Episode number",
-                        "type": "list",
-                        "default": 0,
-                        "values": [1000, 2000, 3000, 4000, 5000],
-                        "level": 1,
-                        "help": "Used to record the same episode on two different channels at the same time.  EX: Record the same channel from antenna and provider at the same time."
-                    },
-                    "epg-start_adjustment":{
-                        "label": "Start Time Adjustment",
-                        "type": "integer",
-                        "default": 60,
-                        "level": 2,
-                        "help": "Used to start each program x seconds after the program is suppose to start."
-                    },
-                    "epg-end_adjustment":{
-                        "label": "End Time Adjustment",
-                        "type": "integer",
-                        "default": 60,
-                        "level": 2,
-                        "help": "Used to start each program x seconds before the program is suppose to end."
-                    },
-                    "epg-min_refresh_rate":{
-                        "label": "EPG Min Refresh Rate",
-                        "type": "integer",
-                        "default": 21600,
-                        "level": 2,
-                        "help": "Default=21600 seconds (6 hours). When a HTTP request for epg data is received, will refresh the data if older than this value."
-                    }
-                }
-            }
-        }
-    }
-}
-
diff --git a/plugins/provider_video_xumo/lib/__init__.py b/plugins/provider_video_xumo/lib/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/plugins/provider_video_xumo/lib/channels.py b/plugins/provider_video_xumo/lib/channels.py
deleted file mode 100644
index 7597f4a..0000000
--- a/plugins/provider_video_xumo/lib/channels.py
+++ /dev/null
@@ -1,205 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-import json
-import time
-
-import lib.common.exceptions as exceptions
-import lib.clients.channels.channels as channels
-from lib.plugins.plugin_channels import PluginChannels
-from lib.db.db_epg_programs import DBEpgPrograms
-
-from .translations import xumo_groups
-from .epg import EPG
-
-class Channels(PluginChannels):
-
-    def __init__(self, _instance_obj):
-        super().__init__(_instance_obj)
-        self.db_programs = DBEpgPrograms(self.config_obj.data)
-        self.epg = EPG(_instance_obj)
-
-    def get_channels(self):
-        channels_url = ''.join([self.plugin_obj.unc_xumo_base,
-            self.plugin_obj.unc_xumo_channels
-            .format(self.plugin_obj.geo.channelListId)])
-        ch_json = self.get_uri_json_data(channels_url)
-        ch_list = []
-        if ch_json is None or len(ch_json) == 0:
-            self.logger.warning('{} HTTP Channel Request Failed for instance {}' \
-                .format(self.plugin_obj.name, self.instance_key))
-            raise exceptions.CabernetException('{} HTTP Channel Request Failed' \
-                .format(self.plugin_obj.name))
-        self.logger.info("{}: Found {} stations on instance {}"
-            .format(self.plugin_obj.name, len(ch_json['channel']['item']),
-            self.instance_key))
-
-        for channel_dict in ch_json['channel']['item']:
-            hd = 0
-            ch_id = str(channel_dict['guid']['value'])
-            ch_callsign = channel_dict['callsign']
-
-            thumbnail = self.plugin_obj.unc_xumo_icons \
-                .format(ch_id)
-            thumbnail_size = self.get_thumbnail_size(thumbnail, ch_id)
- 
-            channel = channel_dict['number']
-            friendly_name = channel_dict['title']
-            groups_other = None
-            if 'genre' in channel_dict:
-                if channel_dict['genre'][0]['value'] in xumo_groups:
-                    groups_other = xumo_groups[channel_dict['genre'][0]['value']]
-                else:
-                    # Need to replace spaces with "_" and remove special characters.
-                    self.logger.warning('Missing XUMO group translation for: {}' \
-                        .format(channel_dict['genre'][0]['value']))
-                    groups_other = self.clean_group_name(channel_dict['genre'][0]['value'])
-            vod = False
-            if 'properties' in channel_dict and 'has_vod' in channel_dict['properties']:
-                vod = channel_dict['properties']['has_vod'] == 'true'
-            self.logger.debug("{}: Adding Channel {}"
-                .format(self.plugin_obj.name, friendly_name))
-            channel = {
-                'id': ch_id,
-                'enabled': True,
-                'callsign': ch_callsign,
-                'number': channel,
-                'name': friendly_name,
-                'HD': hd,
-                'group_hdtv': None,
-                'group_sdtv': None,
-                'groups_other': groups_other,
-                'thumbnail': thumbnail,
-                'thumbnail_size': thumbnail_size,
-                'VOD': vod
-            }
-            ch_list.append(channel)
-        return ch_list
-
-    def get_channel_uri(self, _channel_id):
-        self.logger.info('{} : Getting video stream for channel {}' \
-            .format(self.plugin_obj.name, _channel_id))
-
-        start_hour = datetime.datetime.utcnow().hour
-        url = ''.join([self.plugin_obj.unc_xumo_base,
-            self.plugin_obj.unc_xumo_channel
-            .format(_channel_id, start_hour)])
-        time_now = time.time()
-        listing = self.get_uri_json_data(url)
-        prog_id = None
-        for prog in listing['assets']:
-            if time_now < prog['timestamps']['end']:
-                prog_id = prog['id']
-                break
-
-        if prog_id is None:
-            if len(listing['assets']) > 0:
-                prog_id = listing['assets'][len(listing['assets'])-1]['id']
-                self.logger.debug('XUMO current list of current topics are outside of current time {} using {}' \
-                    .format(listing['assets'], prog_id))
-            else:
-                self.logger.debug('XUMO program id not provided, unable to obtain URL, aborting')
-                return None
-
-        prog_dict = self.db_programs.get_program(self.plugin_obj.name, prog_id)
-        update_prog_data = False
-        if len(prog_dict) == 0:
-            update_prog_data = True
-        else:
-            json_list = json.loads(prog_dict[0]['json'])
-            if json_list['stream_url'] is None:
-                update_prog_data = True
-
-        if update_prog_data:
-            self.logger.info('XUMO program not in database so EPG is not upto date. Try refreshing EPG. prog:{} ch:{}' \
-                .format(prog_id, _channel_id))
-            json_list = self.epg.update_program_info(prog_id)
-            if json_list is None:
-                self.logger.warning('Unable to find program uri stream from XUMO, aborting {}' \
-                    .format(prog_id))
-                return None
-        else:
-            json_list = json.loads(prog_dict[0]['json'])
-
-        stream_url = json_list.get('stream_url')
-        if stream_url is None:
-            self.logger.info('XUMO: Unable to find stream URL for program, aborting')
-            return None
-        self.logger.debug('Determining best video stream for {}...' \
-            .format(_channel_id))
-        bestStream = None
-        
-        # find the heighest stream url bandwidth and save it to the list
-        videoUrlM3u = self.get_m3u8_data(stream_url)
-        self.logger.debug('Found {} Playlists'.format(str(len(videoUrlM3u.playlists))))
-        if len(videoUrlM3u.playlists) > 0:
-            for videoStream in videoUrlM3u.playlists:
-                if bestStream is None:
-                    bestStream = videoStream
-                elif ((videoStream.stream_info.resolution[0] > bestStream.stream_info.resolution[0]) and
-                      (videoStream.stream_info.resolution[1] > bestStream.stream_info.resolution[1])):
-                    bestStream = videoStream
-                elif ((videoStream.stream_info.resolution[0] == bestStream.stream_info.resolution[0]) and
-                      (videoStream.stream_info.resolution[1] == bestStream.stream_info.resolution[1]) and
-                      (videoStream.stream_info.bandwidth > bestStream.stream_info.bandwidth)):
-                    bestStream = videoStream
-
-            if bestStream is not None:
-                self.logger.debug('{} will use {}x{} resolution at {}bps' \
-                    .format(_channel_id, str(bestStream.stream_info.resolution[0]), \
-                    str(bestStream.stream_info.resolution[1]), str(bestStream.stream_info.bandwidth)))
-                return bestStream.absolute_uri
-        else:
-            self.logger.debug('No variant streams found for this station.  Assuming single stream only.')
-            return stream_url
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/plugins/provider_video_xumo/lib/config_callbacks.py b/plugins/provider_video_xumo/lib/config_callbacks.py
deleted file mode 100644
index 6104de7..0000000
--- a/plugins/provider_video_xumo/lib/config_callbacks.py
+++ /dev/null
@@ -1,2 +0,0 @@
-
-from lib.plugins.plugin_handler import PluginHandler
diff --git a/plugins/provider_video_xumo/lib/epg.py b/plugins/provider_video_xumo/lib/epg.py
deleted file mode 100644
index 0bc6d01..0000000
--- a/plugins/provider_video_xumo/lib/epg.py
+++ /dev/null
@@ -1,277 +0,0 @@
-# pylama:ignore=E722
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-import json
-import time
-import urllib.request
-
-import lib.common.exceptions as exceptions
-import lib.common.utils as utils
-from lib.common.decorators import handle_url_except
-from lib.common.decorators import handle_json_except
-from lib.db.db_epg_programs import DBEpgPrograms
-from lib.db.db_channels import DBChannels
-from lib.plugins.plugin_epg import PluginEPG
-
-from .translations import xumo_tv_genres
-
-
-class EPG(PluginEPG):
-
-    def __init__(self, _instance_obj):
-        super().__init__(_instance_obj)
-        self.db_programs = DBEpgPrograms(self.config_obj.data)
-
-    def dates_to_pull(self):
-        """
-        Since epg is less than one day, return a forced day item with no
-        aging items        
-        """
-        return [1], []
-
-    def refresh_programs(self, _epg_day, use_cache=True):
-        timeslot_list = {}
-        program_list = []
-        todaydate = datetime.datetime.utcnow().date()
-        if use_cache:
-            program_list = self.db.get_epg_one(self.plugin_obj.name, self.instance_key, todaydate)
-            if len(program_list) != 0:
-                program_list = json.loads(program_list[0]['json'])
-                for program in program_list:
-                    ts = (program['channel'], program['start'])
-                    if ts not in timeslot_list.keys():
-                        timeslot_list[ts] = program
-        program_list = self.get_fullday_programs(program_list, timeslot_list)
-        self.db.save_program_list(self.plugin_obj.name, self.instance_key, todaydate, program_list)
-        self.logger.debug('Refreshed EPG data for {}:{} day {}'
-            .format(self.plugin_obj.name, self.instance_key, todaydate))
-
-    def get_fullday_programs(self, _program_list, _timeslot_list):
-        """
-        Returns a days (from midnight to midnight UTC) of programs
-        """
-        ch_db = DBChannels(self.config_obj.data)
-        ch_list = ch_db.get_channels(self.plugin_obj.name, self.instance_key)
-        prog_list = {}
-        prog_ids = {}
-        time_sec_now = time.time()
-        start_hour = datetime.datetime.utcnow().hour - 2
-        if start_hour < 0:
-            start_hour = 0
-        self.logger.info('{}:{} Processing {} EPG Channels from hour {}:00 to hour 23:00 UTC' \
-                .format(self.plugin_obj.name, self.instance_key, len(ch_list.keys()), start_hour))
-        for ch in ch_list.keys():
-            if not ch_list[ch][0]['enabled']:
-                continue
-            self.logger.debug('{}:{} Processing EPG Channel {} ' \
-                .format(self.plugin_obj.name, self.instance_key, ch, ch_list[ch][0]['display_name']))
-            for hr in range(start_hour,24):
-                url = ''.join([self.plugin_obj.unc_xumo_base,
-                    self.plugin_obj.unc_xumo_channel
-                    .format(ch, hr)])
-                listing = self.get_uri_data(url)
-                if listing is None:
-                    continue
-                for prog in listing['assets']:
-                    start_time = utils.tm_local_parse(prog['timestamps']['start'] * 1000)
-                    key = (ch, start_time)
-                    if 'live' not in prog:
-                        prog['live'] = False
-                    if key not in prog_list.keys():
-                        prog_list[key] = {
-                            'id': prog['id'],
-                            'channelId': ch,
-                            'start': prog['timestamps']['start'],
-                            'end': prog['timestamps']['end'],
-                            'is_live': prog['live']}
-                        prog_ids[prog['id']] = None
-
-        self.logger.info('{}:{} Processing {} Programs' \
-                .format(self.plugin_obj.name, self.instance_key, len(prog_list.keys())))
-        for prog in prog_ids.keys():
-            program = self.db_programs.get_program(self.plugin_obj.name, prog)
-            if len(program) == 0:
-                self.update_program_info(prog)
-            #else:
-            #    self.logger.debug('{}:{} Processing Program {} from cache' \
-            #        .format(self.plugin_obj.name, self.instance_key, prog))
-        program = None
-
-        self.logger.debug('{}:{} Finalizing EPG updates' \
-            .format(self.plugin_obj.name, self.instance_key))
-        for key, listing_data in prog_list.items():
-            if time_sec_now - listing_data['start'] > 86400:
-                for hr in range(start_hour,24):
-                    dt_start_day = datetime.datetime.utcnow() 
-                    dt_start_time = dt_start_day.replace(tzinfo=datetime.timezone.utc, hour=hr, minute=0, second=0, microsecond=0)
-                    listing_data['start'] = round(dt_start_time.timestamp())
-                    listing_data['end'] = round(dt_start_time.timestamp()+3600)
-                    try:
-                        ch_data = ch_list[str(listing_data['channelId'])][0]
-                        key_ts = ( listing_data['channelId'], utils.tm_local_parse(listing_data['start'] * 1000) )
-                        if key_ts in _timeslot_list:
-                            program_json = self.get_program(ch_data,
-                                listing_data, _timeslot_list[key_ts])
-                        else:
-                            program_json = self.get_program(ch_data,
-                                listing_data, None)
-                        if program_json is not None:
-                            _program_list.append(program_json)
-                    except KeyError as e:
-                        self.logger.info('1 Missing Channel: {} {}'.format(str(listing_data['channelId']), e))
-                        continue
-                self.logger.debug('Channel has no programs, adding default programming for {}' \
-                    .format(listing_data['channelId']))
-                continue
-            try:
-                ch_data = ch_list[str(listing_data['channelId'])][0]
-                key_ts = ( listing_data['channelId'], utils.tm_local_parse(listing_data['start'] * 1000) )
-                if key_ts in _timeslot_list:
-                    program_json = self.get_program(ch_data,
-                        listing_data, _timeslot_list[key_ts])
-                else:
-                    program_json = self.get_program(ch_data,
-                        listing_data, None)
-            except KeyError as e:
-                self.logger.info('2 Missing Channel: {} {}'.format(str(listing_data['channelId']), e))
-                continue
-            if program_json is not None:
-                _program_list.append(program_json)
-        return _program_list
-
-    def get_program_uri(self, _listing):
-        uri = None
-        if 'providers' in _listing:
-            for provider in _listing['providers']:
-                for source in provider['sources']:
-                    uri = source['uri']
-        return uri
-
-    def get_program(self, _ch_data, _program_data, _timeslot_list):
-        if not _ch_data['enabled']:
-            return None
-        prog_id = _program_data['id']
-        key = (_ch_data['uid'], _program_data['start'])
-
-        if _timeslot_list is not None and key in _timeslot_list:
-            return None
-        
-        prog_details = self.db_programs.get_program(self.plugin_obj.name, prog_id)
-        if len(prog_details) == 0:
-            self.logger.warning('Program error: EPG program details missing {} {}' \
-                .format(self.plugin_obj.name, prog_id))
-            return None
-
-        prog_details = json.loads(prog_details[0]['json'])
-
-        start_time = utils.tm_local_parse(
-            (_program_data['start']
-            + self.config_obj.data[self.config_section]['epg-start_adjustment'])
-            * 1000)
-        end_time = utils.tm_local_parse(
-            (_program_data['end']
-            + self.config_obj.data[self.config_section]['epg-start_adjustment'])
-            * 1000)
-        dur_min = int((_program_data['end'] - _program_data['start']) / 60)
-        sid = str(_program_data['channelId'])
-        title = prog_details['title']
-        entity_type = None
-
-        if 'description' not in prog_details.keys():
-            description = 'Unavailable'
-        else:
-            description = prog_details['description']
-        short_desc = description
-        video_quality = None
-        cc = False
-        live = _program_data['is_live']
-        is_new = _program_data['is_live']
-        finale = False
-        premiere = False
-        air_date = None
-        formatted_date = None
-        rating = None
-
-        icon = self.plugin_obj.unc_xumo_icons \
-            .format(sid)
-
-        if _ch_data['json']['groups_other'] is None:
-                genres = None
-        elif _ch_data['json']['groups_other'] in xumo_tv_genres:
-            genres = xumo_tv_genres[_ch_data['json']['groups_other']]
-        else:
-            self.logger.info('Missing XUMO genre translation for: {}' \
-                    .format(_ch_data['json']['groups_other']))
-            genres = [_ch_data['json']['groups_other']]
-
-        directors = None
-        actors = None
-        season = None
-        episode = None
-        se_common = None
-        se_xmltv_ns = None
-        se_prog_id = None
-        subtitle = None
-
-        json_result = {'channel': sid, 'progid': prog_id, 'start': start_time, 'stop': end_time,
-            'length': dur_min, 'title': title, 'subtitle': subtitle, 'entity_type': entity_type,
-            'desc': description, 'short_desc': short_desc,
-            'video_quality': video_quality, 'cc': cc, 'live': live, 'finale': finale,
-            'premiere': premiere,
-            'air_date': air_date, 'formatted_date': formatted_date, 'icon': icon,
-            'rating': rating, 'is_new': is_new, 'genres': genres, 'directors': directors, 'actors': actors,
-            'season': season, 'episode': episode, 'se_common': se_common, 'se_xmltv_ns': se_xmltv_ns,
-            'se_progid': se_prog_id}
-        return json_result
-
-    def update_program_info(self, _prog):
-        self.logger.debug('{}:{} Processing Program {} from XUMO' \
-            .format(self.plugin_obj.name, self.instance_key, _prog))
-        program = {}
-        url = ''.join([self.plugin_obj.unc_xumo_base,
-            self.plugin_obj.unc_xumo_program
-            .format(_prog)])
-        listing = self.get_uri_data(url)
-        if listing is None:
-            return program
-        program['title'] = listing['title']
-        if 'descriptions' in listing:
-            if 'large' in listing['descriptions'].keys():
-                key = 'large'
-            elif 'medium' in listing['descriptions'].keys():
-                key = 'medium'
-            elif 'small' in listing['descriptions'].keys():
-                key = 'small'
-            else:
-                key = list(listing['descriptions'].keys())[0]
-            program['description'] = listing['descriptions'][key]
-        program['stream_url'] = None
-        for source in listing['providers'][0]['sources']:
-            if 'drm' not in source:
-                if source['produces'] == 'application/x-mpegURL':
-                    program['stream_url'] = source['uri']
-                    break
-                elif source['produces'] == 'application/x-mpegURL;type=tv':
-                    program['stream_url'] = source['uri']
-        if program['stream_url'] is None:
-            self.logger.info('No stream available for program {}' \
-                .format(_prog))
-        self.db_programs.save_program(self.plugin_obj.name, _prog, program)
-        return program
\ No newline at end of file
diff --git a/plugins/provider_video_xumo/lib/geo.py b/plugins/provider_video_xumo/lib/geo.py
deleted file mode 100644
index 252acd3..0000000
--- a/plugins/provider_video_xumo/lib/geo.py
+++ /dev/null
@@ -1,61 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import json
-import logging
-import re
-import time
-import urllib.request
-from datetime import datetime
-
-from lib.common.decorators import handle_url_except
-from lib.common.decorators import handle_json_except
-import lib.common.exceptions as exceptions
-import lib.common.utils as utils
-
-
-class Geo:
-
-    def __init__(self, _config_obj, _section):
-        self.logger = logging.getLogger(__name__)
-        self.config_obj = _config_obj
-        self.section = _section
-        self.geoId = None
-        self.channelListId = None
-        self.get_geo()
-
-    @handle_json_except 
-    @handle_url_except 
-    def get_geo(self):
-        """
-        Geo info comes from json object on the home page
-        If the request fails, we will use the last data available in config
-        default geoid:924baa2b channellistid:10006
-        """
-        if self.config_obj.data[self.section].get('channellistid') is not None:
-            self.channelListId = self.config_obj.data[self.section]['channellistid']
-            self.logger.debug('Reusing XUMO channelListId from provider')
-        else:
-            geo_url = 'https://play.xumo.com'
-            login_headers = {'Content-Type': 'application/json', 'User-agent': utils.DEFAULT_USER_AGENT}
-            req = urllib.request.Request(geo_url, headers=login_headers)
-            with urllib.request.urlopen(req, timeout=5) as resp:
-                results = json.loads(
-                    re.findall(b'"CHANNEL_LIST_ID":"(.+?)"\,', (resp.read()), flags=re.DOTALL)[0])
-            self.channelListId = results
-            self.config_obj.write(self.section, 'channellistid', self.channelListId)
diff --git a/plugins/provider_video_xumo/lib/translations.py b/plugins/provider_video_xumo/lib/translations.py
deleted file mode 100644
index e3ebf28..0000000
--- a/plugins/provider_video_xumo/lib/translations.py
+++ /dev/null
@@ -1,94 +0,0 @@
-# pylama:ignore=E203,E221
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-from lib.tvheadend.epg_category import groups
-from lib.tvheadend.epg_category import tvh_genres
-
-xumo_base = 'gfpMXf5BjIUNkbL7yZl/kqC3XfWPybpKj83CybHFkNUPjRkIjG=='
-xumo_icons = 'gfpMXf5BjIU/ybd8tqSJzbCQjZlQyqUN5qU6gxdFyZrEXIU6gxdFyZrEjRPUjKhL58eC542FXxS8uRpSXxhUkNUEyRi1yNSwyxd6gG=='
-xumo_channel = 'kN33yZS7yf5QkN33yZS7ywUT1qUYXZU3txl3XRnFg8lQy6U+yRrIusPU'
-xumo_channels = 'kN33yZS7yf5Qyx7KzwUT1qSAXNUF'
-xumo_program = 'kslKtspKjNdKXNrMjRPUjZ/KyNJVt6CMgspEtqtZusaIyRt/txrIXItZubp7XNlIgsaMgbUFXItZusiCy8p/ybhZt6C3zZd/yxdYyxr4gbS6tn=='
-
-xumo_groups = {
-    'Action & Drama':       groups['DRAMA'],
-    'Black Voices. Black Stories.': groups['ENTERTAINMENT'],
-    'Classic TV':           groups['CLASSICS'],
-    'Combat Sports':        groups['SPORTS'],
-    'Comedy':               groups['COMEDY'],
-    'Crime TV':             groups['MYSTERY'],
-    'Entertainment':        groups['ENTERTAINMENT'],
-    'Faith & Family':       groups['RELIGION'],
-    'Food':                 groups['LIFESTYLE'],
-    'Food, Drink & Travel': groups['TRAVEL'],    
-    'Game Shows':           groups['GAMING'],
-    'Kids & Family':        groups['KIDS'],
-    'Halloween HQ':         groups['HOLIDAY'],
-    'History & Learning':   groups['DOCUMENTARIES'],
-    'Holiday':              groups['HOLIDAY'],
-    'Holiday Hub':          groups['HOLIDAY'],
-    'Home & Design':        groups['DIY'],
-    'Horror & Sci-Fi':      groups['MYSTERY'],
-    'International':        groups['INTERNATIONAL'],
-    'Kids':                 groups['KIDS'],
-    'Latino':               groups['SPANISH'],
-    'Latinx':               groups['SPANISH'],
-    'Latinx Heritage Month': groups['SPANISH'],
-    'Lifestyle':            groups['LIFESTYLE'],
-    'Local News':           groups['LOCAL'],
-    'Movies':               groups['MOVIES'],
-    'Music':                groups['MUSIC'],
-    'Music & Radio':        groups['MUSIC'],
-    'Nature & Wildlife TV': groups['DOCUMENTARIES'],
-    'News':                 groups['NEWS'],
-    'Reality TV':           groups['REALITY'],
-    'Pop Culture':          groups['ENTERTAINMENT'],
-    'Science & Tech':       groups['SCIENCE'],
-    'Sports':               groups['SPORTS'],
-    'Travel & Lifestyle':   groups['TRAVEL'],
-    'TV & Movies':          groups['MOVIES'],
-    'Weather':              groups['NEWS'],
-    'Westerns & Country':   groups['WESTERNS']
-    }
-
-xumo_tv_genres = {
-    "Classics":   [ tvh_genres['MOVIE'] ],
-    "Comedy":   [ tvh_genres['COMEDY'] ],
-    "DIY":      [ tvh_genres['HANDICRAFT'] ],
-    "Documentaries": [ tvh_genres['DOCUMENTARY'] ],
-    "Drama":    [ tvh_genres['MOVIE'] ],
-    "Entertainment": [ tvh_genres['GAME'] ],
-    "Gaming":   [ tvh_genres['SPORT'] ],
-    "Holiday":  [ tvh_genres['SPIRITUAL'] ],
-    "International": [ tvh_genres['FOREIGN'] ],
-    "Kids":     [ tvh_genres['KIDS'] ],
-    "Lifestyle": [ tvh_genres['CULTURE'] ],
-    "Local":    [ tvh_genres['NEWS'] ],
-    "Movies":   [ tvh_genres['MOVIE'] ],
-    "Music":    [ tvh_genres['MUSIC'] ],
-    "Mystery":  [ tvh_genres['MOVIE'] ],
-    "News":     [ tvh_genres['NEWS'] ],
-    "Reality":  [ tvh_genres['GAME'] ],
-    "Religion": [ tvh_genres['RELIGION'] ],
-    "Science":  [ tvh_genres['SCIENCE'] ],
-    "Spanish":  [ tvh_genres['LANGUAGES'] ],
-    "Sports":   [ tvh_genres['SPORT'] ],
-    "Travel":   [ tvh_genres['TRAVEL'] ],
-    "Westerns": [ tvh_genres['ADVENTURE'] ]    
-    }
\ No newline at end of file
diff --git a/plugins/provider_video_xumo/lib/xumo.py b/plugins/provider_video_xumo/lib/xumo.py
deleted file mode 100644
index da9c55a..0000000
--- a/plugins/provider_video_xumo/lib/xumo.py
+++ /dev/null
@@ -1,91 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import datetime
-import random
-import time
-import urllib.request
-
-from lib.plugins.plugin_obj import PluginObj
-
-from .geo import Geo
-from .xumo_instance import XUMOInstance
-from ..lib import translations
-
-
-class XUMO(PluginObj):
-
-    def __init__(self, _plugin):
-        super().__init__(_plugin)
-        self.geo = Geo(_plugin.config_obj, self.namespace.lower())
-        for inst in _plugin.instances:
-            self.instances[inst] = XUMOInstance(self, inst)
-        self.unc_xumo_base = self.uncompress(translations.xumo_base)
-        self.unc_xumo_icons = self.uncompress(translations.xumo_icons)
-        self.unc_xumo_channel = self.uncompress(translations.xumo_channel)
-        self.unc_xumo_channels = self.uncompress(translations.xumo_channels)
-        self.unc_xumo_program = self.uncompress(translations.xumo_program)
-
-
-    def scheduler_tasks(self):
-        sched_epg_hours = self.utc_to_local_time(0)
-        sched_epg_mins = random.randint(1,55)
-        sched_epg = '{:0>2d}:{:0>2d}'.format(sched_epg_hours, sched_epg_mins)
-        sched_ch_hours = self.utc_to_local_time(23)
-        sched_ch_mins = random.randint(1,55)
-        sched_ch = '{:0>2d}:{:0>2d}'.format(sched_ch_hours, sched_ch_mins)
-        if self.scheduler_db.save_task(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                self.name,
-                None,
-                'refresh_channels',
-                20,
-                'inline',
-                'Pulls channel lineup from {}'.format(self.namespace)
-                ):
-            self.scheduler_db.save_trigger(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                'startup')
-            self.scheduler_db.save_trigger(
-                'Channels',
-                'Refresh {} Channels'.format(self.namespace),
-                'daily',
-                timeofday=sched_ch
-                )
-        if self.scheduler_db.save_task(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                self.name,
-                None,
-                'refresh_epg',
-                10,
-                'thread',
-                'Pulls channel program data from {}'.format(self.namespace)
-                ):
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                'startup')
-            self.scheduler_db.save_trigger(
-                'EPG',
-                'Refresh {} EPG'.format(self.namespace),
-                'daily',
-                timeofday=sched_epg
-                )
diff --git a/plugins/provider_video_xumo/lib/xumo_instance.py b/plugins/provider_video_xumo/lib/xumo_instance.py
deleted file mode 100644
index bc8f64b..0000000
--- a/plugins/provider_video_xumo/lib/xumo_instance.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""
-MIT License
-
-Copyright (C) 2021 ROCKY4546
-https://github.com/rocky4546
-
-This file is part of Cabernet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software
-and associated documentation files (the "Software"), to deal in the Software without restriction,
-including without limitation the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
-is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or
-substantial portions of the Software.
-"""
-
-import logging
-
-import lib.common.utils as utils
-import lib.common.exceptions as exceptions
-from lib.plugins.plugin_instance_obj import PluginInstanceObj
-
-from .channels import Channels
-from .epg import EPG
-
-
-class XUMOInstance(PluginInstanceObj):
-
-    def __init__(self, _xumo, _instance):
-        super().__init__(_xumo, _instance)
-        if not self.config_obj.data[_xumo.name.lower()]['enabled']:
-            return
-        if not self.config_obj.data[self.config_section]['enabled']:
-            return
-
-        self.channels = Channels(self)
-        self.epg = EPG(self)
diff --git a/plugins/provider_video_xumo/plugin.json b/plugins/provider_video_xumo/plugin.json
deleted file mode 100644
index 4b530e7..0000000
--- a/plugins/provider_video_xumo/plugin.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "id": "provider_video_xumo",
-    "name": "XUMO",
-    "version": "0.9.0",
-    "provider-name": "rocky4546",
-    "summary": "Xumo.TV brings you the best content from digital networks",
-    "description": "Xumo.TV brings you the best content from digital networks, presented just like the channels on your TV and mobile devices, only with more cool features.",
-    "category": ["video"],
-    "license": "MIT License, Copyright (C) 2021 ROCKY4546",
-    "source": "https://github.com/cabernetwork/cabernet",
-    "forum": "https://tvheadend.org/boards/5/topics/43052",
-    "website": "https://www.xumo.tv/",
-    "icon": "resources/images/icon.png",
-    "fanart": "resources/images/fanart.png"
-}
diff --git a/plugins/provider_video_xumo/resources/LICENSE b/plugins/provider_video_xumo/resources/LICENSE
deleted file mode 100644
index 73176c5..0000000
--- a/plugins/provider_video_xumo/resources/LICENSE
+++ /dev/null
@@ -1,4 +0,0 @@
-Creative Commons Attribution 4.0 License (CC-BY)
-
-Images for this application are licensed under a Creative Commons Attribution 4.0 License (CC-BY)
-To view a copy of this license, visit https://creativecommons.org/licenses/by/4.0/legalcode
diff --git a/plugins/provider_video_xumo/resources/fanart.png b/plugins/provider_video_xumo/resources/fanart.png
deleted file mode 100644
index efbbb21..0000000
Binary files a/plugins/provider_video_xumo/resources/fanart.png and /dev/null differ
diff --git a/plugins/provider_video_xumo/resources/icon.png b/plugins/provider_video_xumo/resources/icon.png
deleted file mode 100644
index 12bcbb6..0000000
Binary files a/plugins/provider_video_xumo/resources/icon.png and /dev/null differ
diff --git a/plugins_ext/README.txt b/plugins_ext/README.txt
deleted file mode 100755
index 8a12bb5..0000000
--- a/plugins_ext/README.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-This is the folder where external plugins are kept.
-This folder is not backed up as part of the Cabernet backups.
-
diff --git a/plugins_ext/__init__.py b/plugins_ext/__init__.py
deleted file mode 100755
index 3740447..0000000
--- a/plugins_ext/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-# location to install plugins
diff --git a/requirements.txt b/requirements.txt
index 0d38bc5..686bd75 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1 +1,3 @@
 cryptography
+httpx[http2]
+streamlink
diff --git a/tvh_main.py b/tvh_main.py
index b84c8e8..5e0c686 100644
--- a/tvh_main.py
+++ b/tvh_main.py
@@ -1,10 +1,28 @@
 #!/usr/bin/env python3
+"""
+MIT License
+
+Copyright (C) 2023 ROCKY4546
+https://github.com/rocky4546
+
+This file is part of Cabernet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+and associated documentation files (the "Software"), to deal in the Software without restriction,
+including without limitation the rights to use, copy, modify, merge, publish, distribute,
+sublicense, and/or sell copies of the Software, and to permit persons to whom the Software
+is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or
+substantial portions of the Software.
+"""
+
 import os
 import sys
 from inspect import getsourcefile
 
-if sys.version_info.major == 2 or sys.version_info < (3, 7):
-    print('Error: cabernet requires python 3.7+.')
+if sys.version_info.major == 2 or sys.version_info < (3, 8):
+    print('Error: cabernet requires python 3.8+.')
     sys.exit(1)
 
 from lib import main