diff --git a/adwaita-dark-theme.el b/adwaita-dark-theme.el
index 6068912..b1d37cf 100644
--- a/adwaita-dark-theme.el
+++ b/adwaita-dark-theme.el
@@ -95,7 +95,6 @@
   "A dark color scheme inspired by the libadwaita colors.")
 
 (let ((class '((class color) (min-colors 256)))
-      (flat-button-available-p (version<= "28.1" emacs-version))
 
       ;; =====================
       ;; -- Theme variables --
@@ -104,37 +103,40 @@
       ;; Layout/Sizing
       (mode-line-padding 10)
 
+      ;; Feature availability
+      (flat-button-available-p (version<= "28.1" emacs-version))
+
       ;; Base (Background) Colors
       ;; [True color | 256-compatible]
-      (bg (if (adwaita-dark-theme--true-color-p) "#1e1e1e" "gray12"))     ;; #1f1f1f
-      (bg-alt (if (adwaita-dark-theme--true-color-p) "#242424" "gray14")) ;; #242424
-      (base-0 (if (adwaita-dark-theme--true-color-p) "#202020" "gray13")) ;; #212121
-      (base-1 (if (adwaita-dark-theme--true-color-p) "#262626" "gray15")) ;; #262626
-      (base-2 (if (adwaita-dark-theme--true-color-p) "#292929" "gray16")) ;; #292929
-      (base-3 (if (adwaita-dark-theme--true-color-p) "#303030" "gray19")) ;; #303030
-      (base-4 (if (adwaita-dark-theme--true-color-p) "#454545" "gray27")) ;; #454545
-      (base-5 (if (adwaita-dark-theme--true-color-p) "#656565" "gray40")) ;; #666666
-      (base-6 (if (adwaita-dark-theme--true-color-p) "#7b7b7b" "gray48")) ;; #7a7a7a
-      (base-7 (if (adwaita-dark-theme--true-color-p) "#a5a5a5" "gray65")) ;; #a6a6a6
-      (base-8 (if (adwaita-dark-theme--true-color-p) "#dfdfdf" "gray87")) ;; #dedede
-      (fg (if (adwaita-dark-theme--true-color-p) "#deddda" "gray86"))     ;; #dbdbdb
-      (fg-alt (if (adwaita-dark-theme--true-color-p) "#77767b" "gray47")) ;; #787878
+      (bg (if (adwaita-dark-theme--true-color-p) "#1e1e1e" "gray12"))     ; #1f1f1f
+      (bg-alt (if (adwaita-dark-theme--true-color-p) "#242424" "gray14")) ; #242424
+      (base-0 (if (adwaita-dark-theme--true-color-p) "#202020" "gray13")) ; #212121
+      (base-1 (if (adwaita-dark-theme--true-color-p) "#262626" "gray15")) ; #262626
+      (base-2 (if (adwaita-dark-theme--true-color-p) "#292929" "gray16")) ; #292929
+      (base-3 (if (adwaita-dark-theme--true-color-p) "#303030" "gray19")) ; #303030
+      (base-4 (if (adwaita-dark-theme--true-color-p) "#454545" "gray27")) ; #454545
+      (base-5 (if (adwaita-dark-theme--true-color-p) "#656565" "gray40")) ; #666666
+      (base-6 (if (adwaita-dark-theme--true-color-p) "#7b7b7b" "gray48")) ; #7a7a7a
+      (base-7 (if (adwaita-dark-theme--true-color-p) "#a5a5a5" "gray65")) ; #a6a6a6
+      (base-8 (if (adwaita-dark-theme--true-color-p) "#dfdfdf" "gray87")) ; #dedede
+      (fg (if (adwaita-dark-theme--true-color-p) "#deddda" "gray86"))     ; #dbdbdb
+      (fg-alt (if (adwaita-dark-theme--true-color-p) "#77767b" "gray47")) ; #787878
 
       ;; Foreground Colors
       ;; [True color | 256-compatible]
-      (gray (if (adwaita-dark-theme--true-color-p) "#3d3846" "gray23"))           ;; #3b3b3b
-      (red (if (adwaita-dark-theme--true-color-p) "#ff6c6b" "indianred2"))        ;; #ee6363
-      (orange (if (adwaita-dark-theme--true-color-p) "#ffa348" "orange2"))        ;; #ee9a00
-      (green (if (adwaita-dark-theme--true-color-p) "#54d18c" "seagreen3"))       ;; #43cd80
-      (teal (if (adwaita-dark-theme--true-color-p) "#5bc8af" "mediumaquamarine")) ;; #66cdaa
-      (yellow (if (adwaita-dark-theme--true-color-p) "#f8e45c" "gold2"))          ;; #eec900
-      (blue (if (adwaita-dark-theme--true-color-p) "#64a6f4" "steelblue2"))       ;; #5cacee
-      (dark-blue (if (adwaita-dark-theme--true-color-p) "#1a5fb4" "dodgerblue4")) ;; #104e8b
-      (magenta (if (adwaita-dark-theme--true-color-p) "#dd80de" "orchid3"))       ;; #cd69c9
-      (pink (if (adwaita-dark-theme--true-color-p) "#edb8ee" "plum"))             ;; #dda0dd
-      (violet (if (adwaita-dark-theme--true-color-p) "#7d8ac7" "mediumpurple3"))  ;; #8968cd
-      (cyan (if (adwaita-dark-theme--true-color-p) "#7ee5ff" "mediumturquoise"))  ;; #48d1cc
-      (dark-cyan (if (adwaita-dark-theme--true-color-p) "#6bacbd" "cadetblue")))  ;; #5f9ea0
+      (gray (if (adwaita-dark-theme--true-color-p) "#3d3846" "gray23"))           ; #3b3b3b
+      (red (if (adwaita-dark-theme--true-color-p) "#ff6c6b" "indianred2"))        ; #ee6363
+      (orange (if (adwaita-dark-theme--true-color-p) "#ffa348" "orange2"))        ; #ee9a00
+      (green (if (adwaita-dark-theme--true-color-p) "#54d18c" "seagreen3"))       ; #43cd80
+      (teal (if (adwaita-dark-theme--true-color-p) "#5bc8af" "mediumaquamarine")) ; #66cdaa
+      (yellow (if (adwaita-dark-theme--true-color-p) "#f8e45c" "gold2"))          ; #eec900
+      (blue (if (adwaita-dark-theme--true-color-p) "#64a6f4" "steelblue2"))       ; #5cacee
+      (dark-blue (if (adwaita-dark-theme--true-color-p) "#1a5fb4" "dodgerblue4")) ; #104e8b
+      (magenta (if (adwaita-dark-theme--true-color-p) "#dd80de" "orchid3"))       ; #cd69c9
+      (pink (if (adwaita-dark-theme--true-color-p) "#edb8ee" "plum"))             ; #dda0dd
+      (violet (if (adwaita-dark-theme--true-color-p) "#7d8ac7" "mediumpurple3"))  ; #8968cd
+      (cyan (if (adwaita-dark-theme--true-color-p) "#7ee5ff" "mediumturquoise"))  ; #48d1cc
+      (dark-cyan (if (adwaita-dark-theme--true-color-p) "#6bacbd" "cadetblue")))  ; #5f9ea0
 
   ;; Face Definitions
   (custom-theme-set-faces