diff --git a/apps/dafa-web/src/main.ts b/apps/dafa-web/src/main.ts
index 47cef83..ea16492 100644
--- a/apps/dafa-web/src/main.ts
+++ b/apps/dafa-web/src/main.ts
@@ -1,6 +1,6 @@
-import { defineCustomElements } from '@af/digi-core/loader';
 import { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { defineCustomElements } from '@digi/core/loader';
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 
diff --git a/apps/dafa-web/src/styles/functions/_rem.scss b/apps/dafa-web/src/styles/functions/_rem.scss
index 0ca98f0..36d7d68 100644
--- a/apps/dafa-web/src/styles/functions/_rem.scss
+++ b/apps/dafa-web/src/styles/functions/_rem.scss
@@ -1 +1 @@
-@import '~@af/digi-core/src/global/styles/base/functions/rem';
+@import '~@digi/styles/src/base/functions/rem';
diff --git a/apps/dafa-web/src/styles/styles.scss b/apps/dafa-web/src/styles/styles.scss
index 1ea459d..18f1a0c 100644
--- a/apps/dafa-web/src/styles/styles.scss
+++ b/apps/dafa-web/src/styles/styles.scss
@@ -1,4 +1,4 @@
-@import '~@af/digi-core/src/global/styles/digi';
+@import '~@digi/styles/src/digi';
 @import 'mixins/a11y';
 @import 'mixins/icon';
 
diff --git a/apps/dafa-web/src/styles/variables/_breakpoints.scss b/apps/dafa-web/src/styles/variables/_breakpoints.scss
index 32827c6..db1bf64 100644
--- a/apps/dafa-web/src/styles/variables/_breakpoints.scss
+++ b/apps/dafa-web/src/styles/variables/_breakpoints.scss
@@ -1 +1 @@
-@import '~@af/digi-core/src/global/styles/layout/variables/layout__variables';
+@import '~@digi/styles/src/layout/variables/layout__variables';
diff --git a/apps/dafa-web/src/styles/variables/_colors.scss b/apps/dafa-web/src/styles/variables/_colors.scss
index 26ad6d0..7885520 100644
--- a/apps/dafa-web/src/styles/variables/_colors.scss
+++ b/apps/dafa-web/src/styles/variables/_colors.scss
@@ -1,4 +1,4 @@
-@import '~@af/digi-core/src/global/styles/ui/variables/ui__variables';
+@import '~@digi/styles/src/ui/variables/ui__variables';
 
 // AF DIGI Variables
 $digi--ui--color--primary-light: lighten($digi--ui--color--primary, 10%);
diff --git a/apps/dafa-web/src/styles/variables/_gutters.scss b/apps/dafa-web/src/styles/variables/_gutters.scss
index fcef547..3425849 100644
--- a/apps/dafa-web/src/styles/variables/_gutters.scss
+++ b/apps/dafa-web/src/styles/variables/_gutters.scss
@@ -1,4 +1,4 @@
-@import '~@af/digi-core/src/global/styles/layout/variables/layout__variables';
+@import '~@digi/styles/src/layout/variables/layout__variables';
 @import 'functions/rem';
 
 // AF DIGI Variables
diff --git a/package-lock.json b/package-lock.json
index c3c57ec..4ccbb97 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,6 @@
       "license": "MIT",
       "dependencies": {
         "@af/auth": "^11.1.0",
-        "@af/digi-core": "^5.0.1-beta.103-1868f5a8",
         "@af/digi-ng": "^12.1.0",
         "@angular/animations": "^11.2.0",
         "@angular/common": "^11.2.0",
@@ -20,6 +19,8 @@
         "@angular/platform-browser": "^11.2.0",
         "@angular/platform-browser-dynamic": "^11.2.0",
         "@angular/router": "^11.2.0",
+        "@digi/core": "^6.0.2",
+        "@digi/styles": "^6.0.2",
         "@nrwl/angular": "11.5.1",
         "rxjs": "~6.6.3",
         "tslib": "^2.0.0",
@@ -92,12 +93,6 @@
       "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
       "license": "0BSD"
     },
-    "node_modules/@af/digi-core": {
-      "version": "5.0.1-beta.103-1868f5a8",
-      "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/@af/digi-core/-/digi-core-5.0.1-beta.103-1868f5a8.tgz",
-      "integrity": "sha512-r20zf4unHHJ9WwVP3T7HT0Cw6txxNTMC0/srpCWy8N98hKdgCli/7aP9phFDO8xkSkWM//yWEzpLLTZMU7JONg==",
-      "license": "MIT"
-    },
     "node_modules/@af/digi-ng": {
       "version": "12.1.0",
       "resolved": "http://nexus.ams.se:8081/nexus/content/groups/npm-releases/@af/digi-ng/-/digi-ng-12.1.0.tgz",
@@ -2782,6 +2777,18 @@
         "ms": "^2.1.1"
       }
     },
