diff --git a/src/csui/Popup.vue b/src/csui/Popup.vue
index 5a4fd0a..28ad3e9 100644
--- a/src/csui/Popup.vue
+++ b/src/csui/Popup.vue
@@ -121,13 +121,13 @@ import PopupVideoSettings from './src/popup/panels/PopupVideoSettings.vue'
 import AboutPanel from '@csui/src/popup/panels/AboutPanel.vue'
 import Debug from '../ext/conf/Debug';
 import BrowserDetect from '../ext/conf/BrowserDetect';
-import Comms from '../ext/lib/comms/Comms';
 import CommsClient, {CommsOrigin} from '../ext/lib/comms/CommsClient';
 import Settings from '../ext/lib/Settings';
-import Logger from '../ext/lib/Logger';
 import EventBus from '../ext/lib/EventBus';
 import {ChromeShittinessMitigations as CSM} from '../common/js/ChromeShittinessMitigations';
 import SupportLevelIndicator from '@csui/src/components/SupportLevelIndicator.vue'
+import { LogAggregator } from '@src/ext/lib/logging/LogAggregator';
+import { ComponentLogger } from '@src/ext/lib/logging/ComponentLogger';
 
 export default {
   components: {
@@ -148,6 +148,7 @@ export default {
       settingsInitialized: false,
       narrowPopup: null,
       sideMenuVisible: null,
+      logAggregator: undefined,
       logger: undefined,
       site: undefined,
       siteSettings: undefined,
@@ -173,7 +174,8 @@ export default {
   },
   async created() {
     try {
-      this.logger = new Logger();
+      this.logAggregator = new LogAggregator('🔵ext-popup🔵');
+      this.logger = new ComponentLogger(this.logAggregator, 'Popup');
       await this.logger.init({
           allowLogging: true,
       });
diff --git a/src/csui/iframes/notification/Notification.vue b/src/csui/iframes/notification/Notification.vue
index 608a55a..e677aa1 100644
--- a/src/csui/iframes/notification/Notification.vue
+++ b/src/csui/iframes/notification/Notification.vue
@@ -23,7 +23,7 @@
 </template>
 
 <script>
-import Logger from '../../../ext/lib/Logger';
+
 
 export default {
   components: {
diff --git a/src/csui/src/PlayerUiPanels/DebugPanel.vue b/src/csui/src/PlayerUiPanels/DebugPanel.vue
index 2128601..37d0de7 100644
--- a/src/csui/src/PlayerUiPanels/DebugPanel.vue
+++ b/src/csui/src/PlayerUiPanels/DebugPanel.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import Logger, { baseLoggingOptions } from '../../../ext/lib/Logger';
+import { LogAggregator } from '@src/ext/lib/logging/LogAggregator';
 import JsonEditor from '@csui/src/components/JsonEditor';
 
 export default {
@@ -86,14 +86,14 @@ export default {
       this.lastSettings = baseLoggingOptions;
     },
     async getLoggerSettings() {
-      this.lastSettings = await Logger.getConfig() || baseLoggingOptions;
+      this.lastSettings = await LogAggregator.getConfig() || baseLoggingOptions;
     },
     saveLoggerSettings() {
-      Logger.saveConfig({...this.lastSettings});
+      LogAggregator.saveConfig({...this.lastSettings});
     },
     async startLogging(){
       this.logStringified = undefined;
-      await Logger.saveConfig({...this.lastSettings, allowLogging: true});
+      await LogAggregator.saveConfig({...this.lastSettings, allowLogging: true});
       window.location.reload();
     },
   }
diff --git a/src/ext/UWContent.ts b/src/ext/UWContent.ts
index d323496..9bddd3f 100644
--- a/src/ext/UWContent.ts
+++ b/src/ext/UWContent.ts
@@ -1,16 +1,12 @@
-import { BLANK_LOGGER_CONFIG, LogAggregator } from './lib/logging/LogAggregator';
 import Debug from './conf/Debug';
-import ExtensionMode from '../common/enums/ExtensionMode.enum';
 import Settings from './lib/Settings';
-import Comms from './lib/comms/Comms';
 import CommsClient from './lib/comms/CommsClient';
 import PageInfo from './lib/video-data/PageInfo';
-import Logger, { baseLoggingOptions } from './lib/Logger';
-import UWGlobals from './lib/UWGlobals';
 import EventBus from './lib/EventBus';
 import KeyboardHandler from './lib/kbm/KeyboardHandler';
 import { SiteSettings } from './lib/settings/SiteSettings';
 import UI from './lib/uwui/UI';
+import { BLANK_LOGGER_CONFIG, LogAggregator } from './lib/logging/LogAggregator';
 import { ComponentLogger } from './lib/logging/ComponentLogger';
 
 export default class UWContent {
diff --git a/src/ext/UWServer.ts b/src/ext/UWServer.ts
index 98aca12..072bb78 100644
--- a/src/ext/UWServer.ts
+++ b/src/ext/UWServer.ts
@@ -1,12 +1,11 @@
-import { BLANK_LOGGER_CONFIG, LogAggregator } from './lib/logging/LogAggregator';
 import Debug from './conf/Debug.js';
 import BrowserDetect from './conf/BrowserDetect';
 import CommsServer from './lib/comms/CommsServer';
 import Settings from './lib/Settings';
-import Logger, { baseLoggingOptions } from './lib/Logger';
 import { sleep } from '../common/js/utils';
 import EventBus, { EventBusCommand } from './lib/EventBus';
 import { ComponentLogger } from './lib/logging/ComponentLogger';
+import { BLANK_LOGGER_CONFIG, LogAggregator } from './lib/logging/LogAggregator';
 
 
 const BASE_LOGGING_STYLES = {
diff --git a/src/ext/lib/Settings.ts b/src/ext/lib/Settings.ts
index 1020632..4867114 100644
--- a/src/ext/lib/Settings.ts
+++ b/src/ext/lib/Settings.ts
@@ -1,14 +1,8 @@
 import Debug from '../conf/Debug';
-import currentBrowser from '../conf/BrowserDetect';
 import ExtensionConf from '../conf/ExtensionConf';
-import ExtensionMode from '../../common/enums/ExtensionMode.enum';
 import ObjectCopy from './ObjectCopy';
 import StretchType from '../../common/enums/StretchType.enum';
-import VideoAlignmentType from '../../common/enums/VideoAlignmentType.enum';
 import ExtensionConfPatch from '../conf/ExtConfPatches';
-import CropModePersistence from '../../common/enums/CropModePersistence.enum';
-import BrowserDetect from '../conf/BrowserDetect';
-import Logger from './Logger';
 import SettingsInterface from '../../common/interfaces/SettingsInterface';
 import AspectRatioType from '../../common/enums/AspectRatioType.enum';
 import { SiteSettings } from './settings/SiteSettings';
diff --git a/src/ext/lib/aard/Aard.ts b/src/ext/lib/aard/Aard.ts
index 541ded1..c1ac931 100644
--- a/src/ext/lib/aard/Aard.ts
+++ b/src/ext/lib/aard/Aard.ts
@@ -3,7 +3,6 @@ import ExtensionMode from '@src/common/enums/ExtensionMode.enum';
 import { ArVariant } from '@src/common/interfaces/ArInterface';
 import { ExtensionEnvironment } from '@src/common/interfaces/SettingsInterface';
 import EventBus from '../EventBus';
-import Logger from '../Logger';
 import Settings from '../Settings';
 import { SiteSettings } from '../settings/SiteSettings';
 import VideoData from '../video-data/VideoData';
diff --git a/src/ext/lib/comms/CommsClient.ts b/src/ext/lib/comms/CommsClient.ts
index d4b2c21..8cfd77b 100644
--- a/src/ext/lib/comms/CommsClient.ts
+++ b/src/ext/lib/comms/CommsClient.ts
@@ -1,7 +1,4 @@
-import Debug from '../../conf/Debug';
 import BrowserDetect from '../../conf/BrowserDetect';
-import Logger from '../Logger';
-import Settings from '../Settings';
 import EventBus, { EventBusContext } from '../EventBus';
 import { ComponentLogger } from '../logging/ComponentLogger';
 import { LogAggregator } from '../logging/LogAggregator';
diff --git a/src/ext/lib/comms/CommsServer.ts b/src/ext/lib/comms/CommsServer.ts
index 9fb25a7..7e89307 100644
--- a/src/ext/lib/comms/CommsServer.ts
+++ b/src/ext/lib/comms/CommsServer.ts
@@ -1,10 +1,5 @@
 import { ComponentLogger } from './../logging/ComponentLogger';
-import { EventBusContext } from './../EventBus';
-import Debug from '../../conf/Debug';
-import BrowserDetect from '../../conf/BrowserDetect';
-import Logger from '../Logger';
 import Settings from '../Settings';
-import ExtensionMode from '../../../common/enums/ExtensionMode.enum';
 import EventBus from '../EventBus';
 import { CommsOrigin } from './CommsClient';
 
diff --git a/src/ext/lib/kbm/KbmBase.ts b/src/ext/lib/kbm/KbmBase.ts
index ed1eec8..a812bf1 100644
--- a/src/ext/lib/kbm/KbmBase.ts
+++ b/src/ext/lib/kbm/KbmBase.ts
@@ -1,5 +1,4 @@
 import EventBus, { EventBusCommand } from '../EventBus';
-import Logger from '../Logger';
 import { ComponentLogger } from '../logging/ComponentLogger';
 import Settings from '../Settings';
 import { SiteSettings } from '../settings/SiteSettings';
diff --git a/src/ext/lib/kbm/KeyboardHandler.ts b/src/ext/lib/kbm/KeyboardHandler.ts
index ba225de..a9110d9 100644
--- a/src/ext/lib/kbm/KeyboardHandler.ts
+++ b/src/ext/lib/kbm/KeyboardHandler.ts
@@ -1,10 +1,5 @@
-import Debug from '../../conf/Debug';
-import PlayerData from '../video-data/PlayerData';
 import ExtensionMode from '../../../common/enums/ExtensionMode.enum';
-import Logger from '../Logger';
-import PageInfo from '../video-data/PageInfo';
 import Settings from '../Settings';
-import VideoData from '../video-data/VideoData';
 import EventBus, { EventBusCommand } from '../EventBus';
 import KbmBase from './KbmBase';
 import { SiteSettings } from '../settings/SiteSettings';
diff --git a/src/ext/lib/kbm/PlayerMouseHandler.ts b/src/ext/lib/kbm/PlayerMouseHandler.ts
index a484b59..9582dd7 100644
--- a/src/ext/lib/kbm/PlayerMouseHandler.ts
+++ b/src/ext/lib/kbm/PlayerMouseHandler.ts
@@ -1,6 +1,5 @@
 import { LogAggregator } from './../logging/LogAggregator';
 import EventBus, { EventBusCommand } from '../EventBus';
-import Logger from '../Logger';
 import { ComponentLogger } from '../logging/ComponentLogger';
 import Settings from '../Settings';
 import { SiteSettings } from '../settings/SiteSettings';
diff --git a/src/ext/lib/video-data/PageInfo.ts b/src/ext/lib/video-data/PageInfo.ts
index 8ff1991..c1e1df3 100644
--- a/src/ext/lib/video-data/PageInfo.ts
+++ b/src/ext/lib/video-data/PageInfo.ts
@@ -1,11 +1,6 @@
-import Debug from '../../conf/Debug';
 import VideoData from './VideoData';
 import RescanReason from './enums/RescanReason.enum';
-import AspectRatioType from '../../../common/enums/AspectRatioType.enum';
-import CropModePersistence from '../../../common/enums/CropModePersistence.enum';
-import Logger from '../Logger';
 import Settings from '../Settings';
-import ExtensionMode from '../../../common/enums/ExtensionMode.enum';
 import CommsClient from '../comms/CommsClient';
 import EventBus from '../EventBus';
 import { SiteSettings } from '../settings/SiteSettings';
diff --git a/src/ext/lib/video-data/PlayerData.ts b/src/ext/lib/video-data/PlayerData.ts
index 24f36ff..1bb6fab 100644
--- a/src/ext/lib/video-data/PlayerData.ts
+++ b/src/ext/lib/video-data/PlayerData.ts
@@ -1,13 +1,9 @@
 import Debug from '../../conf/Debug';
 import ExtensionMode from '../../../common/enums/ExtensionMode.enum'
-import AspectRatioType from '../../../common/enums/AspectRatioType.enum';
 import PlayerNotificationUi from '../uwui/PlayerNotificationUI';
-import BrowserDetect from '../../conf/BrowserDetect';
 import * as _ from 'lodash';
 import { sleep } from '../../../common/js/utils';
 import VideoData from './VideoData';
-import Settings from '../Settings';
-import Logger from '../Logger';
 import EventBus from '../EventBus';
 import UI from '../uwui/UI';
 import { SiteSettings } from '../settings/SiteSettings';
diff --git a/src/ext/lib/video-data/VideoData.ts b/src/ext/lib/video-data/VideoData.ts
index 94fc4c2..03e704d 100644
--- a/src/ext/lib/video-data/VideoData.ts
+++ b/src/ext/lib/video-data/VideoData.ts
@@ -1,11 +1,7 @@
-import Debug from '../../conf/Debug';
 import PlayerData from './PlayerData';
 import Resizer from '../video-transform/Resizer';
-import AspectRatioType from '../../../common/enums/AspectRatioType.enum';
-import CropModePersistence from '../../../common/enums/CropModePersistence.enum';
 import * as _ from 'lodash';
 import BrowserDetect from '../../conf/BrowserDetect';
-import Logger from '../Logger';
 import Settings from '../Settings';
 import PageInfo from './PageInfo';
 import { sleep } from '../../../common/js/utils';
diff --git a/src/ext/lib/video-transform/Resizer.ts b/src/ext/lib/video-transform/Resizer.ts
index 2184a2c..28cb523 100644
--- a/src/ext/lib/video-transform/Resizer.ts
+++ b/src/ext/lib/video-transform/Resizer.ts
@@ -3,15 +3,9 @@ import Debug from '../../conf/Debug';
 import Scaler, { CropStrategy, VideoDimensions } from './Scaler';
 import Stretcher from './Stretcher';
 import Zoom from './Zoom';
-import PlayerData from '../video-data/PlayerData';
-import ExtensionMode from '../../../common/enums/ExtensionMode.enum';
 import StretchType from '../../../common/enums/StretchType.enum';
 import VideoAlignmentType from '../../../common/enums/VideoAlignmentType.enum';
 import AspectRatioType from '../../../common/enums/AspectRatioType.enum';
-import CropModePersistance from '../../../common/enums/CropModePersistence.enum';
-import { sleep } from '../Util';
-import Logger from '../Logger';
-import siteSettings from '../Settings';
 import VideoData from '../video-data/VideoData';
 import EventBus from '../EventBus';
 import { _cp } from '../../../common/js/utils';
diff --git a/src/ext/lib/video-transform/Scaler.ts b/src/ext/lib/video-transform/Scaler.ts
index 565bdcb..746ac07 100644
--- a/src/ext/lib/video-transform/Scaler.ts
+++ b/src/ext/lib/video-transform/Scaler.ts
@@ -1,8 +1,5 @@
-import Debug from '../../conf/Debug';
 import AspectRatioType from '../../../common/enums/AspectRatioType.enum';
-import BrowserDetect from '../../conf/BrowserDetect';
 import VideoData from '../video-data/VideoData';
-import Logger from '../Logger';
 import { Ar, ArVariant } from '../../../common/interfaces/ArInterface';
 import { ComponentLogger } from '../logging/ComponentLogger';
 
diff --git a/src/ext/lib/video-transform/Stretcher.ts b/src/ext/lib/video-transform/Stretcher.ts
index d4fd9de..1960c7b 100644
--- a/src/ext/lib/video-transform/Stretcher.ts
+++ b/src/ext/lib/video-transform/Stretcher.ts
@@ -1,9 +1,6 @@
 import { SiteSettings } from './../settings/SiteSettings';
-import StretchType from '../../../common/enums/StretchType.enum';
 import BrowserDetect from '../../conf/BrowserDetect';
-import AspectRatioType from '../../../common/enums/AspectRatioType.enum';
 import VideoData from '../video-data/VideoData';
-import Logger from '../Logger';
 import Settings from '../Settings';
 import { Stretch } from '../../../common/interfaces/StretchInterface';
 import { ComponentLogger } from '../logging/ComponentLogger';