diff --git a/client/src/components/Header/DropdownMenuItem/DropdownMenuItem.module.css b/client/src/components/Header/DropdownMenuItem/DropdownMenuItem.module.css
index db34b6718..0220a0d15 100644
--- a/client/src/components/Header/DropdownMenuItem/DropdownMenuItem.module.css
+++ b/client/src/components/Header/DropdownMenuItem/DropdownMenuItem.module.css
@@ -19,6 +19,7 @@
     outline: none;
 }
 
-.item:hover, .item:focus-visible {
+.item:hover,
+.item:focus-visible {
     background-color: var(--colors-grey300);
 }
diff --git a/client/src/components/Header/Header.module.css b/client/src/components/Header/Header.module.css
index 1a5ea1048..3843b0c4e 100644
--- a/client/src/components/Header/Header.module.css
+++ b/client/src/components/Header/Header.module.css
@@ -1,7 +1,7 @@
 @value m-medium from 'src/styles/breakpoints.css';
 
 :root {
-    --header-bg: #1C2431;
+    --header-bg: #1c2431;
     --header-height: 48px;
 }
 
@@ -109,7 +109,9 @@
     font-size: inherit;
 }
 
-.navLink a:hover, .navLink a:focus, .activeNavLink {
+.navLink a:hover,
+.navLink a:focus,
+.activeNavLink {
     color: var(--colors-grey050);
     background: black;
 }
diff --git a/client/src/components/MarkdownEditor/MarkdownEditor.module.css b/client/src/components/MarkdownEditor/MarkdownEditor.module.css
index adf5475a8..12e797c4e 100644
--- a/client/src/components/MarkdownEditor/MarkdownEditor.module.css
+++ b/client/src/components/MarkdownEditor/MarkdownEditor.module.css
@@ -1,4 +1,3 @@
-
 .markdownFieldWrapper {
     border: 1px solid var(--colors-grey500);
     border-radius: 3px;
diff --git a/client/src/components/Screenshots/Screenshots.module.css b/client/src/components/Screenshots/Screenshots.module.css
index 0771f51ce..3132a8a55 100644
--- a/client/src/components/Screenshots/Screenshots.module.css
+++ b/client/src/components/Screenshots/Screenshots.module.css
@@ -19,13 +19,15 @@
     border: 4px solid var(--colors-grey200);
 }
 
-.otherScreenshot:hover, .otherScreenshot:focus {
+.otherScreenshot:hover,
+.otherScreenshot:focus {
     border-color: var(--colors-grey400);
     outline: none;
 }
 
 .otherScreenshotCurrent,
-.otherScreenshotCurrent:hover, .otherScreenshotCurrent:focus {
+.otherScreenshotCurrent:hover,
+.otherScreenshotCurrent:focus {
     border-color: var(--colors-blue500);
 }
 
diff --git a/client/src/components/Versions/ChangeLogViewer.module.css b/client/src/components/Versions/ChangeLogViewer.module.css
index 39f588dc3..31e9ceb9a 100644
--- a/client/src/components/Versions/ChangeLogViewer.module.css
+++ b/client/src/components/Versions/ChangeLogViewer.module.css
@@ -1,6 +1,6 @@
 .cardContainer {
-    margin: var(--spacers-dp8);;
-    padding: var(--spacers-dp8);;
+    margin: var(--spacers-dp8);
+    padding: var(--spacers-dp8);
 }
 
 .header {
diff --git a/client/src/pages/AppView/AppView.module.css b/client/src/pages/AppView/AppView.module.css
index c6943861a..1108b54ff 100644
--- a/client/src/pages/AppView/AppView.module.css
+++ b/client/src/pages/AppView/AppView.module.css
@@ -55,7 +55,6 @@
     margin-bottom: var(--spacers-dp12);
 }
 
-
 .appCardParagraph {
     font-size: 15px;
     line-height: 19px;
@@ -88,25 +87,25 @@
     color: var(--colors-grey700);
 }
 
-
 .divider {
     max-width: 80%;
 }
 
 .sourceUrl:before {
     display: block;
-    content: "";
+    content: '';
 }
 
-.link, .sourceUrl {
+.link,
+.sourceUrl {
     font-size: 14px;
     color: var(--colors-blue700);
     text-decoration: underline;
 }
 
-.link:hover, .sourceUrl:hover,
-.link:focus, .sourceUrl:focus {
+.link:hover,
+.sourceUrl:hover,
+.link:focus,
+.sourceUrl:focus {
     color: var(--colors-grey900);
 }
-
-
diff --git a/client/src/pages/Apps/AppCards/AppCardItem/AppCardItem.module.css b/client/src/pages/Apps/AppCards/AppCardItem/AppCardItem.module.css
index bc66ac49d..ed2e60d7e 100644
--- a/client/src/pages/Apps/AppCards/AppCardItem/AppCardItem.module.css
+++ b/client/src/pages/Apps/AppCards/AppCardItem/AppCardItem.module.css
@@ -8,11 +8,11 @@
     cursor: pointer;
 }
 
-.appCard:hover, .appCard:focus {
+.appCard:hover,
+.appCard:focus {
     background: inherit;
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05),
-                0 2px 4px -1px rgba(0, 0, 0, 0.06),
-                0 4px 6px -1px rgba(0, 0, 0, 0.10);
+        0 2px 4px -1px rgba(0, 0, 0, 0.06), 0 4px 6px -1px rgba(0, 0, 0, 0.1);
 }
 
 .appCardHeader {
@@ -28,7 +28,8 @@
     margin-bottom: var(--spacers-dp4);
 }
 
-.appCardDeveloper, .appCardType {
+.appCardDeveloper,
+.appCardType {
     margin: var(--spacers-dp4) 0;
     font-size: 14px;
 }
@@ -48,7 +49,7 @@
 }
 
 .appCardType {
-    color: var(--colors-grey700)
+    color: var(--colors-grey700);
 }
 
 .appCardDescription {
@@ -61,7 +62,7 @@
 }
 
 .coreAppIcon {
-    width: 25px
+    width: 25px;
 }
 
 .summary {
diff --git a/client/src/pages/Apps/Apps.module.css b/client/src/pages/Apps/Apps.module.css
index 2c1711ef5..b277c14fb 100644
--- a/client/src/pages/Apps/Apps.module.css
+++ b/client/src/pages/Apps/Apps.module.css
@@ -2,13 +2,13 @@
 
 .container {
     display: grid;
-    grid-template-areas: "filters" "apps";
+    grid-template-areas: 'filters' 'apps';
     padding: var(--spacers-dp16) var(--spacers-dp12);
 }
 
 @media m-medium {
     .container {
-        grid-template-areas: "filters apps";
+        grid-template-areas: 'filters apps';
         grid-template-columns: 224px auto;
         grid-gap: var(--spacers-dp24);
         padding: 0;
diff --git a/client/src/pages/OrganisationView/OrganisationView.module.css b/client/src/pages/OrganisationView/OrganisationView.module.css
index 94387cd7f..b8d2793f8 100644
--- a/client/src/pages/OrganisationView/OrganisationView.module.css
+++ b/client/src/pages/OrganisationView/OrganisationView.module.css
@@ -16,7 +16,8 @@
     margin-right: var(--spacers-dp8);
 }
 
-.createdAt, .description {
+.createdAt,
+.description {
     margin-top: var(--spacers-dp8);
     margin-bottom: var(--spacers-dp8);
 
@@ -26,9 +27,8 @@
 .description {
     color: var(--colors-grey900);
     line-height: 1.6em;
-
 }
 
 .flex {
     display: flex;
-}
\ No newline at end of file
+}
diff --git a/client/src/pages/UserApp/DetailsCard/DetailsCard.module.css b/client/src/pages/UserApp/DetailsCard/DetailsCard.module.css
index af3e48988..61abfb5ce 100644
--- a/client/src/pages/UserApp/DetailsCard/DetailsCard.module.css
+++ b/client/src/pages/UserApp/DetailsCard/DetailsCard.module.css
@@ -42,11 +42,15 @@
     max-width: 640px;
 }
 
-.link, .sourceUrl {
+.link,
+.sourceUrl {
     color: var(--colors-blue700);
     text-decoration: underline;
 }
 
-.link:hover, .link:focus, .sourceUrl:hover, .sourceUrl:focus {
+.link:hover,
+.link:focus,
+.sourceUrl:hover,
+.sourceUrl:focus {
     color: var(--colors-grey900);
 }
diff --git a/client/src/pages/UserApp/ScreenshotsCard/ScreenshotsCard.module.css b/client/src/pages/UserApp/ScreenshotsCard/ScreenshotsCard.module.css
index dc4a4076b..a0bc236a5 100644
--- a/client/src/pages/UserApp/ScreenshotsCard/ScreenshotsCard.module.css
+++ b/client/src/pages/UserApp/ScreenshotsCard/ScreenshotsCard.module.css
@@ -15,7 +15,8 @@
     text-decoration: underline;
 }
 
-.screenshotsGuidelinesLink:hover, .screenshotsGuidelinesLink:focus {
+.screenshotsGuidelinesLink:hover,
+.screenshotsGuidelinesLink:focus {
     color: var(--colors-grey900);
 }
 
diff --git a/client/src/pages/UserAppUpload/UserAppUpload.module.css b/client/src/pages/UserAppUpload/UserAppUpload.module.css
index 0a8d9d192..c7ccbe095 100644
--- a/client/src/pages/UserAppUpload/UserAppUpload.module.css
+++ b/client/src/pages/UserAppUpload/UserAppUpload.module.css
@@ -72,7 +72,8 @@
     text-decoration: underline;
 }
 
-.helpTextLink:hover, .helpTextLink:focus {
+.helpTextLink:hover,
+.helpTextLink:focus {
     color: var(--colors-grey900);
 }
 
diff --git a/client/src/pages/UserAppVersionNew/UserAppVersionNew.module.css b/client/src/pages/UserAppVersionNew/UserAppVersionNew.module.css
index d9da7e24d..3b8b29c81 100644
--- a/client/src/pages/UserAppVersionNew/UserAppVersionNew.module.css
+++ b/client/src/pages/UserAppVersionNew/UserAppVersionNew.module.css
@@ -22,6 +22,7 @@
     text-decoration: underline;
 }
 
-.helpTextLink:hover, .helpTextLink:focus {
+.helpTextLink:hover,
+.helpTextLink:focus {
     color: var(--colors-grey900);
 }
diff --git a/client/src/pages/UserApps/AppCard/AppCard.module.css b/client/src/pages/UserApps/AppCard/AppCard.module.css
index 6c1106e0d..86b448c64 100644
--- a/client/src/pages/UserApps/AppCard/AppCard.module.css
+++ b/client/src/pages/UserApps/AppCard/AppCard.module.css
@@ -8,7 +8,8 @@
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05);
 }
 
-.appCardLink, .appCardActions {
+.appCardLink,
+.appCardActions {
     padding: var(--spacers-dp16);
 }
 
diff --git a/client/src/pages/UserOrganisation/UserOrganisation.module.css b/client/src/pages/UserOrganisation/UserOrganisation.module.css
index 3958246c7..baca3a156 100644
--- a/client/src/pages/UserOrganisation/UserOrganisation.module.css
+++ b/client/src/pages/UserOrganisation/UserOrganisation.module.css
@@ -20,7 +20,8 @@
     font-size: 0.8em;
 }
 
-.createdAt, .description {
+.createdAt,
+.description {
     margin-top: var(--spacers-dp8);
     color: var(--colors-grey800);
 }
diff --git a/client/src/pages/UserOrganisations/UserOrganisations.module.css b/client/src/pages/UserOrganisations/UserOrganisations.module.css
index c67acb544..d78bf4e54 100644
--- a/client/src/pages/UserOrganisations/UserOrganisations.module.css
+++ b/client/src/pages/UserOrganisations/UserOrganisations.module.css
@@ -53,7 +53,8 @@
     box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.05);
 }
 
-.organisationLink:hover, .organisationLink:focus {
+.organisationLink:hover,
+.organisationLink:focus {
     background: var(--colors-grey200);
 }
 
diff --git a/client/src/styles/auth0-overrides.css b/client/src/styles/auth0-overrides.css
index 29c0ca790..1ca405d48 100644
--- a/client/src/styles/auth0-overrides.css
+++ b/client/src/styles/auth0-overrides.css
@@ -2,7 +2,9 @@
     background: rgb(39, 102, 150) !important;
 }
 
-.auth0-lock.auth0-lock.auth0-lock-opened .auth0-lock-header-bg .auth0-lock-header-bg-blur {
+.auth0-lock.auth0-lock.auth0-lock-opened
+    .auth0-lock-header-bg
+    .auth0-lock-header-bg-blur {
     opacity: 0 !important;
 }
 
diff --git a/package.json b/package.json
index f00485b88..ef7fc5983 100644
--- a/package.json
+++ b/package.json
@@ -23,10 +23,11 @@
         "clone": "yarn workspace tools clone",
         "lint": "d2-style check",
         "lint:staged": "d2-style check --staged",
-        "format": "yarn format:js && yarn format:text",
+        "format": "yarn format:js && yarn format:css && yarn format:text",
         "format:staged": "yarn format:js --staged && yarn format:text --staged",
         "format:js": "d2-style apply js",
         "format:text": "d2-style apply text",
+        "format:css": "d2-style apply css",
         "format:client": "yarn workspace client format",
         "format:server": "yarn workspace client format"
     },