diff --git a/src/modules/Nightlighter.js b/src/modules/Nightlighter.js
index 3353159..0bc2823 100644
--- a/src/modules/Nightlighter.js
+++ b/src/modules/Nightlighter.js
@@ -69,13 +69,13 @@ var Nightlighter = class {
 		log_debug('Nightlighter disabled.');
 	}
 
-	get status() {
+	get time() {
 		if ( this.dbus_proxy ) {
 			try {
-				return this.dbus_proxy.get_cached_property('NightLightActive').get_boolean();
+				return this.dbus_proxy.get_cached_property('NightLightActive').get_boolean() ? 'night' : 'day';
 			}
 			catch(e) {
-				return false; // Sometimes when Night Light hasn't changed colors yet it returns an error, we consider it is inactive.
+				return 'day'; // Sometimes when Night Light hasn't changed colors yet it returns an error, we consider it is inactive.
 			}
 		}
 	}
diff --git a/src/modules/Switcher.js b/src/modules/Switcher.js
index f0d5918..1cb8354 100644
--- a/src/modules/Switcher.js
+++ b/src/modules/Switcher.js
@@ -63,7 +63,7 @@ var Switcher = class {
 			this.nightlight.enable();
 			this.nightlight.subscribe(this._on_nightlight_change.bind(this));
 
-			this.theme.set_variant(this.nightlight.status);
+			this.theme.set_variant(this.nightlight.time);
 			log_debug('Extension enabled.');
 		}
 		catch(e) {
@@ -95,11 +95,11 @@ var Switcher = class {
 
 	_on_theme_change() {
 		this.theme.update_variants();
-		this.theme.set_variant(this.nightlight.status);
+		this.theme.set_variant(this.nightlight.time);
 	}
 
 	_on_nightlight_change() {
-		this.theme.set_variant(this.nightlight.status);
+		this.theme.set_variant(this.nightlight.time);
 	}
 
 }
diff --git a/src/modules/Themer.js b/src/modules/Themer.js
index 6e96b0e..27d664e 100644
--- a/src/modules/Themer.js
+++ b/src/modules/Themer.js
@@ -77,23 +77,21 @@ var Themer = class {
 		}
 	}
 
-	set_variant(night) {
-		if ( night !== undefined && this.variants ) {
-			this.current = night ? this.variants.night : this.variants.day;
+	set_variant(variant) {
+		if ( variant && this.variants ) {
+			this.current = this.variants.get(variant);
 		}
 	}
 
 	reset_theme() {
-		if ( this.variants ) {
-			this.current = this.variants.original;
-			log_debug('Theme has been reset to the user\'s original variant.')
-		}
+		this.set_variant('original');
+		log_debug('Theme has been reset to the user\'s original variant.')
 	}
 
 	update_variants() {
 		if ( this.variants ) {
 			const new_theme = this.current;
-			if ( new_theme && new_theme !== this.variants.day && new_theme !== this.variants.night ) {
+			if ( new_theme && new_theme !== this.variants.get('day') && new_theme !== this.variants.get('night') ) {
 				this._update_variants();
 			}
 		}
@@ -102,7 +100,7 @@ var Themer = class {
 	_update_variants() {
 		if ( this.current ) {
 			this.variants = Variants.guess_from(this.current);
-			log_debug('Variants updated: ' + JSON.stringify(this.variants));
+			log_debug('Variants updated: ' + this.variants);
 		}
 	}
 
diff --git a/src/modules/Variants.js b/src/modules/Variants.js
index dd153c3..05f9469 100644
--- a/src/modules/Variants.js
+++ b/src/modules/Variants.js
@@ -45,48 +45,48 @@ Dark variants, from the most the least generic:
 var Variants = class {
 
 	static guess_from(name) {
-		const variants = {};
-		variants.original = name;
+		const variants = new Map();
+		variants.set('original', name);
 
 		if ( name.includes('Adapta') ) {
-			variants.day = name.replace('-Nokto', '');
-			variants.night = variants.day.replace('Adapta', 'Adapta-Nokto');
+			variants.set('day', name.replace('-Nokto', ''));
+			variants.set('night', variants.get('day').replace('Adapta', 'Adapta-Nokto'));
 		}
 		else if ( name.includes('Arc') ) {
-			variants.day = name.replace(/-Dark(?!er)/, '');
-			variants.night = variants.day.replace(/Arc(-Darker)?/, 'Arc-Dark');
+			variants.set('day', name.replace(/-Dark(?!er)/, ''));
+			variants.set('night', variants.get('day').replace(/Arc(-Darker)?/, 'Arc-Dark'));
 		}
 		else if ( name.match(/^(Canta|Materia).*-compact/) ) {
-			variants.day = name.replace('-dark', '');
-			variants.night = variants.day.replace(/(-light)?-compact/, '-dark-compact');
+			variants.set('day', name.replace('-dark', ''));
+			variants.set('night', variants.get('day').replace(/(-light)?-compact/, '-dark-compact'));
 		}
 		else if ( name.includes('Flat-Remix-GTK') ) {
 			const isSolid = name.includes('-Solid');
 			const withoutBorder = name.includes('-NoBorder');
 			const basename = name.split('-').slice(0, 4).join('-');
-			variants.day = basename + (name.includes('-Darker') ? '-Darker' : '') + (isSolid ? '-Solid' : '');
-			variants.night = basename + (name.includes('-Darkest') ? '-Darkest' : '-Dark') + (isSolid ? '-Solid' : '') + (withoutBorder ? '-NoBorder' : '');
+			variants.set('day', basename + (name.includes('-Darker') ? '-Darker' : '') + (isSolid ? '-Solid' : ''));
+			variants.set('night', basename + (name.includes('-Darkest') ? '-Darkest' : '-Dark') + (isSolid ? '-Solid' : '') + (withoutBorder ? '-NoBorder' : ''));
 		}
 		else if ( name.includes('HighContrast') ) {
-			variants.day = 'HighContrast';
-			variants.night = 'HighContrastInverse';
+			variants.set('day', 'HighContrast');
+			variants.set('night', 'HighContrastInverse');
 		}
 		else if ( name.match(/^(Layan|Matcha)/) ) {
 			const basename = name.split('-')[0];
-			variants.day = name.replace('-dark', '');
-			variants.night = variants.day.replace(new RegExp(`${basename}(-light)?`), `${basename}-dark`);
+			variants.set('day', name.replace('-dark', ''));
+			variants.set('night', variants.get('day').replace(new RegExp(`${basename}(-light)?`), `${basename}-dark`));
 		}
 		else if ( name.includes('Mojave') ) {
-			variants.day = name.replace('-dark', '-light');
-			variants.night = variants.day.replace('-light', '-dark');
+			variants.set('day', name.replace('-dark', '-light'));
+			variants.set('night', variants.get('day').replace('-light', '-dark'));
 		}
 		else if ( name.includes('vimix') ) {
-			variants.day = name.replace('-dark', '');
-			variants.night = variants.day.replace(/vimix(-light)?/, 'vimix-dark');
+			variants.set('day', name.replace('-dark', ''));
+			variants.set('night', variants.get('day').replace(/vimix(-light)?/, 'vimix-dark'));
 		}
 		else {
-			variants.day = name.replace(/-dark(?!er)(est)?/, '');
-			variants.night = variants.day.replace(/(-light|-darker)/, '') + (name.includes('-darkest') ? '-darkest' : '-dark');
+			variants.set('day', name.replace(/-dark(?!er)(est)?/, ''));
+			variants.set('night', variants.get('day').replace(/(-light|-darker)/, '') + (name.includes('-darkest') ? '-darkest' : '-dark'));
 		}
 
 		return variants;
diff --git a/tests/Adapta.js b/tests/Adapta.js
index 37c2dc6..9755ced 100644
--- a/tests/Adapta.js
+++ b/tests/Adapta.js
@@ -22,24 +22,24 @@ const { Variants } = require('./_variants');
 
 test('Adapta', t => {
 	const variants = Variants.guess_from('Adapta');
-	t.is(variants.day, 'Adapta');
-	t.is(variants.night, 'Adapta-Nokto')
+	t.is(variants.get('day'), 'Adapta');
+	t.is(variants.get('night'), 'Adapta-Nokto')
 });
 
 test('Adapta-Nokto', t => {
 	const variants = Variants.guess_from('Adapta-Nokto');
-	t.is(variants.day, 'Adapta');
-	t.is(variants.night, 'Adapta-Nokto');
+	t.is(variants.get('day'), 'Adapta');
+	t.is(variants.get('night'), 'Adapta-Nokto');
 });
 
 test('Adapta-Eta', t => {
 	const variants = Variants.guess_from('Adapta-Eta');
-	t.is(variants.day, 'Adapta-Eta');
-	t.is(variants.night, 'Adapta-Nokto-Eta');
+	t.is(variants.get('day'), 'Adapta-Eta');
+	t.is(variants.get('night'), 'Adapta-Nokto-Eta');
 });
 
 test('Adapta-Nokto-Eta', t => {
 	const variants = Variants.guess_from('Adapta-Nokto-Eta');
-	t.is(variants.day, 'Adapta-Eta');
-	t.is(variants.night, 'Adapta-Nokto-Eta');
+	t.is(variants.get('day'), 'Adapta-Eta');
+	t.is(variants.get('night'), 'Adapta-Nokto-Eta');
 });
diff --git a/tests/Adwaita.js b/tests/Adwaita.js
index 437d8d5..ff966cf 100644
--- a/tests/Adwaita.js
+++ b/tests/Adwaita.js
@@ -22,12 +22,12 @@ const { Variants } = require('./_variants');
 
 test('Adwaita', t => {
 	const variants = Variants.guess_from('Adwaita');
-	t.is(variants.day, 'Adwaita');
-	t.is(variants.night, 'Adwaita-dark');
+	t.is(variants.get('day'), 'Adwaita');
+	t.is(variants.get('night'), 'Adwaita-dark');
 });
 
 test('Adwaita-dark', t => {
 	const variants = Variants.guess_from('Adwaita-dark');
-	t.is(variants.day, 'Adwaita');
-	t.is(variants.night, 'Adwaita-dark');
+	t.is(variants.get('day'), 'Adwaita');
+	t.is(variants.get('night'), 'Adwaita-dark');
 });
diff --git a/tests/Arc.js b/tests/Arc.js
index 49d7a53..ba63c15 100644
--- a/tests/Arc.js
+++ b/tests/Arc.js
@@ -22,36 +22,36 @@ const { Variants } = require('./_variants');
 
 test('Arc', t => {
 	const variants = Variants.guess_from('Arc');
-	t.is(variants.day, 'Arc');
-	t.is(variants.night, 'Arc-Dark');
+	t.is(variants.get('day'), 'Arc');
+	t.is(variants.get('night'), 'Arc-Dark');
 });
 
 test('Arc-Dark', t => {
 	const variants = Variants.guess_from('Arc-Dark');
-	t.is(variants.day, 'Arc');
-	t.is(variants.night, 'Arc-Dark');
+	t.is(variants.get('day'), 'Arc');
+	t.is(variants.get('night'), 'Arc-Dark');
 });
 
 test('Arc-Darker', t => {
 	const variants = Variants.guess_from('Arc-Darker');
-	t.is(variants.day, 'Arc-Darker');
-	t.is(variants.night, 'Arc-Dark');
+	t.is(variants.get('day'), 'Arc-Darker');
+	t.is(variants.get('night'), 'Arc-Dark');
 });
 
 test('Arc-Darker-solid', t => {
 	const variants = Variants.guess_from('Arc-Darker-solid');
-	t.is(variants.day, 'Arc-Darker-solid');
-	t.is(variants.night, 'Arc-Dark-solid');
+	t.is(variants.get('day'), 'Arc-Darker-solid');
+	t.is(variants.get('night'), 'Arc-Dark-solid');
 });
 
 test('Arc-Dark-solid', t => {
 	const variants = Variants.guess_from('Arc-Dark-solid');
-	t.is(variants.day, 'Arc-solid');
-	t.is(variants.night, 'Arc-Dark-solid');
+	t.is(variants.get('day'), 'Arc-solid');
+	t.is(variants.get('night'), 'Arc-Dark-solid');
 });
 
 test('Arc-solid', t => {
 	const variants = Variants.guess_from('Arc-solid');
-	t.is(variants.day, 'Arc-solid');
-	t.is(variants.night, 'Arc-Dark-solid');
+	t.is(variants.get('day'), 'Arc-solid');
+	t.is(variants.get('night'), 'Arc-Dark-solid');
 });
diff --git a/tests/Canta.js b/tests/Canta.js
index 9706188..731c042 100644
--- a/tests/Canta.js
+++ b/tests/Canta.js
@@ -23,37 +23,37 @@ const { Variants } = require('./_variants');
 ['', '-blue', '-indigo'].forEach(color => {
 	test(`Canta${color}`, t => {
 		const variants = Variants.guess_from(`Canta${color}`);
-		t.is(variants.day, `Canta${color}`);
-		t.is(variants.night, `Canta${color}-dark`);
+		t.is(variants.get('day'), `Canta${color}`);
+		t.is(variants.get('night'), `Canta${color}-dark`);
 	});
 
 	test(`Canta${color}-dark`, t => {
 		const variants = Variants.guess_from(`Canta${color}-dark`);
-		t.is(variants.day, `Canta${color}`);
-		t.is(variants.night, `Canta${color}-dark`);
+		t.is(variants.get('day'), `Canta${color}`);
+		t.is(variants.get('night'), `Canta${color}-dark`);
 	});
 
 	test(`Canta${color}-light`, t => {
 		const variants = Variants.guess_from(`Canta${color}-light`);
-		t.is(variants.day, `Canta${color}-light`);
-		t.is(variants.night, `Canta${color}-dark`);
+		t.is(variants.get('day'), `Canta${color}-light`);
+		t.is(variants.get('night'), `Canta${color}-dark`);
 	});
 
 	test(`Canta${color}-compact`, t => {
 		const variants = Variants.guess_from(`Canta${color}-compact`);
-		t.is(variants.day, `Canta${color}-compact`);
-		t.is(variants.night, `Canta${color}-dark-compact`);
+		t.is(variants.get('day'), `Canta${color}-compact`);
+		t.is(variants.get('night'), `Canta${color}-dark-compact`);
 	});
 
 	test(`Canta${color}-dark-compact`, t => {
 		const variants = Variants.guess_from(`Canta${color}-dark-compact`);
-		t.is(variants.day, `Canta${color}-compact`);
-		t.is(variants.night, `Canta${color}-dark-compact`);
+		t.is(variants.get('day'), `Canta${color}-compact`);
+		t.is(variants.get('night'), `Canta${color}-dark-compact`);
 	});
 
 	test(`Canta${color}-light-compact`, t => {
 		const variants = Variants.guess_from(`Canta${color}-light-compact`);
-		t.is(variants.day, `Canta${color}-light-compact`);
-		t.is(variants.night, `Canta${color}-dark-compact`);
+		t.is(variants.get('day'), `Canta${color}-light-compact`);
+		t.is(variants.get('night'), `Canta${color}-dark-compact`);
 	});
 });
diff --git a/tests/Flat-Remix-GTK.js b/tests/Flat-Remix-GTK.js
index f4b7c65..227d84c 100644
--- a/tests/Flat-Remix-GTK.js
+++ b/tests/Flat-Remix-GTK.js
@@ -23,61 +23,61 @@ const { Variants } = require('./_variants');
 ['Blue', 'Green', 'Red', 'Yellow'].forEach(color => {
 	test(`Flat-Remix-GTK-${color}`, t => {
 		const variants = Variants.guess_from(`Flat-Remix-GTK-${color}`);
-		t.is(variants.day, `Flat-Remix-GTK-${color}`);
-		t.is(variants.night, `Flat-Remix-GTK-${color}-Dark`);
+		t.is(variants.get('day'), `Flat-Remix-GTK-${color}`);
+		t.is(variants.get('night'), `Flat-Remix-GTK-${color}-Dark`);
 	});
 
 	test(`Flat-Remix-GTK-${color}-Dark`, t => {
 		const variants = Variants.guess_from(`Flat-Remix-GTK-${color}-Dark`);
-		t.is(variants.day, `Flat-Remix-GTK-${color}`);
-		t.is(variants.night, `Flat-Remix-GTK-${color}-Dark`);
+		t.is(variants.get('day'), `Flat-Remix-GTK-${color}`);
+		t.is(variants.get('night'), `Flat-Remix-GTK-${color}-Dark`);
 	});
 
 	test(`Flat-Remix-GTK-${color}-Darker`, t => {
 		const variants = Variants.guess_from(`Flat-Remix-GTK-${color}-Darker`);
-		t.is(variants.day, `Flat-Remix-GTK-${color}-Darker`);
-		t.is(variants.night, `Flat-Remix-GTK-${color}-Dark`);
+		t.is(variants.get('day'), `Flat-Remix-GTK-${color}-Darker`);
+		t.is(variants.get('night'), `Flat-Remix-GTK-${color}-Dark`);
 	});
 
 	test(`Flat-Remix-GTK-${color}-Darker-Solid`, t => {
 		const variants = Variants.guess_from(`Flat-Remix-GTK-${color}-Darker-Solid`);
-		t.is(variants.day, `Flat-Remix-GTK-${color}-Darker-Solid`);
-		t.is(variants.night, `Flat-Remix-GTK-${color}-Dark-Solid`);
+		t.is(variants.get('day'), `Flat-Remix-GTK-${color}-Darker-Solid`);
+		t.is(variants.get('night'), `Flat-Remix-GTK-${color}-Dark-Solid`);
 	});
 
 	test(`Flat-Remix-GTK-${color}-Darkest`, t => {
 		const variants = Variants.guess_from(`Flat-Remix-GTK-${color}-Darkest`);
-		t.is(variants.day, `Flat-Remix-GTK-${color}`);
-		t.is(variants.night, `Flat-Remix-GTK-${color}-Darkest`);
+		t.is(variants.get('day'), `Flat-Remix-GTK-${color}`);
+		t.is(variants.get('night'), `Flat-Remix-GTK-${color}-Darkest`);
 	});
 
 	test(`Flat-Remix-GTK-${color}-Darkest-NoBorder`, t => {
 		const variants = Variants.guess_from(`Flat-Remix-GTK-${color}-Darkest-NoBorder`);
-		t.is(variants.day, `Flat-Remix-GTK-${color}`);
-		t.is(variants.night, `Flat-Remix-GTK-${color}-Darkest-NoBorder`);
+		t.is(variants.get('day'), `Flat-Remix-GTK-${color}`);
+		t.is(variants.get('night'), `Flat-Remix-GTK-${color}-Darkest-NoBorder`);
 	});
 
 	test(`Flat-Remix-GTK-${color}-Darkest-Solid`, t => {
 		const variants = Variants.guess_from(`Flat-Remix-GTK-${color}-Darkest-Solid`);
-		t.is(variants.day, `Flat-Remix-GTK-${color}-Solid`);
-		t.is(variants.night, `Flat-Remix-GTK-${color}-Darkest-Solid`);
+		t.is(variants.get('day'), `Flat-Remix-GTK-${color}-Solid`);
+		t.is(variants.get('night'), `Flat-Remix-GTK-${color}-Darkest-Solid`);
 	});
 
 	test(`Flat-Remix-GTK-${color}-Darkest-Solid-NoBorder`, t => {
 		const variants = Variants.guess_from(`Flat-Remix-GTK-${color}-Darkest-Solid-NoBorder`);
-		t.is(variants.day, `Flat-Remix-GTK-${color}-Solid`);
-		t.is(variants.night, `Flat-Remix-GTK-${color}-Darkest-Solid-NoBorder`);
+		t.is(variants.get('day'), `Flat-Remix-GTK-${color}-Solid`);
+		t.is(variants.get('night'), `Flat-Remix-GTK-${color}-Darkest-Solid-NoBorder`);
 	});
 
 	test(`Flat-Remix-GTK-${color}-Dark-Solid`, t => {
 		const variants = Variants.guess_from(`Flat-Remix-GTK-${color}-Dark-Solid`);
-		t.is(variants.day, `Flat-Remix-GTK-${color}-Solid`);
-		t.is(variants.night, `Flat-Remix-GTK-${color}-Dark-Solid`);
+		t.is(variants.get('day'), `Flat-Remix-GTK-${color}-Solid`);
+		t.is(variants.get('night'), `Flat-Remix-GTK-${color}-Dark-Solid`);
 	});
 
 	test(`Flat-Remix-GTK-${color}-Solid`, t => {
 		const variants = Variants.guess_from(`Flat-Remix-GTK-${color}-Solid`);
-		t.is(variants.day, `Flat-Remix-GTK-${color}-Solid`);
-		t.is(variants.night, `Flat-Remix-GTK-${color}-Dark-Solid`);
+		t.is(variants.get('day'), `Flat-Remix-GTK-${color}-Solid`);
+		t.is(variants.get('night'), `Flat-Remix-GTK-${color}-Dark-Solid`);
 	});
 });
diff --git a/tests/HighContrast.js b/tests/HighContrast.js
index 7b2ff19..99c46d4 100644
--- a/tests/HighContrast.js
+++ b/tests/HighContrast.js
@@ -22,12 +22,12 @@ const { Variants } = require('./_variants');
 
 test('HighContrast', t => {
 	const variants = Variants.guess_from('HighContrast');
-	t.is(variants.day, 'HighContrast');
-	t.is(variants.night, 'HighContrastInverse');
+	t.is(variants.get('day'), 'HighContrast');
+	t.is(variants.get('night'), 'HighContrastInverse');
 });
 
 test('HighContrastInverse', t => {
 	const variants = Variants.guess_from('HighContrastInverse');
-	t.is(variants.day, 'HighContrast');
-	t.is(variants.night, 'HighContrastInverse');
+	t.is(variants.get('day'), 'HighContrast');
+	t.is(variants.get('night'), 'HighContrastInverse');
 });
diff --git a/tests/Layan.js b/tests/Layan.js
index 2c86404..a7e8f17 100644
--- a/tests/Layan.js
+++ b/tests/Layan.js
@@ -22,36 +22,36 @@ const { Variants } = require('./_variants');
 
 test('Layan', t => {
 	const variants = Variants.guess_from('Layan');
-	t.is(variants.day, 'Layan');
-	t.is(variants.night, 'Layan-dark');
+	t.is(variants.get('day'), 'Layan');
+	t.is(variants.get('night'), 'Layan-dark');
 });
 
 test('Layan-dark', t => {
 	const variants = Variants.guess_from('Layan-dark');
-	t.is(variants.day, 'Layan');
-	t.is(variants.night, 'Layan-dark');
+	t.is(variants.get('day'), 'Layan');
+	t.is(variants.get('night'), 'Layan-dark');
 });
 
 test('Layan-light', t => {
 	const variants = Variants.guess_from('Layan-light');
-	t.is(variants.day, 'Layan-light');
-	t.is(variants.night, 'Layan-dark');
+	t.is(variants.get('day'), 'Layan-light');
+	t.is(variants.get('night'), 'Layan-dark');
 });
 
 test('Layan-solid', t => {
 	const variants = Variants.guess_from('Layan-solid');
-	t.is(variants.day, 'Layan-solid');
-	t.is(variants.night, 'Layan-dark-solid');
+	t.is(variants.get('day'), 'Layan-solid');
+	t.is(variants.get('night'), 'Layan-dark-solid');
 });
 
 test('Layan-dark-solid', t => {
 	const variants = Variants.guess_from('Layan-dark-solid');
-	t.is(variants.day, 'Layan-solid');
-	t.is(variants.night, 'Layan-dark-solid');
+	t.is(variants.get('day'), 'Layan-solid');
+	t.is(variants.get('night'), 'Layan-dark-solid');
 });
 
 test('Layan-light-solid', t => {
 	const variants = Variants.guess_from('Layan-light-solid');
-	t.is(variants.day, 'Layan-light-solid');
-	t.is(variants.night, 'Layan-dark-solid');
+	t.is(variants.get('day'), 'Layan-light-solid');
+	t.is(variants.get('night'), 'Layan-dark-solid');
 });
diff --git a/tests/Matcha.js b/tests/Matcha.js
index b657d22..f74323b 100644
--- a/tests/Matcha.js
+++ b/tests/Matcha.js
@@ -23,19 +23,19 @@ const { Variants } = require('./_variants');
 ['aliz', 'azul', 'sea'].forEach(color => {
 	test(`Matcha-${color}`, t => {
 		const variants = Variants.guess_from(`Matcha-${color}`);
-		t.is(variants.day, `Matcha-${color}`);
-		t.is(variants.night, `Matcha-dark-${color}`);
+		t.is(variants.get('day'), `Matcha-${color}`);
+		t.is(variants.get('night'), `Matcha-dark-${color}`);
 	});
 
 	test(`Matcha-dark-${color}`, t => {
 		const variants = Variants.guess_from(`Matcha-dark-${color}`);
-		t.is(variants.day, `Matcha-${color}`);
-		t.is(variants.night, `Matcha-dark-${color}`);
+		t.is(variants.get('day'), `Matcha-${color}`);
+		t.is(variants.get('night'), `Matcha-dark-${color}`);
 	});
 
 	test(`Matcha-light-${color}`, t => {
 		const variants = Variants.guess_from(`Matcha-light-${color}`);
-		t.is(variants.day, `Matcha-light-${color}`);
-		t.is(variants.night, `Matcha-dark-${color}`);
+		t.is(variants.get('day'), `Matcha-light-${color}`);
+		t.is(variants.get('night'), `Matcha-dark-${color}`);
 	});
 })
diff --git a/tests/Materia.js b/tests/Materia.js
index de30f37..275ef95 100644
--- a/tests/Materia.js
+++ b/tests/Materia.js
@@ -23,19 +23,19 @@ const { Variants } = require('./_variants');
 ['', '-compact'].forEach(size => {
 	test(`Materia${size}`, t => {
 		const variants = Variants.guess_from(`Materia${size}`);
-		t.is(variants.day, `Materia${size}`);
-		t.is(variants.night, `Materia-dark${size}`);
+		t.is(variants.get('day'), `Materia${size}`);
+		t.is(variants.get('night'), `Materia-dark${size}`);
 	});
 
 	test(`Materia-dark${size}`, t => {
 		const variants = Variants.guess_from(`Materia-dark${size}`);
-		t.is(variants.day, `Materia${size}`);
-		t.is(variants.night, `Materia-dark${size}`);
+		t.is(variants.get('day'), `Materia${size}`);
+		t.is(variants.get('night'), `Materia-dark${size}`);
 	});
 
 	test(`Materia-light${size}`, t => {
 		const variants = Variants.guess_from(`Materia-light${size}`);
-		t.is(variants.day, `Materia-light${size}`);
-		t.is(variants.night, `Materia-dark${size}`);
+		t.is(variants.get('day'), `Materia-light${size}`);
+		t.is(variants.get('night'), `Materia-dark${size}`);
 	});
 })
diff --git a/tests/Mojave.js b/tests/Mojave.js
index c8795c0..374eaae 100644
--- a/tests/Mojave.js
+++ b/tests/Mojave.js
@@ -24,14 +24,14 @@ const { Variants } = require('./_variants');
 	['', '-alt'].forEach(alt => {
 		test(`Mojave-light${transparency}${alt}`, t => {
 			const variants = Variants.guess_from(`Mojave-light${transparency}${alt}`);
-			t.is(variants.day, `Mojave-light${transparency}${alt}`);
-			t.is(variants.night, `Mojave-dark${transparency}${alt}`);
+			t.is(variants.get('day'), `Mojave-light${transparency}${alt}`);
+			t.is(variants.get('night'), `Mojave-dark${transparency}${alt}`);
 		});
 
 		test(`Mojave-dark${transparency}${alt}`, t => {
 			const variants = Variants.guess_from(`Mojave-dark${transparency}${alt}`);
-			t.is(variants.day, `Mojave-light${transparency}${alt}`);
-			t.is(variants.night, `Mojave-dark${transparency}${alt}`);
+			t.is(variants.get('day'), `Mojave-light${transparency}${alt}`);
+			t.is(variants.get('night'), `Mojave-dark${transparency}${alt}`);
 		});
 	});
 });
diff --git a/tests/Qogir.js b/tests/Qogir.js
index 7c23067..5f07e29 100644
--- a/tests/Qogir.js
+++ b/tests/Qogir.js
@@ -24,20 +24,20 @@ const { Variants } = require('./_variants');
 	['', '-win'].forEach(alt => {
 		test(`Qogir${color}${alt}`, t => {
 			const variants = Variants.guess_from(`Qogir${color}${alt}`);
-			t.is(variants.day, `Qogir${color}${alt}`);
-			t.is(variants.night, `Qogir${color}${alt}-dark`);
+			t.is(variants.get('day'), `Qogir${color}${alt}`);
+			t.is(variants.get('night'), `Qogir${color}${alt}-dark`);
 		});
 
 		test(`Qogir${color}${alt}-dark`, t => {
 			const variants = Variants.guess_from(`Qogir${color}${alt}-dark`);
-			t.is(variants.day, `Qogir${color}${alt}`);
-			t.is(variants.night, `Qogir${color}${alt}-dark`);
+			t.is(variants.get('day'), `Qogir${color}${alt}`);
+			t.is(variants.get('night'), `Qogir${color}${alt}-dark`);
 		});
 
 		test(`Qogir${color}${alt}light`, t => {
 			const variants = Variants.guess_from(`Qogir${color}${alt}-light`);
-			t.is(variants.day, `Qogir${color}${alt}-light`);
-			t.is(variants.night, `Qogir${color}${alt}-dark`);
+			t.is(variants.get('day'), `Qogir${color}${alt}-light`);
+			t.is(variants.get('night'), `Qogir${color}${alt}-dark`);
 		});
 	});
 });
diff --git a/tests/Vimix.js b/tests/Vimix.js
index d398df5..472a594 100644
--- a/tests/Vimix.js
+++ b/tests/Vimix.js
@@ -24,19 +24,19 @@ const { Variants } = require('./_variants');
 	['', '-beryl', '-doder', '-ruby'].forEach(color => {
 		test(`vimix${size}${color}`, t => {
 			const variants = Variants.guess_from(`vimix${size}${color}`);
-			t.is(variants.day, `vimix${size}${color}`);
-			t.is(variants.night, `vimix-dark${size}${color}`);
+			t.is(variants.get('day'), `vimix${size}${color}`);
+			t.is(variants.get('night'), `vimix-dark${size}${color}`);
 		});
 
 		test(`vimix-dark${size}${color}`, t => {
 			const variants = Variants.guess_from(`vimix-dark${size}${color}`);
-			t.is(variants.day, `vimix${size}${color}`);
-			t.is(variants.night, `vimix-dark${size}${color}`);
+			t.is(variants.get('day'), `vimix${size}${color}`);
+			t.is(variants.get('night'), `vimix-dark${size}${color}`);
 		});
 		test(`vimix-light${size}${color}`, t => {
 			const variants = Variants.guess_from(`vimix-light${size}${color}`);
-			t.is(variants.day, `vimix-light${size}${color}`);
-			t.is(variants.night, `vimix-dark${size}${color}`);
+			t.is(variants.get('day'), `vimix-light${size}${color}`);
+			t.is(variants.get('night'), `vimix-dark${size}${color}`);
 		});
 	});
 });
diff --git a/tests/Yaru.js b/tests/Yaru.js
index fadeec0..2ed79d7 100644
--- a/tests/Yaru.js
+++ b/tests/Yaru.js
@@ -22,18 +22,18 @@ const { Variants } = require('./_variants');
 
 test('Yaru', t => {
 	const variants = Variants.guess_from('Yaru');
-	t.is(variants.day, 'Yaru');
-	t.is(variants.night, 'Yaru-dark');
+	t.is(variants.get('day'), 'Yaru');
+	t.is(variants.get('night'), 'Yaru-dark');
 });
 
 test('Yaru-dark', t => {
 	const variants = Variants.guess_from('Yaru-dark');
-	t.is(variants.day, 'Yaru');
-	t.is(variants.night, 'Yaru-dark');
+	t.is(variants.get('day'), 'Yaru');
+	t.is(variants.get('night'), 'Yaru-dark');
 });
 
 test('Yaru-light', t => {
 	const variants = Variants.guess_from('Yaru-light');
-	t.is(variants.day, 'Yaru-light');
-	t.is(variants.night, 'Yaru-dark');
+	t.is(variants.get('day'), 'Yaru-light');
+	t.is(variants.get('night'), 'Yaru-dark');
 });
diff --git a/tests/default.js b/tests/default.js
index dad156a..d9bed78 100644
--- a/tests/default.js
+++ b/tests/default.js
@@ -21,30 +21,30 @@ const { Variants } = require('./_variants');
 
 test('default', t => {
 	const variants = Variants.guess_from('default');
-	t.is(variants.day, 'default');
-	t.is(variants.night, 'default-dark');
+	t.is(variants.get('day'), 'default');
+	t.is(variants.get('night'), 'default-dark');
 });
 
 test('default-dark', t => {
 	const variants = Variants.guess_from('default-dark');
-	t.is(variants.day, 'default');
-	t.is(variants.night, 'default-dark');
+	t.is(variants.get('day'), 'default');
+	t.is(variants.get('night'), 'default-dark');
 });
 
 test('default-light', t => {
 	const variants = Variants.guess_from('default-light');
-	t.is(variants.day, 'default-light');
-	t.is(variants.night, 'default-dark');
+	t.is(variants.get('day'), 'default-light');
+	t.is(variants.get('night'), 'default-dark');
 });
 
 test('default-darker', t => {
 	const variants = Variants.guess_from('default-darker');
-	t.is(variants.day, 'default-darker');
-	t.is(variants.night, 'default-dark');
+	t.is(variants.get('day'), 'default-darker');
+	t.is(variants.get('night'), 'default-dark');
 });
 
 test('default-darkest', t => {
 	const variants = Variants.guess_from('default-darkest');
-	t.is(variants.day, 'default');
-	t.is(variants.night, 'default-darkest');
+	t.is(variants.get('day'), 'default');
+	t.is(variants.get('night'), 'default-darkest');
 });