diff --git a/README.md b/README.md
index d4aae8d..6aeeca9 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@ These themes have been tested and work:
 - Matcha (Manjaro default)
 - Materia
 - Mojave
+- Nextwaita
 - Orchis
 - Plata (Solus default)
 - Pop (Pop!_OS default)
diff --git a/ego_description.txt b/ego_description.txt
index a7a0897..55066db 100644
--- a/ego_description.txt
+++ b/ego_description.txt
@@ -14,6 +14,7 @@ These themes have been tested and work:
 - Matcha (Manjaro default)
 - Materia
 - Mojave
+- Nextwaita
 - Orchis
 - Plata (Solus default)
 - Pop (Pop!_OS default)
diff --git a/src/modules/Variants.js b/src/modules/Variants.js
index 380e258..7c49ae5 100644
--- a/src/modules/Variants.js
+++ b/src/modules/Variants.js
@@ -76,7 +76,7 @@ var Variants = class {
 			variants.set('day', 'HighContrast');
 			variants.set('night', 'HighContrastInverse');
 		}
-		else if ( name.match(/^(Layan|Matcha)/) ) {
+		else if ( name.match(/^(Layan|Matcha|Nextwaita)/) ) {
 			const basename = name.split('-')[0];
 			variants.set('day', name.replace('-dark', ''));
 			variants.set('night', variants.get('day').replace(new RegExp(`${basename}(-light)?`), `${basename}-dark`));
diff --git a/tests/Nextwaita.js b/tests/Nextwaita.js
new file mode 100644
index 0000000..95f4b0f
--- /dev/null
+++ b/tests/Nextwaita.js
@@ -0,0 +1,32 @@
+/*
+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('Nextwaita', t => {
+	const variants = Variants.guess_from('Nextwaita-2.2');
+	t.is(variants.get('day'), 'Nextwaita-2.2');
+	t.is(variants.get('night'), 'Nextwaita-dark-2.2');
+});
+
+test('Nextwaita-dark', t => {
+	const variants = Variants.guess_from('Nextwaita-dark-2.2');
+	t.is(variants.get('day'), 'Nextwaita-2.2');
+	t.is(variants.get('night'), 'Nextwaita-dark-2.2');
+});