diff --git a/modus-operandi-deuteranopia-theme.el b/modus-operandi-deuteranopia-theme.el
index ba3700a..6a2105a 100644
--- a/modus-operandi-deuteranopia-theme.el
+++ b/modus-operandi-deuteranopia-theme.el
@@ -43,6 +43,7 @@
                (require-theme 'modus-themes t))
     (require 'modus-themes))
 
+;;;###theme-autoload
   (deftheme modus-operandi-deuteranopia
     "Deuteranopia-optimized theme with a white background.
 This variant is optimized for users with red-green color
@@ -50,7 +51,10 @@ deficiency (deuteranopia).  It conforms with the highest
 legibility standard for color contrast between background and
 foreground in any given piece of text, which corresponds to a
 minimum contrast in relative luminance of 7:1 (WCAG AAA
-standard).")
+standard)."
+    :background-mode 'light
+    :kind 'color-scheme
+    :family 'modus)
 
   (defconst modus-operandi-deuteranopia-palette
     '(
@@ -479,7 +483,4 @@ represents."
 
   (provide-theme 'modus-operandi-deuteranopia))
 
-;;;###theme-autoload
-(put 'modus-operandi-deuteranopia 'theme-properties '(:background-mode light :kind color-scheme :family modus))
-
 ;;; modus-operandi-deuteranopia-theme.el ends here
diff --git a/modus-operandi-theme.el b/modus-operandi-theme.el
index 529a7b9..b9f9ee3 100644
--- a/modus-operandi-theme.el
+++ b/modus-operandi-theme.el
@@ -43,12 +43,16 @@
                (require-theme 'modus-themes t))
     (require 'modus-themes))
 
+;;;###theme-autoload
   (deftheme modus-operandi
     "Elegant, highly legible theme with a white background.
 Conforms with the highest legibility standard for color contrast
 between background and foreground in any given piece of text,
 which corresponds to a minimum contrast in relative luminance of
-7:1 (WCAG AAA standard).")
+7:1 (WCAG AAA standard)."
+    :background-mode 'light
+    :kind 'color-scheme
+    :family 'modus)
 
   (defconst modus-operandi-palette
     '(
@@ -477,7 +481,4 @@ represents."
 
   (provide-theme 'modus-operandi))
 
-;;;###theme-autoload
-(put 'modus-operandi 'theme-properties '(:background-mode light :kind color-scheme :family modus))
-
 ;;; modus-operandi-theme.el ends here
diff --git a/modus-operandi-tinted-theme.el b/modus-operandi-tinted-theme.el
index 350caca..e66a030 100644
--- a/modus-operandi-tinted-theme.el
+++ b/modus-operandi-tinted-theme.el
@@ -42,12 +42,16 @@
                (require-theme 'modus-themes t))
     (require 'modus-themes))
 
+;;;###theme-autoload
   (deftheme modus-operandi-tinted
     "Elegant, highly legible theme with a light ochre background.
 Conforms with the highest legibility standard for color contrast
 between background and foreground in any given piece of text,
 which corresponds to a minimum contrast in relative luminance of
-7:1 (WCAG AAA standard).")
+7:1 (WCAG AAA standard)."
+    :background-mode 'light
+    :kind 'color-scheme
+    :family 'modus)
 
   (defconst modus-operandi-tinted-palette
     '(
@@ -476,7 +480,4 @@ represents."
 
   (provide-theme 'modus-operandi-tinted))
 
-;;;###theme-autoload
-(put 'modus-operandi-tinted 'theme-properties '(:background-mode light :kind color-scheme :family modus))
-
 ;;; modus-operandi-tinted-theme.el ends here
diff --git a/modus-operandi-tritanopia-theme.el b/modus-operandi-tritanopia-theme.el
index 31a6ccc..b7e9aa9 100644
--- a/modus-operandi-tritanopia-theme.el
+++ b/modus-operandi-tritanopia-theme.el
@@ -43,6 +43,7 @@
                (require-theme 'modus-themes t))
     (require 'modus-themes))
 
+;;;###theme-autoload
   (deftheme modus-operandi-tritanopia
     "Tritanopia-optimized theme with a white background.
 This variant is optimized for users with blue-yellow color
@@ -50,7 +51,10 @@ deficiency (tritanopia).  It conforms with the highest
 legibility standard for color contrast between background and
 foreground in any given piece of text, which corresponds to a
 minimum contrast in relative luminance of 7:1 (WCAG AAA
-standard).")
+standard)."
+    :background-mode 'light
+    :kind 'color-scheme
+    :family 'modus)
 
   (defconst modus-operandi-tritanopia-palette
     '(
@@ -479,7 +483,4 @@ represents."
 
   (provide-theme 'modus-operandi-tritanopia))
 
-;;;###theme-autoload
-(put 'modus-operandi-tritanopia 'theme-properties '(:background-mode light :kind color-scheme :family modus))
-
 ;;; modus-operandi-tritanopia-theme.el ends here
diff --git a/modus-vivendi-deuteranopia-theme.el b/modus-vivendi-deuteranopia-theme.el
index bb4c5d9..6de293a 100644
--- a/modus-vivendi-deuteranopia-theme.el
+++ b/modus-vivendi-deuteranopia-theme.el
@@ -42,6 +42,7 @@
                (require-theme 'modus-themes t))
     (require 'modus-themes))
 
+;;;###theme-autoload
   (deftheme modus-vivendi-deuteranopia
     "Deuteranopia-optimized theme with a black background.
 This variant is optimized for users with red-green color
@@ -49,7 +50,10 @@ deficiency (deuteranopia).  It conforms with the highest
 legibility standard for color contrast between background and
 foreground in any given piece of text, which corresponds to a
 minimum contrast in relative luminance of 7:1 (WCAG AAA
-standard).")
+standard)."
+    :background-mode 'dark
+    :kind 'color-scheme
+    :family 'modus)
 
   (defconst modus-vivendi-deuteranopia-palette
     '(
@@ -478,7 +482,4 @@ represents."
 
   (provide-theme 'modus-vivendi-deuteranopia))
 
-;;;###theme-autoload
-(put 'modus-vivendi-deuteranopia 'theme-properties '(:background-mode dark :kind color-scheme :family modus))
-
 ;;; modus-vivendi-deuteranopia-theme.el ends here
diff --git a/modus-vivendi-theme.el b/modus-vivendi-theme.el
index f7fa3f2..b193a96 100644
--- a/modus-vivendi-theme.el
+++ b/modus-vivendi-theme.el
@@ -42,12 +42,16 @@
                (require-theme 'modus-themes t))
     (require 'modus-themes))
 
+;;;###theme-autoload
   (deftheme modus-vivendi
     "Elegant, highly legible theme with a black background.
 Conforms with the highest legibility standard for color contrast
 between background and foreground in any given piece of text,
 which corresponds to a minimum contrast in relative luminance of
-7:1 (WCAG AAA standard).")
+7:1 (WCAG AAA standard)."
+    :background-mode 'dark
+    :kind 'color-scheme
+    :family 'modus)
 
   (defconst modus-vivendi-palette
     '(
@@ -477,7 +481,4 @@ represents."
 
   (provide-theme 'modus-vivendi))
 
-;;;###theme-autoload
-(put 'modus-vivendi 'theme-properties '(:background-mode dark :kind color-scheme :family modus))
-
 ;;; modus-vivendi-theme.el ends here
diff --git a/modus-vivendi-tinted-theme.el b/modus-vivendi-tinted-theme.el
index 8fe0ff5..bf72f88 100644
--- a/modus-vivendi-tinted-theme.el
+++ b/modus-vivendi-tinted-theme.el
@@ -42,12 +42,16 @@
                (require-theme 'modus-themes t))
     (require 'modus-themes))
 
+;;;###theme-autoload
   (deftheme modus-vivendi-tinted
     "Elegant, highly legible theme with a night sky background.
 Conforms with the highest legibility standard for color contrast
 between background and foreground in any given piece of text,
 which corresponds to a minimum contrast in relative luminance of
-7:1 (WCAG AAA standard).")
+7:1 (WCAG AAA standard)."
+    :background-mode 'dark
+    :kind 'color-scheme
+    :family 'modus)
 
   (defconst modus-vivendi-tinted-palette
     '(
@@ -476,7 +480,4 @@ represents."
 
   (provide-theme 'modus-vivendi-tinted))
 
-;;;###theme-autoload
-(put 'modus-vivendi-tinted 'theme-properties '(:background-mode dark :kind color-scheme :family modus))
-
 ;;; modus-vivendi-tinted-theme.el ends here
diff --git a/modus-vivendi-tritanopia-theme.el b/modus-vivendi-tritanopia-theme.el
index da6288d..d808d02 100644
--- a/modus-vivendi-tritanopia-theme.el
+++ b/modus-vivendi-tritanopia-theme.el
@@ -43,6 +43,7 @@
                (require-theme 'modus-themes t))
     (require 'modus-themes))
 
+;;;###theme-autoload
   (deftheme modus-vivendi-tritanopia
     "Tritanopia-optimized theme with a black background.
 This variant is optimized for users with blue-yellow color
@@ -50,7 +51,10 @@ deficiency (tritanopia).  It conforms with the highest
 legibility standard for color contrast between background and
 foreground in any given piece of text, which corresponds to a
 minimum contrast in relative luminance of 7:1 (WCAG AAA
-standard).")
+standard)."
+    :background-mode 'dark
+    :kind 'color-scheme
+    :family 'modus)
 
   (defconst modus-vivendi-tritanopia-palette
     '(
@@ -479,7 +483,4 @@ represents."
 
   (provide-theme 'modus-vivendi-tritanopia))
 
-;;;###theme-autoload
-(put 'modus-vivendi-tritanopia 'theme-properties '(:background-mode dark :kind color-scheme :family modus))
-
 ;;; modus-vivendi-tritanopia-theme.el ends here