+    "node_modules/@digi/core": {
+      "version": "6.0.2",
+      "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/@digi/core/-/core-6.0.2.tgz",
+      "integrity": "sha512-QLjcf8jSXpZi7/9WJzxJT9UPFVK+H9AQyLd6nlKUDhIP0x/X2WBxbvIwVCAqfSFQ5EQNdxc15hpUfSpPQU2JlA==",
+      "license": "MIT"
+    },
+    "node_modules/@digi/styles": {
+      "version": "6.0.2",
+      "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/@digi/styles/-/styles-6.0.2.tgz",
+      "integrity": "sha512-1A2/6OJc/h7EIvkrf2zqXxNIq5JsL0sQ4N8GFg6dqlPYjYklQPrOiDSx9GhtXofhjXiaM1JsCQyD25se5n1zYA==",
+      "license": "MIT"
+    },
     "node_modules/@eslint/eslintrc": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz",
@@ -25126,11 +25133,6 @@
         }
       }
     },
-    "@af/digi-core": {
-      "version": "5.0.1-beta.103-1868f5a8",
-      "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/@af/digi-core/-/digi-core-5.0.1-beta.103-1868f5a8.tgz",
-      "integrity": "sha512-r20zf4unHHJ9WwVP3T7HT0Cw6txxNTMC0/srpCWy8N98hKdgCli/7aP9phFDO8xkSkWM//yWEzpLLTZMU7JONg=="
-    },
     "@af/digi-ng": {
       "version": "12.1.0",
       "resolved": "http://nexus.ams.se:8081/nexus/content/groups/npm-releases/@af/digi-ng/-/digi-ng-12.1.0.tgz",
@@ -27252,6 +27254,16 @@
         }
       }
     },
+    "@digi/core": {
+      "version": "6.0.2",
+      "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/@digi/core/-/core-6.0.2.tgz",
+      "integrity": "sha512-QLjcf8jSXpZi7/9WJzxJT9UPFVK+H9AQyLd6nlKUDhIP0x/X2WBxbvIwVCAqfSFQ5EQNdxc15hpUfSpPQU2JlA=="
+    },
+    "@digi/styles": {
+      "version": "6.0.2",
+      "resolved": "http://nexus.arbetsformedlingen.se/repository/npm/@digi/styles/-/styles-6.0.2.tgz",
+      "integrity": "sha512-1A2/6OJc/h7EIvkrf2zqXxNIq5JsL0sQ4N8GFg6dqlPYjYklQPrOiDSx9GhtXofhjXiaM1JsCQyD25se5n1zYA=="
+    },
     "@eslint/eslintrc": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.1.3.tgz",
diff --git a/package.json b/package.json
index 655d503..cf151a0 100644
--- a/package.json
+++ b/package.json
@@ -34,7 +34,6 @@
   "private": true,
   "dependencies": {
     "@af/auth": "^11.1.0",
-    "@af/digi-core": "^5.0.1-beta.103-1868f5a8",
     "@af/digi-ng": "^12.1.0",
     "@angular/animations": "^11.2.0",
     "@angular/common": "^11.2.0",
@@ -44,6 +43,8 @@
     "@angular/platform-browser": "^11.2.0",
     "@angular/platform-browser-dynamic": "^11.2.0",
     "@angular/router": "^11.2.0",
+    "@digi/core": "^6.0.2",
+    "@digi/styles": "^6.0.2",
     "@nrwl/angular": "11.5.1",
     "rxjs": "~6.6.3",
     "tslib": "^2.0.0",