diff --git a/src/variants.js b/src/variants.js
index 8f7f7d5..5780bda 100644
--- a/src/variants.js
+++ b/src/variants.js
@@ -18,7 +18,7 @@ var Variants = class {
 		}
 		else if ( name.includes('Arc') ) {
 			variants.day = name.replace(/-Dark(?!er)/g, '');
-			variants.night = variants.day.replace('-Darker', '') + '-Dark';
+			variants.night = variants.day.replace(/Arc(-Darker)?/g, 'Arc-Dark');
 		}
 		else if ( name.includes('Flat-Remix-GTK') ) {
 			const isSolid = name.includes('-Solid');
diff --git a/tests/Arc.js b/tests/Arc.js
index 66c60c6..8e25376 100644
--- a/tests/Arc.js
+++ b/tests/Arc.js
@@ -20,22 +20,19 @@ test('Arc-Darker', t => {
 	t.is(variants.night, 'Arc-Dark');
 });
 
-// TODO: Implement solid variant
-test.skip('Arc-Darker-solid', t => {
+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');
 });
 
-// TODO: Implement solid variant
-test.skip('Arc-Dark-solid', t => {
+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');
 });
 
-// TODO: Implement solid variant
-test.skip('Arc-solid', t => {
+test('Arc-solid', t => {
 	const variants = Variants.guess_from('Arc-solid');
 	t.is(variants.day, 'Arc-solid');
 	t.is(variants.night, 'Arc-Dark-solid');