diff --git a/changedetectionio/fetch_site_status.py b/changedetectionio/fetch_site_status.py
index ff9c12e3..5081205f 100644
--- a/changedetectionio/fetch_site_status.py
+++ b/changedetectionio/fetch_site_status.py
@@ -92,6 +92,10 @@ class perform_site_check():
 
         # Pluggable content fetcher
         prefer_backend = watch.get_fetch_backend
+        # @todo move this to Watch model get_fetch_backend
+        if not prefer_backend:
+            prefer_backend =  self.datastore.data['settings']['application']['fetch_backend']
+
         if hasattr(content_fetcher, prefer_backend):
             klass = getattr(content_fetcher, prefer_backend)
         else:
diff --git a/changedetectionio/static/images/gradient-border.png b/changedetectionio/static/images/gradient-border.png
index cbc1d03e..4c7705f8 100644
Binary files a/changedetectionio/static/images/gradient-border.png and b/changedetectionio/static/images/gradient-border.png differ
diff --git a/changedetectionio/store.py b/changedetectionio/store.py
index 07e07835..2d190402 100644
--- a/changedetectionio/store.py
+++ b/changedetectionio/store.py
@@ -171,14 +171,6 @@ class ChangeDetectionStore:
 
     @property
     def data(self):
-        has_unviewed = False
-        for uuid, watch in self.__data['watching'].items():
-            # #106 - Be sure this is None on empty string, False, None, etc
-            # Default var for fetch_backend
-            # @todo this may not be needed anymore, or could be easily removed
-            if not self.__data['watching'][uuid]['fetch_backend']:
-                self.__data['watching'][uuid]['fetch_backend'] = self.__data['settings']['application']['fetch_backend']
-
         # Re #152, Return env base_url if not overriden, @todo also prefer the proxy pass url
         env_base_url = os.getenv('BASE_URL','')
         if not self.__data['settings']['application']['base_url']: