diff --git a/dashboard.py b/dashboard.py
index dc0dcd15..04cb7f15 100644
--- a/dashboard.py
+++ b/dashboard.py
@@ -1,18 +1,12 @@
 import json
-import logging
-from calendar import timegm
-from os import getenv
 from os.path import isdir, isfile, join, getsize
 from sys import platform
 import time
 
-from config import appcmdname, appname, config
+from config import config
+from EDMCLogging import get_main_logger
 
-if getenv("EDMC_NO_UI"):
-    logger = logging.getLogger(appcmdname)
-
-else:
-    logger = logging.getLogger(appname)
+logger = get_main_logger()
 
 if platform=='darwin':
     from watchdog.observers import Observer
diff --git a/hotkey.py b/hotkey.py
index 3e677851..966975a4 100644
--- a/hotkey.py
+++ b/hotkey.py
@@ -1,17 +1,12 @@
 # -*- coding: utf-8 -*-
 
-import logging
-from os import getenv
 from os.path import join
 from sys import platform
 
-from config import appcmdname, appname, config
+from config import config
+from EDMCLogging import get_main_logger
 
-if getenv("EDMC_NO_UI"):
-    logger = logging.getLogger(appcmdname)
-
-else:
-    logger = logging.getLogger(appname)
+logger = get_main_logger()
 
 if platform == 'darwin':
 
diff --git a/protocol.py b/protocol.py
index aa0ffeee..0caa6a68 100644
--- a/protocol.py
+++ b/protocol.py
@@ -1,19 +1,13 @@
 # edmc: protocol handler for cAPI authorisation
 
 
-import logging
 import threading
 import urllib.request, urllib.error, urllib.parse
 import sys
-from os import getenv
 
-from config import appname, appcmdname
+from EDMCLogging import get_main_logger
 
-if getenv("EDMC_NO_UI"):
-    logger = logging.getLogger(appcmdname)
-
-else:
-    logger = logging.getLogger(appname)
+logger = get_main_logger()
 
 if sys.platform == 'win32':
     from ctypes import *
@@ -254,7 +248,7 @@ else:	# Linux / Run from source
             else:
                 logger.debug('No thread')
 
-            logger.debug('Done')
+            logger.debug('Done.')
 
         def worker(self):
             self.httpd.serve_forever()