diff --git a/.github/config.yml b/.github/config.yml
index 71d2f6d..f5828bb 100644
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -34,14 +34,14 @@ requestInfoUserstoExclude: []
 newIssueWelcomeComment: >
   :wave: Thanks for opening your first issue here!
   If you're reporting a :bug: bug, please make sure you include steps to reproduce it.
-  Also, logs, error messages and information about your hardware might be usefull.
+  Also, logs, error messages and information about your hardware might be useful.
 
 # Configuration for new-pr-welcome - https://github.com/behaviorbot/new-pr-welcome
 
 # Comment to be posted to on PRs from first time contributors in your repository
 newPRWelcomeComment: >
-   :sparkling_heart: Thanks for opening this pull request! :sparkling_heart:
-   If your PR gets accepted and merged in, we will invite you to the project :tada:
+  :sparkling_heart: Thanks for opening this pull request! :sparkling_heart:
+  If your PR gets accepted and merged in, we will invite you to the project :tada:
 
 # Configuration for first-pr-merge - https://github.com/behaviorbot/first-pr-merge
 
diff --git a/.github/settings.yml b/.github/settings.yml
index 6479917..8f742bb 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -1,7 +1,7 @@
 ---
 repository:
-  description: "Home Panel - Community Hass.io Add-on for Home Assistant"
-  topics: home-panel, home-automation, home-assistant, hassio, hassio-addons, hass, javascript, reactjs
+  description: "Home Panel - Home Assistant Community Add-ons"
+  topics: home-panel, home-automation, home-assistant, addon, addons, javascript, reactjs
   homepage: https://addons.community
   private: false
   has_issues: true
@@ -42,10 +42,10 @@ labels:
     description: "New features or options."
   - name: "Type: Support"
     color: 5319e7
-    description: "Marks an issue as an support ticket."
+    description: "Marks an issue as a support ticket."
   - name: "Type: Discussion"
     color: d4c5f9
-    description: "Marks an issue as an generic discussion ticket."
+    description: "Marks an issue as a generic discussion ticket."
   - name: "Type: Maintenance"
     color: 2af79e
     description: "Generic maintenance tasks, e.g., package updates."
@@ -53,13 +53,13 @@ labels:
   # Additional markers
   - name: "Security"
     color: ee0701
-    description: "Marks an security issues that needs to be resolved asap."
+    description: "Marks a security issue that needs to be resolved asap."
   - name: "Idea"
     color: fef2c0
     description: "Marks an idea, which might be excepted and implemented."
   - name: "Incomplete"
     color: fef2c0
-    description: "Marks an PR or issue that is missing information."
+    description: "Marks a PR or issue that is missing information."
   - name: "Pull request"
     color: fbca04
     description: "There is an PR opened for this issue."
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ddf68a2..efc8e6f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,8 +8,8 @@ variables:
 
   ADDON_LEGACY_TAGS: "true"
 
-  ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:6.0.1"
-  ADDON_AMD64_BASE: "hassioaddons/base-amd64:6.0.1"
-  ADDON_ARMHF_BASE: "hassioaddons/base-armhf:6.0.1"
-  ADDON_ARMV7_BASE: "hassioaddons/base-armv7:6.0.1"
-  ADDON_I386_BASE: "hassioaddons/base-i386:6.0.1"
+  ADDON_AARCH64_BASE: "hassioaddons/base-aarch64:7.0.2"
+  ADDON_AMD64_BASE: "hassioaddons/base-amd64:7.0.2"
+  ADDON_ARMHF_BASE: "hassioaddons/base-armhf:7.0.2"
+  ADDON_ARMV7_BASE: "hassioaddons/base-armv7:7.0.2"
+  ADDON_I386_BASE: "hassioaddons/base-i386:7.0.2"
diff --git a/README.md b/README.md
index b5d4d00..970e8af 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 
 [![GitHub Release][releases-shield]][releases]
 ![Project Stage][project-stage-shield]
@@ -40,7 +40,7 @@ A web frontend for controlling the home. Integrates with
 ## Installation
 
 The installation of this add-on is pretty straightforward and not different in
