diff --git a/README.md b/README.md
index 7e029dc..5a9c9c0 100644
--- a/README.md
+++ b/README.md
@@ -5,44 +5,44 @@ My hope is to make this the dockerized version of AtoMiC Toolkit. To start off,
 
 # FRONTENDS
 
-Portainer - WebUI for Containers<br/>
-Organizer - Unified HTPC/Home Server Web Interface
+[Portainer](https://portainer.io/) - WebUI for Containers<br/>
+[Organizr](https://github.com/causefx/Organizr) - Unified HTPC/Home Server Web Interface
 
 # DOCKER RELATED
 
-Watchtower - Automatic Update of Containers/Apps
+[Watchtower](https://github.com/v2tec/watchtower) - Automatic Update of Containers/Apps
 
 # SMART HOME APPS
 
-Home Assistant - Smart Home Hub
+[Home Assistant](https://www.home-assistant.io/) - Smart Home Hub
 
 # DOWNLOADERS #
 
-Transmission with VPN – Bittorrent Downloader<br/>
-qBittorrent without VPN – Bittorrent Downloader (Alternative)<br/>
-SABnzbd – Usenet (NZB) Downloader<br/>
-NZBGet – Usenet (NZB) Downloader (Alternative)<br/>
+[Transmission with VPN](https://github.com/haugene/docker-transmission-openvpn) – Bittorrent Downloader<br/>
+[qBittorrent without VPN](https://hub.docker.com/r/linuxserver/qbittorrent/) – Bittorrent Downloader (Alternative)<br/>
+[SABnzbd](https://hub.docker.com/r/linuxserver/sabnzbd/) – Usenet (NZB) Downloader<br/>
+[NZBGet](https://hub.docker.com/r/linuxserver/nzbget/) – Usenet (NZB) Downloader (Alternative)<br/>
 
 # PERSONAL VIDEO RECORDERS
 
-Radarr – Movie Download and Management<br/>
-CouchPotato – Movie Download and Management (Alternative)<br/>
-Sonarr – TV Show Download and Management<br/>
-SickRage – TV Show Download and Management (Alternative)<br/>
+[Radarr](https://radarr.video/) – Movie Download and Management<br/>
+[CouchPotato](https://couchpota.to/) – Movie Download and Management (Alternative)<br/>
+[Sonarr](https://sonarr.tv/) – TV Show Download and Management<br/>
+[SickRage](https://sickrage.github.io/) – TV Show Download and Management (Alternative)<br/>
 
 # MEDIA SERVER APPS
 
-Plex Media Server<br/>
-Tautulli (aka PlexPy) – Monitoring Plex Usage<br/>
-Ombi – Accept Requests for your Media Server<br/>
+[Plex Media Server](https://www.plex.tv/) - Organize and Stream your Media to any device<br/>
+[Tautulli](https://tautulli.com/) (aka PlexPy) – Monitoring Plex Usage<br/>
+[Ombi](https://github.com/tidusjar/Ombi) – Accept Requests for your Media Server<br/>
 
 # SEARCHERS
 
-NZBHydra – NZB Meta Search<br/>
-Jackett – Torrent Proxy
+[NZBHydra](https://github.com/theotherp/nzbhydra) – NZB Meta Search<br/>
+[Jackett](https://github.com/Jackett/Jackett) – Torrent Proxy
 
 # UTILITIES
 
-MariaDB – Database Server for your Apps<br/>
-NextCloud – Your Own Cloud Storage
+[MariaDB](https://mariadb.org/) – Database Server for your Apps<br/>
+[NextCloud](https://nextcloud.com/) – Your Own Cloud Storage
 
diff --git a/docker-compose-basic.yml b/docker-compose-basic.yml
index 7081f13..d20ce3a 100644
--- a/docker-compose-basic.yml
+++ b/docker-compose-basic.yml
@@ -11,7 +11,7 @@ services:
     image: portainer/portainer
     hostname: portainer
     container_name: portainer
-    restart: always
+    restart: unless-stopped
     command: -H unix:///var/run/docker.sock
     ports:
       - "XXXX:9000"
@@ -26,7 +26,7 @@ services:
   organizr:
     container_name: organizr
     hostname: organizr
-    restart: always
+    restart: unless-stopped
     image: lsiocommunity/organizr
     volumes:
       - ${USERDIR}/docker/organizr:/config
@@ -43,7 +43,7 @@ services:
     hostname: phpmyadmin
     container_name: phpmyadmin
     image: phpmyadmin/phpmyadmin
-    restart: always
+    restart: unless-stopped
     links:
       - mariadb:db
     ports:
@@ -58,7 +58,7 @@ services:
   watchtower:
     container_name: watchtower
     hostname: watchtower
-    restart: always
+    restart: unless-stopped
     image: v2tec/watchtower
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
@@ -70,7 +70,7 @@ services:
   homeassistant:
     container_name: homeassistant
     hostname: hass
-    restart: always
+    restart: unless-stopped
     image: homeassistant/home-assistant
     devices:
       - /dev/ttyUSB0:/dev/ttyUSB0
@@ -99,7 +99,7 @@ services:
       - NET_ADMIN
     devices:
       - /dev/net/tun
-    restart: always
+    restart: unless-stopped
     ports:
     - "XXXX:9091"
     dns:
@@ -155,7 +155,7 @@ services:
       - "XXXX:XXXX"
       - "6881:6881"
       - "6881:6881/udp"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -175,7 +175,7 @@ services:
       - ${USERDIR}/docker/shared:/shared
     ports:
         - "XXXX:8080"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -193,7 +193,7 @@ services:
       - ${USERDIR}/docker/shared:/shared
     ports:
       - "XXXX:6789"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -215,7 +215,7 @@ services:
       - ${USERDIR}/docker/shared:/shared
     ports:
       - "XXXX:7878"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -233,7 +233,7 @@ services:
       - ${USERDIR}/docker/shared:/shared
     ports:
       - "XXXX:5050"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -253,7 +253,7 @@ services:
       - ${USERDIR}/docker/shared:/shared
     ports:
         - "XXXX:8989"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -272,7 +272,7 @@ services:
       - ${USERDIR}/docker/shared:/shared
     ports:
       - "XXXX:8686"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -290,7 +290,7 @@ services:
       - ${USERDIR}/docker/shared:/shared
     ports:
       - "XXXX:8081"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -302,7 +302,7 @@ services:
   plexms:
     container_name: plexms
     hostname: plexms
-    restart: always
+    restart: unless-stopped
     image: plexinc/pms-docker
     volumes:
       - ${USERDIR}/docker/plexms:/config
@@ -331,7 +331,7 @@ services:
   tautulli:
     container_name: tautulli
     hostname: tautulli
-    restart: always
+    restart: unless-stopped
     image: linuxserver/tautulli
     volumes:
       - ${USERDIR}/docker/tautulli/config:/config
@@ -348,7 +348,7 @@ services:
   ombi:
     container_name: ombi
     hostname: ombi
-    restart: always
+    restart: unless-stopped
     image: linuxserver/ombi
     volumes:
       - ${USERDIR}/docker/ombi:/config
@@ -373,7 +373,7 @@ services:
       - ${USERDIR}/docker/shared:/shared
     ports:
       - "XXXX:5075"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -391,7 +391,7 @@ services:
       - ${USERDIR}/docker/shared:/shared
     ports:
       - "XXXX:9117"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -411,7 +411,7 @@ services:
         published: 3306
         protocol: tcp
         mode: host
-    restart: always
+    restart: unless-stopped
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - PUID=${PUID}
@@ -422,7 +422,7 @@ services:
   nextcloud:
     container_name: nextcloud
     hostname: nextcloud
-    restart: always
+    restart: unless-stopped
     image: linuxserver/nextcloud
     volumes:
       - ${USERDIR}/docker/nextcloud:/config
diff --git a/docker-compose-traefik.yml b/docker-compose-traefik.yml
index 46b621f..d554da7 100644
--- a/docker-compose-traefik.yml
+++ b/docker-compose-traefik.yml
@@ -12,7 +12,7 @@ services:
     hostname: traefik
     image: traefik:latest
     container_name: traefik
-    restart: always
+    restart: unless-stopped
     domainname: ${DOMAINNAME}
     networks:
       - default
@@ -49,7 +49,7 @@ services:
   portainer:
     image: portainer/portainer
     container_name: portainer
-    restart: always
+    restart: unless-stopped
     command: -H unix:///var/run/docker.sock
 #    ports:
 #      - "XXXX:9000"
@@ -81,7 +81,7 @@ services:
 # Organizer - Unified HTPC/Home Server Web Interface
   organizr:
     container_name: organizr
-    restart: always
+    restart: unless-stopped
     image: lsiocommunity/organizr
     volumes:
       - ${USERDIR}/docker/organizr:/config
@@ -116,7 +116,7 @@ phpmyadmin:
     hostname: phpmyadmin
     container_name: phpmyadmin
     image: phpmyadmin/phpmyadmin
-    restart: always
+    restart: unless-stopped
     links:
       - mariadb:db
 #    ports:
@@ -149,7 +149,7 @@ phpmyadmin:
   watchtower:
     container_name: watchtower
     hostname: watchtower
-    restart: always
+    restart: unless-stopped
     image: v2tec/watchtower
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
@@ -160,7 +160,7 @@ phpmyadmin:
 # Home Assistant - Smart Home Hub
   homeassistant:
     container_name: homeassistant
-    restart: always
+    restart: unless-stopped
     image: homeassistant/home-assistant
     devices:
       - /dev/ttyUSB0:/dev/ttyUSB0
@@ -206,7 +206,7 @@ phpmyadmin:
       - NET_ADMIN
     devices:
       - /dev/net/tun
-    restart: always
+    restart: unless-stopped
 #    ports:
 #    - "XXXX:9091"
     dns:
@@ -267,7 +267,7 @@ phpmyadmin:
 #      - "XXXX:8080"
       - "6881:6881"
       - "6881:6881/udp"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -303,7 +303,7 @@ phpmyadmin:
       - ${USERDIR}/docker/shared:/shared
 #    ports:
 #        - "XXXX:8080"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -341,7 +341,7 @@ phpmyadmin:
       - ${USERDIR}/docker/shared:/shared
 #    ports:
 #      - "XXXX:7878"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -377,7 +377,7 @@ phpmyadmin:
       - ${USERDIR}/docker/shared:/shared
 #    ports:
 #        - "XXXX:8989"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -414,7 +414,7 @@ phpmyadmin:
       - ${USERDIR}/docker/shared:/shared
 #    ports:
 #      - "XXXX:8686"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -443,7 +443,7 @@ phpmyadmin:
 # Plex Media Server
   plexms:
     container_name: plexms
-    restart: always
+    restart: unless-stopped
     image: plexinc/pms-docker
     volumes:
       - ${USERDIR}/docker/plexms:/config
@@ -489,7 +489,7 @@ phpmyadmin:
 # Tautulli (aka PlexPy) – Monitoring Plex Usage
   tautulli:
     container_name: tautulli
-    restart: always
+    restart: unless-stopped
     image: linuxserver/tautulli
     volumes:
       - ${USERDIR}/docker/tautulli/config:/config
@@ -523,7 +523,7 @@ phpmyadmin:
 # Ombi – Accept Requests for your Media Server
   ombi:
     container_name: ombi
-    restart: always
+    restart: unless-stopped
     image: linuxserver/ombi
     volumes:
       - ${USERDIR}/docker/ombi:/config
@@ -565,7 +565,7 @@ phpmyadmin:
       - ${USERDIR}/docker/shared:/shared
 #    ports:
 #      - "XXXX:5075"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -600,7 +600,7 @@ phpmyadmin:
       - ${USERDIR}/docker/shared:/shared
 #    ports:
 #      - "XXXX:9117"
-    restart: always
+    restart: unless-stopped
     environment:
       - PUID=${PUID}
       - PGID=${PGID}
@@ -638,7 +638,7 @@ phpmyadmin:
         published: 3306
         protocol: tcp
         mode: host
-    restart: always
+    restart: unless-stopped
     environment:
       - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
       - PUID=${PUID}
@@ -648,7 +648,7 @@ phpmyadmin:
 # NextCloud – Your Own Cloud Storage
   nextcloud:
     container_name: nextcloud
-    restart: always
+    restart: unless-stopped
     image: linuxserver/nextcloud
     volumes:
       - ${USERDIR}/docker/nextcloud:/config
diff --git a/docker-compose-unifi-traefik.yml b/docker-compose-unifi-traefik.yml
index 65a2a5c..c7febb1 100644
--- a/docker-compose-unifi-traefik.yml
+++ b/docker-compose-unifi-traefik.yml
@@ -4,7 +4,7 @@ services:
   unifi:
     hostname: unifi
     image: linuxserver/unifi:latest
-    restart: always
+    restart: unless-stopped
     container_name: "unifi"
     volumes:
       - ${USERDIR}/docker/unifi:/config