diff --git a/e2e-tests/cypress/e2e/add-connection.cy.js b/e2e-tests/cypress/e2e/add-connection.cy.js
index 3bd67ec55..06b9916f1 100644
--- a/e2e-tests/cypress/e2e/add-connection.cy.js
+++ b/e2e-tests/cypress/e2e/add-connection.cy.js
@@ -13,7 +13,7 @@ describe('Add connection', () => {
   it('adds connection', () => {
     // cy.get('[data-testid=ConnectionList_buttonNewConnection]').click();
     cy.get('[data-testid=ConnectionDriverFields_connectionType]').select('MySQL');
-    cy.themeshot('connection');
+    cy.themeshot('new-connection');
     cy.get('[data-testid=ConnectionDriverFields_user]').clear().type('root');
     cy.get('[data-testid=ConnectionDriverFields_password]').clear().type('Pwd2020Db');
     cy.get('[data-testid=ConnectionDriverFields_port]').clear().type('16004');
@@ -24,10 +24,10 @@ describe('Add connection', () => {
     cy.contains('Connected:');
 
     cy.testid('ConnectionTab_tabSshTunnel').click();
-    cy.testid('ConnectionTab_tabControlContent').themeshot('fragment-connection-sshtunnel', { padding: 50 });
+    cy.testid('ConnectionTab_tabControlContent').themeshot('connection-sshtunnel-window', { padding: 50 });
 
     cy.testid('ConnectionTab_tabSsl').click();
-    cy.testid('ConnectionTab_tabControlContent').themeshot('fragment-connection-ssl', { padding: 50 });
+    cy.testid('ConnectionTab_tabControlContent').themeshot('connection-ssl-window', { padding: 50 });
 
     // save and connect
     cy.get('[data-testid=ConnectionTab_buttonSave]').click();
diff --git a/e2e-tests/cypress/e2e/browse-data.cy.js b/e2e-tests/cypress/e2e/browse-data.cy.js
index fd1a21875..fcc224d64 100644
--- a/e2e-tests/cypress/e2e/browse-data.cy.js
+++ b/e2e-tests/cypress/e2e/browse-data.cy.js
@@ -31,7 +31,7 @@ describe('Data browser data', () => {
     cy.contains('Finished job script');
     cy.contains('Album.csv');
     cy.testid('WidgetIconPanel_database').click();
-    cy.themeshot('exportcsv');
+    cy.themeshot('configure-export-csv');
   });
 
   it('Data archive editor - macros', () => {
@@ -42,7 +42,7 @@ describe('Data browser data', () => {
     cy.contains('Out Of Exile').click({ shiftKey: true });
     cy.contains('Change text case').click();
     cy.contains('AUDIOSLAVE');
-    cy.themeshot('freetable');
+    cy.themeshot('data-archive-macros');
   });
 
   it('Load table data', () => {
@@ -93,7 +93,7 @@ describe('Data browser data', () => {
     // hide what is not needed
     cy.testid('WidgetIconPanel_database').click();
     cy.testid('DataGrid_itemReferences').click();
-    cy.themeshot('filter');
+    cy.themeshot('data-browser-filter');
     cy.testid('DataGridCore_button_clearFilters').click();
     cy.contains('Rows: 347');
   });
@@ -117,16 +117,16 @@ describe('Data browser data', () => {
     cy.contains('PgChinook').click();
     cy.contains('customer').click();
     cy.contains('Leonie').click();
-    cy.themeshot('datagrid');
+    cy.themeshot('common-data-browser');
 
     cy.contains('invoice').click();
     cy.contains('invoice_line (invoice_id)').click();
-    cy.themeshot('masterdetail');
+    cy.themeshot('data-browser-master-detail');
 
     cy.contains('9, Place Louis Barthou').click();
     cy.contains('Switch to form').click();
     cy.contains('Switch to table'); // test that we are in form view
-    cy.themeshot('formview');
+    cy.themeshot('data-browser-form-view');
   });
 
   it('SQL Gen', () => {
@@ -134,7 +134,7 @@ describe('Data browser data', () => {
     cy.contains('PgChinook').rightclick();
     cy.contains('SQL Generator').click();
     cy.contains('Check all').click();
-    cy.themeshot('sqlgen');
+    cy.themeshot('sql-generator');
   });
 
   it('Macros in DB', () => {
@@ -149,7 +149,7 @@ describe('Data browser data', () => {
     cy.testid('DataGrid_itemMacros').click();
     cy.contains('Change text case').click();
     cy.contains('NIELSEN');
-    cy.themeshot('macros');
+    cy.themeshot('data-browser-macros');
   });
 
   it('Perspectives', () => {
@@ -165,7 +165,7 @@ describe('Data browser data', () => {
     // check track is loaded
     cy.contains('Put The Finger On You');
 
-    cy.themeshot('perspective1');
+    cy.themeshot('perspective-designer');
   });
 
   it('Query editor - code completion', () => {
@@ -179,7 +179,7 @@ describe('Data browser data', () => {
     cy.get('body').realType('select * from Album where Album.');
     // code completion
     cy.contains('ArtistId');
-    cy.themeshot('query');
+    cy.themeshot('query-editor-code-completion');
   });
 
   it('Query editor - join wizard', () => {
@@ -192,7 +192,7 @@ describe('Data browser data', () => {
     cy.get('body').realPress(['Control', 'j']);
     // JOIN wizard
     cy.contains('INNER JOIN Customer ON Invoice.CustomerId = Customer.CustomerId');
-    cy.themeshot('joinwizard');
+    cy.themeshot('query-editor-join-wizard');
   });
 
   it('Mongo JSON data view', () => {
@@ -209,7 +209,7 @@ describe('Data browser data', () => {
     cy.testid('WidgetIconPanel_cell-data').click();
     // test JSON view
     cy.contains('Country: "Brazil"');
-    cy.themeshot('mongoquery');
+    cy.themeshot('mongo-query-json-view');
   });
 
   it('SQL preview', () => {
@@ -219,7 +219,7 @@ describe('Data browser data', () => {
     cy.contains('Show SQL').click();
     // index should be part of create script
     cy.contains('CREATE INDEX `IFK_CustomerSupportRepId`');
-    cy.themeshot('sqlpreview');
+    cy.themeshot('sql-preview-create-index');
   });
 
   it('Query designer', () => {
@@ -228,7 +228,7 @@ describe('Data browser data', () => {
     cy.testid('WidgetIconPanel_file').click();
     cy.contains('customer').click();
     // cy.contains('left join').rightclick();
-    cy.themeshot('querydesigner');
+    cy.themeshot('query-designer');
   });
 
   it('Database diagram', () => {
@@ -239,7 +239,7 @@ describe('Data browser data', () => {
     cy.testid('WidgetIconPanel_file').click();
     // check diagram is shown
     cy.contains('MediaTypeId');
-    cy.themeshot('diagram');
+    cy.themeshot('database-diagram');
   });
 
   it('Charts', () => {
@@ -248,7 +248,7 @@ describe('Data browser data', () => {
     cy.contains('line-chart').click();
     cy.testid('TabsPanel_buttonSplit').click();
     cy.testid('WidgetIconPanel_file').click();
-    cy.themeshot('charts');
+    cy.themeshot('view-split-charts');
   });
 
   it('Keyboard configuration', () => {
@@ -256,7 +256,7 @@ describe('Data browser data', () => {
     cy.contains('Keyboard shortcuts').click();
     cy.contains('dataForm.refresh').click();
     cy.testid('CommandModal_keyboardButton').click();
-    cy.themeshot('keyboard');
+    cy.themeshot('keyboard-configuration');
   });
 
   it('Command palette', () => {
@@ -267,7 +267,7 @@ describe('Data browser data', () => {
     // cy.realPress('F1');
     cy.realPress('PageDown');
     cy.realPress('PageDown');
-    cy.testid('CommandPalette_main').themeshot('commandpalette', { padding: 50 });
+    cy.testid('CommandPalette_main').themeshot('command-palette', { padding: 50 });
   });
 
   it('Show map', () => {
@@ -280,7 +280,7 @@ describe('Data browser data', () => {
     cy.contains('13.9').click({ shiftKey: true });
     cy.testid('WidgetIconPanel_cell-data').click();
     cy.wait(2000);
-    cy.themeshot('map');
+    cy.themeshot('cell-map-view');
   });
 
   it('Search in connections', () => {
@@ -292,7 +292,7 @@ describe('Data browser data', () => {
     cy.contains('Album').click();
     cy.testid('SqlObjectList_searchMenuDropDown').click();
     cy.contains('Column name').click();
-    cy.themeshot('connsearch');
+    cy.themeshot('search-in-connections');
   });
 
   it('Plugin tab', () => {
@@ -302,7 +302,7 @@ describe('Data browser data', () => {
     cy.contains('Total white theme');
     // wait for load logos
     cy.wait(2000);
-    cy.themeshot('plugin');
+    cy.themeshot('view-plugin-tab');
   });
 
   it('Edit mongo data JSON', () => {
@@ -329,7 +329,7 @@ describe('Data browser data', () => {
     cy.contains('Helena').rightclick();
     cy.contains('Delete document').click();
     cy.contains('Save').click();
-    cy.themeshot('mongosave');
+    cy.themeshot('save-changes-mongodb');
   });
 
   it('Edit mongo data JSON', () => {
@@ -343,7 +343,7 @@ describe('Data browser data', () => {
     cy.testid('ColumnManagerRow_checkbox__id').click();
     cy.testid('DataFilterControl_input_countries.1').type('EXISTS{enter}');
     cy.testid('WidgetIconPanel_cell-data').click();
-    cy.themeshot('collection');
+    cy.themeshot('mongodb-json-cell-view');
   });
 
   it('Table structure editor', () => {
@@ -355,7 +355,7 @@ describe('Data browser data', () => {
     cy.themeshot('structure');
     cy.contains('EmployeeId').click();
     cy.contains('Ref column - Employee');
-    cy.themeshot('fkeditor');
+    cy.themeshot('foreign-key-editor');
   });
 
   it('Compare database', () => {
@@ -370,7 +370,7 @@ describe('Data browser data', () => {
     cy.themeshot('dbcompare');
     cy.contains('Settings').click();
     cy.testid('CompareModelTab_tabOperations').click();
-    cy.themeshot('comparesettings');
+    cy.themeshot('compare-database-settings');
   });
 
   it('Query editor - AI assistant', () => {
@@ -385,7 +385,7 @@ describe('Data browser data', () => {
     cy.contains('Use this', { timeout: 10000 }).click();
     cy.testid('QueryTab_executeButton').click();
     cy.contains('Balls to the Wall');
-    cy.themeshot('aiassistant');
+    cy.themeshot('ai-assistant');
   });
 
   it('Modify data', () => {
@@ -411,7 +411,7 @@ describe('Data browser data', () => {
     cy.contains('INSERT INTO `Employee`');
     cy.contains("SET `FirstName`='Jane'");
     cy.contains('DELETE FROM `Employee`');
-    cy.themeshot('modifydata');
+    cy.themeshot('data-browser-save-changes');
 
     // cy.testid('ConfirmSqlModal_okButton').click();
     // cy.contains('Cannot delete or update a parent row')
@@ -434,7 +434,7 @@ describe('Data browser data', () => {
     cy.testid('DataFilterControl_input_ArtistId').type('22{enter}');
     // cy.contains('Presence').rightclick();
     cy.contains('Export').click();
-    cy.themeshot('simpleexport');
+    cy.themeshot('data-browser-export-menu');
   });
 
   it('MySQL native backup', () => {
@@ -442,7 +442,7 @@ describe('Data browser data', () => {
     cy.contains('MyChinook').rightclick();
     cy.contains('Create database backup').click();
     cy.contains('Customer');
-    cy.themeshot('mysqlbackup');
+    cy.themeshot('mysql-backup-configuration');
   });
 
   it('View table YAML model', () => {
@@ -456,7 +456,7 @@ describe('Data browser data', () => {
     cy.testid('ExportDbModelModal_exportButton').click();
     cy.contains('Album').click();
     cy.contains('autoIncrement');
-    cy.themeshot('tableyaml');
+    cy.themeshot('database-model-table-yaml');
   });
 
   it('Data duplicator', () => {
@@ -468,6 +468,6 @@ describe('Data browser data', () => {
     cy.contains('Dry run').click();
     cy.testid('DataDuplicatorTab_importIntoDb').click();
     cy.contains('Duplicated Album, inserted 347 rows, mapped 0 rows, missing 0 rows, skipped 0 rows');
-    cy.themeshot('dataduplicator');
+    cy.themeshot('data-duplicator');
   });
 });
diff --git a/e2e-tests/cypress/e2e/team.cy.js b/e2e-tests/cypress/e2e/team.cy.js
index a1f03a2d4..d63ed0332 100644
--- a/e2e-tests/cypress/e2e/team.cy.js
+++ b/e2e-tests/cypress/e2e/team.cy.js
@@ -14,18 +14,18 @@ describe('Team edition tests', () => {
     cy.contains('New connection').click();
     cy.contains('New connection').click();
     cy.testid('ConnectionDriverFields_connectionType').select('PostgreSQL');
-    cy.themeshot('connadmin');
+    cy.themeshot('connection-administration');
 
     cy.testid('AdminMenuWidget_itemRoles').click();
     cy.contains('Permissions').click();
-    cy.themeshot('roleadmin');
+    cy.themeshot('role-administration');
 
     cy.testid('AdminMenuWidget_itemAuthentication').click();
     cy.contains('Add authentication').click();
     cy.contains('Use database login').click();
     cy.contains('Add authentication').click();
     cy.contains('OAuth 2.0').click();
-    cy.themeshot('authadmin');
+    cy.themeshot('authentication-administration');
   });
 
   it('OAuth authentication', () => {