-comparison to installing any other Hass.io add-on.
+comparison to installing any other Home Assistant add-on.
 
 1. [Add our Hass.io add-ons repository][repository] to your Hass.io instance.
 1. Install the "Home Panel" add-on.
@@ -61,13 +61,11 @@ comparison to installing any other Hass.io add-on.
 
 Example add-on configuration:
 
-```json
-{
-    "log_level": "info",
-    "ssl": true,
-    "certfile": "fullchain.pem",
-    "keyfile": "privkey.pem"
-}
+```yaml
+log_level: info
+ssl: true
+certfile: fullchain.pem
+keyfile: privkey.pem
 ```
 
 ### Option: `log_level`
@@ -97,13 +95,13 @@ Enables/Disables SSL (HTTPS) on the app. Set it `true` to enable it,
 
 The certificate file to use for SSL.
 
-**Note**: _The file MUST be stored in `/ssl/`, which is default for Hass.io_
+**Note**: _The file MUST be stored in `/ssl/`, which is the default_
 
 ### Option: `keyfile`
 
 The private key file to use for SSL.
 
-**Note**: _The file MUST be stored in `/ssl/`, which is default for Hass.io_
+**Note**: _The file MUST be stored in `/ssl/`, which is the default_
 
 ## Changelog & Releases
 
@@ -125,7 +123,7 @@ Got questions?
 
 You have several options to get them answered:
 
-- The [Community Hass.io Add-ons Discord chat server][discord] for add-on
+- The [Home Assistant Community Add-ons Discord chat server][discord] for add-on
   support and feature requests.
 - The [Home Assistant Discord chat server][discord-ha] for general Home
   Assistant discussions and questions.
@@ -151,11 +149,11 @@ The original setup of this repository is by [Timmo][timmo].
 For a full list of all authors and contributors,
 check [the contributor's page][contributors].
 
-## We have got some Hass.io add-ons for you
+## We have got some Home Assistant add-ons for you
 
-Want some more functionality to your Hass.io Home Assistant instance?
+Want some more functionality to your Home Assistant instance?
 
-We have created multiple add-ons for Hass.io. For a full list, check out
+We have created multiple add-ons for Home Assistant. For a full list, check out
 our [GitHub Repository][repository].
 
 ## License
diff --git a/home-panel/.README.j2 b/home-panel/.README.j2
index ce6337d..764fee3 100644
--- a/home-panel/.README.j2
+++ b/home-panel/.README.j2
@@ -1,4 +1,4 @@
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 
 [![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
 
@@ -25,8 +25,8 @@ A web frontend for controlling the home. Integrates with
 {% if channel == "edge" %}
 ## WARNING! THIS IS AN EDGE VERSION!
 
-This Hass.io Add-ons repository contains edge builds of add-ons. Edge builds
-add-ons are based upon the latest development version.
+This Home Assistant Add-ons repository contains edge builds of add-ons.
+Edge builds add-ons are based upon the latest development version.
 
 - They may not work at all.
 - They might stop working at any time.
@@ -46,7 +46,7 @@ If you are more interested in stable releases of our add-ons:
 {% if channel == "beta" %}
 ## WARNING! THIS IS A BETA VERSION!
 
-This Hass.io Add-ons repository contains beta releases of add-ons.
+This Home Assistant Add-ons repository contains beta releases of add-ons.
 
 - They might stop working at any time.
 - They could have a negative impact on your system.
diff --git a/home-panel/Dockerfile b/home-panel/Dockerfile
index a307574..690507d 100755
--- a/home-panel/Dockerfile
+++ b/home-panel/Dockerfile
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/base:6.0.1
+ARG BUILD_FROM=hassioaddons/base:7.0.2
 # hadolint ignore=DL3006
 FROM ${BUILD_FROM}
 
@@ -57,4 +57,4 @@ LABEL \
     org.label-schema.usage="https://github.com/hassio-addons/addon-home-panel/tree/master/README.md" \
     org.label-schema.vcs-ref=${BUILD_REF} \
     org.label-schema.vcs-url="https://github.com/hassio-addons/addon-home-panel" \
-    org.label-schema.vendor="Community Hass.io Add-ons"
+    org.label-schema.vendor="Home Assistant Community Add-ons"
diff --git a/home-panel/build.json b/home-panel/build.json
index dafa41a..a51319e 100644
--- a/home-panel/build.json
+++ b/home-panel/build.json
@@ -1,11 +1,11 @@
 {
-    "args": {},
-    "build_from": {
-        "aarch64": "hassioaddons/base-aarch64:6.0.1",
-        "amd64": "hassioaddons/base-amd64:6.0.1",
-        "armhf": "hassioaddons/base-armhf:6.0.1",
-        "armv7": "hassioaddons/base-armv7:6.0.1",
-        "i386": "hassioaddons/base-i386:6.0.1"
-    },
-    "squash": false
+  "args": {},
+  "build_from": {
+    "aarch64": "hassioaddons/base-aarch64:7.0.2",
+    "amd64": "hassioaddons/base-amd64:7.0.2",
+    "armhf": "hassioaddons/base-armhf:7.0.2",
+    "armv7": "hassioaddons/base-armv7:7.0.2",
+    "i386": "hassioaddons/base-i386:7.0.2"
+  },
+  "squash": false
 }
diff --git a/home-panel/config.json b/home-panel/config.json
index cbb62fb..c0f75b0 100644
--- a/home-panel/config.json
+++ b/home-panel/config.json
@@ -6,13 +6,7 @@
   "url": "https://github.com/hassio-addons/addon-home-panel",
   "webui": "[PROTO:ssl]://[HOST]:[PORT:80]",
   "startup": "application",
-  "arch": [
-    "aarch64",
-    "amd64",
-    "armhf",
-    "armv7",
-    "i386"
-  ],
+  "arch": ["aarch64", "amd64", "armhf", "armv7", "i386"],
   "boot": "auto",
   "hassio_api": true,
   "hassio_role": "default",
@@ -25,19 +19,16 @@
     "80/tcp": null
   },
   "ports_description": {
-    "80/tcp": "Web UI (Not required for Hass.io Ingress)"
+    "80/tcp": "Web UI (Not required for Ingress)"
   },
-  "map": [
-    "config:rw",
-    "ssl"
-  ],
+  "map": ["config:rw", "ssl"],
   "options": {
     "ssl": true,
     "certfile": "fullchain.pem",
     "keyfile": "privkey.pem"
   },
   "schema": {
-    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
+    "log_level": "list(trace|debug|info|notice|warning|error|fatal)?",
     "ssl": "bool",
     "certfile": "str",
     "keyfile": "str",
diff --git a/home-panel/rootfs/etc/cont-init.d/discovery.sh b/home-panel/rootfs/etc/cont-init.d/discovery.sh
index 44afcbf..29ac8e8 100644
--- a/home-panel/rootfs/etc/cont-init.d/discovery.sh
+++ b/home-panel/rootfs/etc/cont-init.d/discovery.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Sends discovery information to Home Assistant.
 # ==============================================================================
 declare config
diff --git a/home-panel/rootfs/etc/cont-init.d/nginx.sh b/home-panel/rootfs/etc/cont-init.d/nginx.sh
index 5ece845..3cdd81b 100644
--- a/home-panel/rootfs/etc/cont-init.d/nginx.sh
+++ b/home-panel/rootfs/etc/cont-init.d/nginx.sh
@@ -1,11 +1,11 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Configures NGINX for use with Home Panel
 # ==============================================================================
 declare port
 declare certfile
-declare hassio_dns
+declare dns_host
 declare ingress_interface
 declare ingress_port
 declare keyfile
@@ -32,5 +32,5 @@ ingress_interface=$(bashio::addon.ip_address)
 sed -i "s/%%port%%/${ingress_port}/g" /etc/nginx/servers/ingress.conf
 sed -i "s/%%interface%%/${ingress_interface}/g" /etc/nginx/servers/ingress.conf
 
-hassio_dns=$(bashio::dns.host)
-sed -i "s/%%hassio_dns%%/${hassio_dns}/g" /etc/nginx/includes/resolver.conf
+dns_host=$(bashio::dns.host)
+sed -i "s/%%dns_host%%/${dns_host}/g" /etc/nginx/includes/resolver.conf
diff --git a/home-panel/rootfs/etc/cont-init.d/secrets.sh b/home-panel/rootfs/etc/cont-init.d/secrets.sh
index dd95988..89c9707 100644
--- a/home-panel/rootfs/etc/cont-init.d/secrets.sh
+++ b/home-panel/rootfs/etc/cont-init.d/secrets.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # This updates the internal auth secret for the API
 # ==============================================================================
 declare key
diff --git a/home-panel/rootfs/etc/nginx/includes/resolver.conf b/home-panel/rootfs/etc/nginx/includes/resolver.conf
index 65c431d..d864899 100644
--- a/home-panel/rootfs/etc/nginx/includes/resolver.conf
+++ b/home-panel/rootfs/etc/nginx/includes/resolver.conf
@@ -1 +1 @@
-resolver %%hassio_dns%%;
+resolver %%dns_host%%;
diff --git a/home-panel/rootfs/etc/nginx/nginx.conf b/home-panel/rootfs/etc/nginx/nginx.conf
index 7e5bc6f..338d70d 100644
--- a/home-panel/rootfs/etc/nginx/nginx.conf
+++ b/home-panel/rootfs/etc/nginx/nginx.conf
@@ -13,11 +13,11 @@ worker_processes 1;
 # Enables the use of JIT for regular expressions to speed-up their processing.
 pcre_jit on;
 
-# Write error log to Hass.io add-on log.
+# Write error log to the add-on log.
 error_log /proc/1/fd/1 error;
 
 # Load allowed environment vars
-env HASSIO_TOKEN;
+env SUPERVISOR_TOKEN;
 
 # Load dynamic modules.
 include /etc/nginx/modules/*.conf;
@@ -30,11 +30,11 @@ events {
 http {
     include /etc/nginx/includes/mime.types;
 
-    log_format hassio '[$time_local] $status '
-                        '$http_x_forwarded_for($remote_addr) '
-                        '$request ($http_user_agent)';
+    log_format homeassistant '[$time_local] $status '
+                             '$http_x_forwarded_for($remote_addr) '
+                             '$request ($http_user_agent)';
 
-    access_log              /proc/1/fd/1 hassio;
+    access_log              /proc/1/fd/1 homeassistant;
     client_max_body_size    4G;
     default_type            application/octet-stream;
     gzip                    on;
diff --git a/home-panel/rootfs/etc/services.d/home-panel/finish b/home-panel/rootfs/etc/services.d/home-panel/finish
index 77ac620..c0e4f5d 100644
--- a/home-panel/rootfs/etc/services.d/home-panel/finish
+++ b/home-panel/rootfs/etc/services.d/home-panel/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Take down the S6 supervision tree when Home Panel fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
diff --git a/home-panel/rootfs/etc/services.d/home-panel/run b/home-panel/rootfs/etc/services.d/home-panel/run
index 5e758bd..08c786b 100644
--- a/home-panel/rootfs/etc/services.d/home-panel/run
+++ b/home-panel/rootfs/etc/services.d/home-panel/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Starts server to serve the app
 # ==============================================================================
 bashio::log.info "Run Home Panel.."
diff --git a/home-panel/rootfs/etc/services.d/nginx/finish b/home-panel/rootfs/etc/services.d/nginx/finish
index 3d87d54..28f667a 100644
--- a/home-panel/rootfs/etc/services.d/nginx/finish
+++ b/home-panel/rootfs/etc/services.d/nginx/finish
@@ -1,6 +1,6 @@
 #!/usr/bin/execlineb -S0
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Take down the S6 supervision tree when Nginx fails
 # ==============================================================================
 if -n { s6-test $# -ne 0 }
diff --git a/home-panel/rootfs/etc/services.d/nginx/run b/home-panel/rootfs/etc/services.d/nginx/run
index 713a44a..9e4c453 100644
--- a/home-panel/rootfs/etc/services.d/nginx/run
+++ b/home-panel/rootfs/etc/services.d/nginx/run
@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bashio
 # ==============================================================================
-# Community Hass.io Add-ons: Home Panel
+# Home Assistant Community Add-on: Home Panel
 # Runs the Nginx daemon
 # ==============================================================================
 # Wait for Home Panel to become available