diff --git a/package.json b/package.json
index 1fceda7..c7252f1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cloudflight",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "scripts": {
     "build": "yarn workspaces foreach -t run build-package",
     "lint": "eslint .",
diff --git a/packages/stylelint-plugin-angular/package.json b/packages/stylelint-plugin-angular/package.json
index 1d34efe..c386bae 100644
--- a/packages/stylelint-plugin-angular/package.json
+++ b/packages/stylelint-plugin-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloudflight/stylelint-plugin-angular",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "author": "Cloudflight GmbH",
   "license": "Apache-2.0",
   "scripts": {
diff --git a/packages/stylelint-plugin-vue/package.json b/packages/stylelint-plugin-vue/package.json
index 30e525f..0cecd81 100644
--- a/packages/stylelint-plugin-vue/package.json
+++ b/packages/stylelint-plugin-vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloudflight/stylelint-plugin-vue",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "author": "Cloudflight GmbH",
   "license": "Apache-2.0",
   "scripts": {
diff --git a/packages/stylelint-plugin/package.json b/packages/stylelint-plugin/package.json
index e961f6f..0f444af 100644
--- a/packages/stylelint-plugin/package.json
+++ b/packages/stylelint-plugin/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cloudflight/stylelint-plugin",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "author": "Cloudflight GmbH",
   "license": "Apache-2.0",
   "scripts": {
diff --git a/packages/stylelint-plugin/src/lib/stylelintrc.js b/packages/stylelint-plugin/src/lib/stylelintrc.js
index cc3bfe2..3aaa405 100644
--- a/packages/stylelint-plugin/src/lib/stylelintrc.js
+++ b/packages/stylelint-plugin/src/lib/stylelintrc.js
@@ -8,7 +8,9 @@ module.exports = {
     'named-grid-areas-no-invalid': true,
     'function-calc-no-unspaced-operator': true,
     'function-linear-gradient-no-nonstandard-direction': true,
-    'function-no-unknown': true,
+    // these 2 rules don't work well with @function
+    'function-no-unknown': null,
+    'scss/function-no-unknown': null,
     'string-no-newline': true,
     'unit-no-unknown': true,
     'custom-property-no-missing-var-function': true,
@@ -39,6 +41,10 @@ module.exports = {
     'order/properties-alphabetical-order': null,
     'order/order': [
       [
+        {
+          type: 'at-rule',
+          name: 'extend',
+        },
         {
           type: 'at-rule',
           name: 'include',
@@ -46,6 +52,10 @@ module.exports = {
         'custom-properties',
         'dollar-variables',
         'declarations',
+        {
+          type: 'at-rule',
+          name: 'media',
+        },
         'rules',
       ],
       {