diff --git a/src/modules/ShellVariants.js b/src/modules/ShellVariants.js
index f2520d4..cdb0fa3 100644
--- a/src/modules/ShellVariants.js
+++ b/src/modules/ShellVariants.js
@@ -47,7 +47,11 @@ var ShellVariants = class {
 		const variants = new Map();
 		variants.set('original', name);
 
-		if ( name.includes('Adapta') ) {
+		if ( name === '' ) {
+			variants.set('day', '');
+			variants.set('night', '');
+		}
+		else if ( name.includes('Adapta') ) {
 			variants.set('day', name.replace('-Nokto', ''));
 			variants.set('night', variants.get('day').replace('Adapta', 'Adapta-Nokto'));
 		}
diff --git a/tests/gtk_themes/base.js b/tests/gtk_themes/base.js
new file mode 100644
index 0000000..054d9c2
--- /dev/null
+++ b/tests/gtk_themes/base.js
@@ -0,0 +1,50 @@
+/*
+Night Theme Switcher Gnome Shell extension
+
+Copyright (C) 2020 Romain Vigier
+
+This program is free software: you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation, either version 3 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http s ://www.gnu.org/licenses/>.
+*/
+
+const test = require('ava');
+const { Variants } = require('./_variants');
+
+test('base', t => {
+	const variants = Variants.guess_from('base');
+	t.is(variants.get('day'), 'base');
+	t.is(variants.get('night'), 'base-dark');
+});
+
+test('base-dark', t => {
+	const variants = Variants.guess_from('base-dark');
+	t.is(variants.get('day'), 'base');
+	t.is(variants.get('night'), 'base-dark');
+});
+
+test('base-light', t => {
+	const variants = Variants.guess_from('base-light');
+	t.is(variants.get('day'), 'base-light');
+	t.is(variants.get('night'), 'base-dark');
+});
+
+test('base-darker', t => {
+	const variants = Variants.guess_from('base-darker');
+	t.is(variants.get('day'), 'base-darker');
+	t.is(variants.get('night'), 'base-dark');
+});
+
+test('base-darkest', t => {
+	const variants = Variants.guess_from('base-darkest');
+	t.is(variants.get('day'), 'base');
+	t.is(variants.get('night'), 'base-darkest');
+});
diff --git a/tests/gtk_themes/default.js b/tests/gtk_themes/default.js
deleted file mode 100644
index d9bed78..0000000
--- a/tests/gtk_themes/default.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Night Theme Switcher Gnome Shell extension
-
-Copyright (C) 2020 Romain Vigier
-
-This program is free software: you can redistribute it and/or modify it under
-the terms of the GNU General Public License as published by the Free Software
-Foundation, either version 3 of the License, or (at your option) any later
-version.
-
-This program is distributed in the hope that it will be useful, but WITHOUT
-ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along with
-this program. If not, see <http s ://www.gnu.org/licenses/>.
-*/
-
-const test = require('ava');
-const { Variants } = require('./_variants');
-
-test('default', t => {
-	const variants = Variants.guess_from('default');
-	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.get('day'), 'default');
-	t.is(variants.get('night'), 'default-dark');
-});
-
-test('default-light', t => {
-	const variants = Variants.guess_from('default-light');
-	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.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.get('day'), 'default');
-	t.is(variants.get('night'), 'default-darkest');
-});
diff --git a/tests/shell_themes/base.js b/tests/shell_themes/base.js
new file mode 100644
index 0000000..054d9c2
--- /dev/null
+++ b/tests/shell_themes/base.js
@@ -0,0 +1,50 @@
+/*
+Night Theme Switcher Gnome Shell extension
+
+Copyright (C) 2020 Romain Vigier
+
+This program is free software: you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation, either version 3 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with
+this program. If not, see <http s ://www.gnu.org/licenses/>.
+*/
+
+const test = require('ava');
+const { Variants } = require('./_variants');
+
+test('base', t => {
+	const variants = Variants.guess_from('base');
+	t.is(variants.get('day'), 'base');
+	t.is(variants.get('night'), 'base-dark');
+});
+
+test('base-dark', t => {
+	const variants = Variants.guess_from('base-dark');
+	t.is(variants.get('day'), 'base');
+	t.is(variants.get('night'), 'base-dark');
+});
+
+test('base-light', t => {
+	const variants = Variants.guess_from('base-light');
+	t.is(variants.get('day'), 'base-light');
+	t.is(variants.get('night'), 'base-dark');
+});
+
+test('base-darker', t => {
+	const variants = Variants.guess_from('base-darker');
+	t.is(variants.get('day'), 'base-darker');
+	t.is(variants.get('night'), 'base-dark');
+});
+
+test('base-darkest', t => {
+	const variants = Variants.guess_from('base-darkest');
+	t.is(variants.get('day'), 'base');
+	t.is(variants.get('night'), 'base-darkest');
+});
diff --git a/tests/shell_themes/default.js b/tests/shell_themes/default.js
index d9bed78..761d225 100644
--- a/tests/shell_themes/default.js
+++ b/tests/shell_themes/default.js
@@ -20,31 +20,7 @@ const test = require('ava');
 const { Variants } = require('./_variants');
 
 test('default', t => {
-	const variants = Variants.guess_from('default');
-	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.get('day'), 'default');
-	t.is(variants.get('night'), 'default-dark');
-});
-
-test('default-light', t => {
-	const variants = Variants.guess_from('default-light');
-	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.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.get('day'), 'default');
-	t.is(variants.get('night'), 'default-darkest');
+	const variants = Variants.guess_from('');
+	t.is(variants.get('day'), '');
+	t.is(variants.get('night'), '');
 });