diff --git a/cypress/integration/visual-tests.spec.js b/cypress/integration/visual-tests.spec.js
index 9529d2dc..874a874d 100644
--- a/cypress/integration/visual-tests.spec.js
+++ b/cypress/integration/visual-tests.spec.js
@@ -155,9 +155,9 @@ context('visual tests', () => {
 		cy.matchImageSnapshot(withTextCompareOptions);
 	});
 
-	it('modern theme eye gaze mode', () => {
+	it('modern light theme -- eye gaze mode', () => {
 		cy.get(".eye-gaze-mode-undo-button").should('exist');
-		selectTheme("Modern");
+		selectTheme("Modern Light");
 		// clickMenuButton("View");
 		// cy.get("body").trigger("pointermove", { clientX: 200, clientY: 150 });
 		cy.wait(100);
@@ -171,7 +171,7 @@ context('visual tests', () => {
 		cy.get(".eye-gaze-mode-undo-button").should('not.exist');
 	});
 
-	it('modern theme', () => {
+	it('modern light theme -- main screenshot', () => {
 		cy.wait(100);
 		// clickMenuButton("View");
 		// cy.get("body").trigger("pointermove", { clientX: 200, clientY: 150 });
@@ -189,9 +189,9 @@ context('visual tests', () => {
 		}
 		cy.get('.window:visible').matchImageSnapshot(Object.assign({}, withTextCompareOptions));
 	};
-	it('modern theme edit colors dialog (expanded)', test_edit_colors_dialog);
+	it('modern light theme -- edit colors dialog (expanded)', test_edit_colors_dialog);
 
-	it('winter theme', () => {
+	it('winter theme -- main screenshot', () => {
 		selectTheme("Winter");
 		// clickMenuButton("View");
 		// cy.get("body").trigger("pointermove", { clientX: 200, clientY: 150 });
@@ -199,9 +199,9 @@ context('visual tests', () => {
 		cy.matchImageSnapshot(withTextCompareOptions);
 	});
 
-	it('winter theme edit colors dialog (expanded)', test_edit_colors_dialog);
+	it('winter theme -- edit colors dialog (expanded)', test_edit_colors_dialog);
 
-	it('winter theme vertical color box', () => {
+	it('winter theme -- vertical color box', () => {
 		cy.wait(500);
 		clickMenuButton("Extras");
 		clickMenuItem("Vertical Color Box");
@@ -211,17 +211,17 @@ context('visual tests', () => {
 		cy.matchImageSnapshot(withTextCompareOptions);
 	});
 
-	it('classic theme vertical color box', () => {
-		selectTheme("Classic");
+	it('vertical color box', () => {
+		selectTheme("Classic Light");
 		cy.matchImageSnapshot(withTextCompareOptions);
 	});
 
-	it('classic theme edit colors dialog', () => {
+	it('edit colors dialog', () => {
 		test_edit_colors_dialog(false);
 	});
 
-	it('modern theme vertical color box', () => {
-		selectTheme("Modern");
+	it('modern light theme -- vertical color box', () => {
+		selectTheme("Modern Light");
 		cy.matchImageSnapshot(withTextCompareOptions);
 	});
 
diff --git a/cypress/snapshots/visual-tests.spec.js/visual tests -- classic theme vertical color box.snap.png b/cypress/snapshots/visual-tests.spec.js/visual tests -- 'vertical color box.snap.png
similarity index 100%
rename from cypress/snapshots/visual-tests.spec.js/visual tests -- classic theme vertical color box.snap.png
rename to cypress/snapshots/visual-tests.spec.js/visual tests -- 'vertical color box.snap.png
diff --git a/cypress/snapshots/visual-tests.spec.js/visual tests -- classic theme edit colors dialog.snap.png b/cypress/snapshots/visual-tests.spec.js/visual tests -- edit colors dialog.snap.png
similarity index 100%
rename from cypress/snapshots/visual-tests.spec.js/visual tests -- classic theme edit colors dialog.snap.png
rename to cypress/snapshots/visual-tests.spec.js/visual tests -- edit colors dialog.snap.png
diff --git a/cypress/snapshots/visual-tests.spec.js/visual tests -- modern theme eye gaze mode.snap.png b/cypress/snapshots/visual-tests.spec.js/visual tests -- modern light theme -- eye gaze mode.snap.png
similarity index 100%
rename from cypress/snapshots/visual-tests.spec.js/visual tests -- modern theme eye gaze mode.snap.png
rename to cypress/snapshots/visual-tests.spec.js/visual tests -- modern light theme -- eye gaze mode.snap.png
diff --git a/cypress/snapshots/visual-tests.spec.js/visual tests -- modern theme edit colors dialog (expanded).snap.png b/cypress/snapshots/visual-tests.spec.js/visual tests -- modern light theme -- main screenshot edit colors dialog (expanded).snap.png
similarity index 100%
rename from cypress/snapshots/visual-tests.spec.js/visual tests -- modern theme edit colors dialog (expanded).snap.png
rename to cypress/snapshots/visual-tests.spec.js/visual tests -- modern light theme -- main screenshot edit colors dialog (expanded).snap.png
diff --git a/cypress/snapshots/visual-tests.spec.js/visual tests -- modern theme.snap.png b/cypress/snapshots/visual-tests.spec.js/visual tests -- modern light theme -- main screenshot.snap.png
similarity index 100%
rename from cypress/snapshots/visual-tests.spec.js/visual tests -- modern theme.snap.png
rename to cypress/snapshots/visual-tests.spec.js/visual tests -- modern light theme -- main screenshot.snap.png
diff --git a/cypress/snapshots/visual-tests.spec.js/visual tests -- modern theme vertical color box.snap.png b/cypress/snapshots/visual-tests.spec.js/visual tests -- modern light theme -- vertical color box.snap.png
similarity index 100%
rename from cypress/snapshots/visual-tests.spec.js/visual tests -- modern theme vertical color box.snap.png
rename to cypress/snapshots/visual-tests.spec.js/visual tests -- modern light theme -- vertical color box.snap.png
diff --git a/cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme vertical color box.snap.png b/cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme -- main screenshot -- vertical color box.snap.png
similarity index 100%
rename from cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme vertical color box.snap.png
rename to cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme -- main screenshot -- vertical color box.snap.png
diff --git a/cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme edit colors dialog (expanded).snap.png b/cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme -- main screenshot edit colors dialog (expanded).snap.png
similarity index 100%
rename from cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme edit colors dialog (expanded).snap.png
rename to cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme -- main screenshot edit colors dialog (expanded).snap.png
diff --git a/cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme.snap.png b/cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme -- main screenshot.snap.png
similarity index 100%
rename from cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme.snap.png
rename to cypress/snapshots/visual-tests.spec.js/visual tests -- winter theme -- main screenshot.snap.png