diff --git a/app/chatpal-search/client/style.css b/app/chatpal-search/client/style.css
index 890e3c6891f..cc704ea30b0 100644
--- a/app/chatpal-search/client/style.css
+++ b/app/chatpal-search/client/style.css
@@ -1,5 +1,4 @@
 .chatpal-admin-link {
-
 	text-decoration: underline !important;
 
 	color: red !important;
@@ -39,7 +38,6 @@
 }
 
 .chatpal-search-typefilter li {
-
 	display: flex;
 	flex: 0 0 33%;
 
@@ -57,7 +55,6 @@
 }
 
 .chatpal-admin-header {
-
 	margin-bottom: 20px;
 
 	font-size: 18px;
@@ -70,7 +67,6 @@
 }
 
 .chatpal-search-result-single {
-
 	position: relative;
 
 	min-height: 92px;
@@ -84,7 +80,6 @@
 }
 
 .chatpal-search-result-user {
-
 	position: relative;
 
 	min-height: 40px;
@@ -98,7 +93,6 @@
 }
 
 .chatpal-search-result-user .chatpal-avatar {
-
 	position: absolute;
 
 	width: 36px;
@@ -106,7 +100,6 @@
 }
 
 .chatpal-search-result-user .chatpal-avatar .chatpal-avatar-image {
-
 	width: 100%;
 	height: 100%;
 
@@ -135,7 +128,6 @@
 }
 
 .chatpal-show-more-messages {
-
 	margin-bottom: 20px;
 
 	cursor: pointer;
@@ -161,7 +153,6 @@
 }
 
 .chatpal-search-result-single h2 {
-
 	display: flex;
 
 	margin-bottom: 20px;
@@ -169,7 +160,6 @@
 }
 
 .chatpal-search-result-single .chatpal-avatar {
-
 	position: absolute;
 
 	width: 36px;
@@ -177,7 +167,6 @@
 }
 
 .chatpal-search-result-single .chatpal-avatar .chatpal-avatar-image {
-
 	width: 100%;
 	height: 100%;
 
@@ -196,7 +185,6 @@
 }
 
 .chatpal-search-result-single .chatpal-date {
-
 	color: #a0a0a0;
 
 	font-size: 12px;
@@ -205,7 +193,6 @@
 }
 
 .chatpal-search-result-single .chatpal-time {
-
 	margin-left: 3px;
 
 	color: #a0a0a0;
@@ -214,7 +201,6 @@
 }
 
 .chatpal-search-result-single .chatpal-message {
-
 	overflow-x: hidden;
 
 	margin-top: 5px;
@@ -224,7 +210,6 @@
 }
 
 .chatpal-search-result-single .chatpal-message em {
-
 	background-color: #faf9c8;
 
 	font-style: normal;
@@ -246,14 +231,12 @@
 }
 
 .chatpal-paging {
-
 	margin: 30px 0 50px;
 
 	text-align: center;
 }
 
 .chatpal-paging-text {
-
 	position: relative;
 	top: -2px;
 
@@ -261,7 +244,6 @@
 }
 
 .chatpal-paging .chatpal-paging-button {
-
 	display: inline-block;
 
 	cursor: pointer;
@@ -285,7 +267,6 @@
 }
 
 .chatpal-search-welcome {
-
 	padding-top: 40px;
 
 	text-align: center;
@@ -296,7 +277,6 @@
 }
 
 .chatpal-search-result-list em {
-
 	background-color: #faf9c8;
 
 	font-style: normal;
@@ -319,7 +299,6 @@
 }
 
 .chatpal-search-pills div {
-
 	display: inline-block;
 
 	margin-top: 5px;
@@ -337,7 +316,6 @@
 }
 
 .apikey .key {
-
 	position: relative;
 
 	margin: 20px 0;
@@ -356,7 +334,6 @@
 }
 
 .chatpal-suggestion {
-
 	display: flex;
 
 	padding: 10px;
diff --git a/app/search/client/style/style.css b/app/search/client/style/style.css
index 87dadc8c355..e7c5361afcc 100644
--- a/app/search/client/style/style.css
+++ b/app/search/client/style/style.css
@@ -1,5 +1,4 @@
 .rocket-search {
-
 	display: flex;
 	flex: 1;
 
diff --git a/app/theme/client/imports/components/contextual-bar.css b/app/theme/client/imports/components/contextual-bar.css
index e27c96fefae..6ce4092d576 100644
--- a/app/theme/client/imports/components/contextual-bar.css
+++ b/app/theme/client/imports/components/contextual-bar.css
@@ -99,7 +99,6 @@
 		}
 
 		&-icon {
-
 			flex: 0 0 auto;
 
 			margin: 0 0.25rem;
@@ -124,7 +123,6 @@
 		}
 
 		&-title {
-
 			overflow: hidden;
 			flex: 1;
 
@@ -138,7 +136,6 @@
 		}
 
 		&-description {
-
 			display: block;
 			flex: 1;
 
@@ -222,7 +219,6 @@
 	background: var(--rc-color-alert-message-primary-background);
 
 	&--selected {
-
 		cursor: pointer;
 
 		color: var(--rc-color-alert-message-secondary);
diff --git a/app/theme/client/imports/components/header.css b/app/theme/client/imports/components/header.css
index ebf39c94879..587797fac84 100644
--- a/app/theme/client/imports/components/header.css
+++ b/app/theme/client/imports/components/header.css
@@ -108,7 +108,6 @@
 	}
 
 	&__data {
-
 		overflow: hidden;
 
 		flex-direction: column;
diff --git a/app/theme/client/imports/components/main-content.css b/app/theme/client/imports/components/main-content.css
index 04f7cb05d97..4c01f982ee3 100644
--- a/app/theme/client/imports/components/main-content.css
+++ b/app/theme/client/imports/components/main-content.css
@@ -1,5 +1,4 @@
 .main-content {
-
 	position: relative;
 
 	z-index: 0;
diff --git a/app/theme/client/imports/components/modal/create-channel.css b/app/theme/client/imports/components/modal/create-channel.css
index 8fd3fb876a6..f9c5a8be28c 100644
--- a/app/theme/client/imports/components/modal/create-channel.css
+++ b/app/theme/client/imports/components/modal/create-channel.css
@@ -16,7 +16,6 @@
 	}
 
 	&__wrapper {
-
 		display: flex;
 		flex-direction: column;
 
diff --git a/app/theme/client/imports/components/popout.css b/app/theme/client/imports/components/popout.css
index 52164b2c5d5..097f241426e 100644
--- a/app/theme/client/imports/components/popout.css
+++ b/app/theme/client/imports/components/popout.css
@@ -1,20 +1,17 @@
 @keyframes loading {
 	0% {
-
 		transform: scale(0.7);
 
 		opacity: 0;
 	}
 
 	50% {
-
 		transform: scale(1);
 
 		opacity: 1;
 	}
 
 	100% {
-
 		transform: scale(0.7);
 
 		opacity: 0;
diff --git a/app/theme/client/imports/components/sidebar/sidebar-flex.css b/app/theme/client/imports/components/sidebar/sidebar-flex.css
index b124ee54bce..1022a18268b 100644
--- a/app/theme/client/imports/components/sidebar/sidebar-flex.css
+++ b/app/theme/client/imports/components/sidebar/sidebar-flex.css
@@ -1,13 +1,11 @@
 .sidebar-flex {
 	&__header {
-
 		display: flex;
 
 		padding: var(--sidebar-default-padding);
 	}
 
 	&__title {
-
 		flex: 1;
 
 		font-size: 1rem;
diff --git a/app/theme/client/imports/components/sidebar/sidebar.css b/app/theme/client/imports/components/sidebar/sidebar.css
index 1b8f4e312f0..e22e2752b51 100644
--- a/app/theme/client/imports/components/sidebar/sidebar.css
+++ b/app/theme/client/imports/components/sidebar/sidebar.css
@@ -1,5 +1,4 @@
 .sidebar {
-
 	position: relative;
 
 	z-index: 2;
diff --git a/app/theme/client/imports/components/table.css b/app/theme/client/imports/components/table.css
index 16da7f6cf3e..9617002312e 100644
--- a/app/theme/client/imports/components/table.css
+++ b/app/theme/client/imports/components/table.css
@@ -60,7 +60,6 @@
 	}
 
 	& td {
-
 		overflow: hidden;
 
 		padding: 0.25rem 0;
diff --git a/app/theme/client/imports/components/userInfo.css b/app/theme/client/imports/components/userInfo.css
index 5549cd6c370..8e5f3dbbd57 100644
--- a/app/theme/client/imports/components/userInfo.css
+++ b/app/theme/client/imports/components/userInfo.css
@@ -39,7 +39,6 @@
 	}
 
 	&__banner {
-
 		position: absolute;
 		z-index: 1;
 		bottom: 50px;
@@ -59,7 +58,6 @@
 	}
 
 	&__avatar {
-
 		position: relative;
 
 		width: 120px;
@@ -75,7 +73,6 @@
 	}
 
 	&__name {
-
 		width: 100%;
 
 		text-align: center;
@@ -161,7 +158,6 @@
 		}
 
 		&--separator {
-
 			margin: 14px 0;
 
 			border-bottom: 1px solid #d7d7d7;
@@ -205,7 +201,6 @@
 	}
 
 	&-details {
-
 		margin-bottom: calc(var(--default-small-padding) * -1);
 		padding: var(--default-padding);
 
@@ -266,7 +261,6 @@
 			align-items: flex-end;
 
 			&-icon {
-
 				color: #444444;
 
 				font-size: 1.25rem;
@@ -288,7 +282,6 @@
 		}
 
 		&-value {
-
 			display: flex;
 
 			margin: 0 0.25rem;
diff --git a/app/theme/client/imports/forms/input.css b/app/theme/client/imports/forms/input.css
index 4f945a91e0f..21ef11f574f 100644
--- a/app/theme/client/imports/forms/input.css
+++ b/app/theme/client/imports/forms/input.css
@@ -84,7 +84,6 @@ textarea.rc-input__element {
 		}
 
 		&::placeholder {
-
 			text-align: start;
 			text-overflow: ellipsis;
 
@@ -200,7 +199,6 @@ textarea.rc-input__element {
 	}
 
 	&__name {
-
 		overflow: hidden;
 
 		flex: 0 1 auto;
@@ -221,7 +219,6 @@ textarea.rc-input__element {
 	}
 
 	&__description {
-
 		color: var(--color-gray);
 
 		font-size: 0.875rem;
@@ -229,7 +226,6 @@ textarea.rc-input__element {
 }
 
 select.rc-input {
-
 	width: 100%;
 	padding: 0.782rem;
 
diff --git a/app/theme/client/imports/forms/popup-list.css b/app/theme/client/imports/forms/popup-list.css
index 35349a13d96..e645f9a1443 100644
--- a/app/theme/client/imports/forms/popup-list.css
+++ b/app/theme/client/imports/forms/popup-list.css
@@ -44,7 +44,6 @@
 		}
 
 		&-name {
-
 			overflow: hidden;
 
 			text-overflow: ellipsis;
diff --git a/app/theme/client/imports/forms/select.css b/app/theme/client/imports/forms/select.css
index 58116f51739..ebd2665546b 100644
--- a/app/theme/client/imports/forms/select.css
+++ b/app/theme/client/imports/forms/select.css
@@ -1,5 +1,4 @@
 .rc-select {
-
 	position: relative;
 
 	display: flex;
diff --git a/app/theme/client/imports/forms/tags.css b/app/theme/client/imports/forms/tags.css
index 5d1dce60c5a..b949f84bf5c 100644
--- a/app/theme/client/imports/forms/tags.css
+++ b/app/theme/client/imports/forms/tags.css
@@ -47,7 +47,6 @@
 	}
 
 	&__input {
-
 		flex: 1;
 
 		margin: 0.25rem;
diff --git a/app/theme/client/imports/general/apps.css b/app/theme/client/imports/general/apps.css
index 8b3cbe7172b..1b4495da5ac 100644
--- a/app/theme/client/imports/general/apps.css
+++ b/app/theme/client/imports/general/apps.css
@@ -9,7 +9,6 @@
 	}
 
 	&-container {
-
 		display: flex;
 
 		width: 100%;
@@ -30,7 +29,6 @@
 		padding: 25px;
 
 		&__photo {
-
 			flex: 0 0 auto;
 
 			width: 95px;
@@ -44,7 +42,6 @@
 		}
 
 		&__content {
-
 			display: flex;
 			overflow: hidden;
 			flex-direction: column;
@@ -65,7 +62,6 @@
 			}
 
 			h2 {
-
 				padding: 5px 0;
 
 				font-size: 18px;
@@ -144,7 +140,6 @@
 @media (width <= 500px) {
 	.rc-apps {
 		&-container {
-
 			flex-direction: column;
 
 			padding: 25px;
diff --git a/app/theme/client/imports/general/base.css b/app/theme/client/imports/general/base.css
index 1cf8605b6b6..eb6eecd06db 100644
--- a/app/theme/client/imports/general/base.css
+++ b/app/theme/client/imports/general/base.css
@@ -83,7 +83,6 @@ button {
 }
 
 #rocket-chat {
-
 	position: relative;
 
 	display: flex;
diff --git a/app/theme/client/imports/general/base_old.css b/app/theme/client/imports/general/base_old.css
index cd8294c202c..0139ed9abd3 100644
--- a/app/theme/client/imports/general/base_old.css
+++ b/app/theme/client/imports/general/base_old.css
@@ -296,7 +296,6 @@
 
 	&.double-col {
 		& > label {
-
 			width: 30%;
 			margin-bottom: 0;
 			padding: 10px 20px 10px 0;
@@ -307,7 +306,6 @@
 		}
 
 		& > div {
-
 			width: 60%;
 			min-height: 2.5rem;
 
@@ -892,7 +890,6 @@
 	border-radius: var(--border-radius);
 
 	&__content {
-
 		overflow: auto;
 
 		margin: -1rem;
@@ -900,7 +897,6 @@
 	}
 
 	& .cms-page-close {
-
 		display: flex;
 
 		margin-bottom: 10px;
@@ -1036,14 +1032,12 @@
 		}
 
 		& .settings-description {
-
 			padding-top: 2px;
 
 			line-height: 1.2rem;
 		}
 
 		& .settings-alert {
-
 			margin-top: 0.75rem;
 			padding: 1rem;
 
@@ -1542,7 +1536,6 @@
 }
 
 .rc-old .rc-message-box .reply-preview {
-
 	position: relative;
 
 	display: flex;
@@ -1566,7 +1559,6 @@
 }
 
 .rc-old .rc-message-box .reply-preview:not(:last-child)::before {
-
 	position: absolute;
 	right: 15px;
 
@@ -2697,7 +2689,6 @@
 
 		& input,
 		& select {
-
 			position: relative;
 
 			width: 100%;
@@ -3061,7 +3052,6 @@
 
 .rc-old .dropzone {
 	& .dropzone-overlay {
-
 		position: absolute;
 		z-index: 1000000;
 		top: 0;
diff --git a/app/theme/client/imports/general/forms.css b/app/theme/client/imports/general/forms.css
index 9516f91a207..6e43b0d4baf 100644
--- a/app/theme/client/imports/general/forms.css
+++ b/app/theme/client/imports/general/forms.css
@@ -198,7 +198,6 @@
 	}
 
 	&__content {
-
 		display: flex;
 		overflow-y: auto;
 		flex-direction: column;
diff --git a/app/threads/client/threads.css b/app/threads/client/threads.css
index 8b3537eeaeb..73bb37795f6 100644
--- a/app/threads/client/threads.css
+++ b/app/threads/client/threads.css
@@ -59,7 +59,6 @@
 
 .message {
 	& .thread-replied {
-
 		display: inline-flex;
 
 		display: flex;
@@ -135,7 +134,6 @@
 	}
 
 	.thread-quote__message {
-
 		display: flex;
 
 		overflow: hidden;
diff --git a/app/webdav/client/webdavFilePicker.css b/app/webdav/client/webdavFilePicker.css
index 54c0d02a277..7a6a6ffc28f 100644
--- a/app/webdav/client/webdavFilePicker.css
+++ b/app/webdav/client/webdavFilePicker.css
@@ -259,7 +259,6 @@
 		}
 
 		.webdav-grid-header {
-
 			padding: 0.5rem 0;
 
 			color: #444444;
diff --git a/package-lock.json b/package-lock.json
index 0c19086fc27..40abe4739eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29940,13 +29940,13 @@
       }
     },
     "postcss-sorting": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-4.1.0.tgz",
-      "integrity": "sha512-r4T2oQd1giURJdHQ/RMb72dKZCuLOdWx2B/XhXN1Y1ZdnwXsKH896Qz6vD4tFy9xSjpKNYhlZoJmWyhH/7JUQw==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-sorting/-/postcss-sorting-5.0.1.tgz",
+      "integrity": "sha512-Y9fUFkIhfrm6i0Ta3n+89j56EFqaNRdUKqXyRp6kvTcSXnmgEjaVowCXH+JBe9+YKWqd4nc28r2sgwnzJalccA==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.4",
-        "postcss": "^7.0.0"
+        "lodash": "^4.17.14",
+        "postcss": "^7.0.17"
       },
       "dependencies": {
         "ansi-styles": {
@@ -34536,14 +34536,14 @@
       }
     },
     "stylelint-order": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-2.2.1.tgz",
-      "integrity": "sha512-019KBV9j8qp1MfBjJuotse6MgaZqGVtXMc91GU9MsS9Feb+jYUvUU3Z8XiClqPdqJZQ0ryXQJGg3U3PcEjXwfg==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/stylelint-order/-/stylelint-order-4.1.0.tgz",
+      "integrity": "sha512-sVTikaDvMqg2aJjh4r48jsdfmqLT+nqB1MOsaBnvM3OwLx4S+WXcsxsgk5w18h/OZoxZCxuyXMh61iBHcj9Qiw==",
       "dev": true,
       "requires": {
-        "lodash": "^4.17.10",
-        "postcss": "^7.0.2",
-        "postcss-sorting": "^4.1.0"
+        "lodash": "^4.17.15",
+        "postcss": "^7.0.31",
+        "postcss-sorting": "^5.0.1"
       },
       "dependencies": {
         "ansi-styles": {
diff --git a/package.json b/package.json
index ce40a711919..0ffcaa7b7b7 100644
--- a/package.json
+++ b/package.json
@@ -21,7 +21,8 @@
 		"debug-brk": "meteor run --inspect-brk",
 		"lint": "meteor npm run stylelint && meteor npm run eslint",
 		"eslint": "eslint --ext .js,.jsx,.ts,.tsx .",
-		"stylelint": "stylelint --fix \"app/**/*.css\" \"client/**/*.css\" \"app/**/*.less\" \"client/**/*.less\" \"ee/**/*.less\"",
+		"stylelint": "stylelint \"app/**/*.css\" \"client/**/*.css\" \"app/**/*.less\" \"client/**/*.less\" \"ee/**/*.less\"",
+		"stylelint:fix": "stylelint --fix \"app/**/*.css\" \"client/**/*.css\" \"app/**/*.less\" \"client/**/*.less\" \"ee/**/*.less\"",
 		"typecheck": "tsc --noEmit --skipLibCheck",
 		"deploy": "npm run build && pm2 startOrRestart pm2.json",
 		"coverage": "nyc -r html mocha --config ./.mocharc.js",
@@ -143,7 +144,7 @@
 		"rewire": "^5.0.0",
 		"source-map": "^0.5.7",
 		"stylelint": "^13.13.1",
-		"stylelint-order": "^2.2.1",
+		"stylelint-order": "^4.1.0",
 		"supertest": "^6.1.3",
 		"ts-loader": "^8.2.0",
 		"ts-node": "^10.0.0",