diff --git a/src/app/@theme/components/header/header.component.ts b/src/app/@theme/components/header/header.component.ts
index cacefdb8..26709722 100644
--- a/src/app/@theme/components/header/header.component.ts
+++ b/src/app/@theme/components/header/header.component.ts
@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 
-import { NgaSidebarService, NgaMenuService } from '@nga/theme';
-import { NgaThemeService } from '@nga/theme/services/theme.service';
+import { NgaSidebarService, NgaMenuService } from '@akveo/nga-theme';
+import { NgaThemeService } from '@akveo/nga-theme/services/theme.service';
 
 @Component({
   selector: 'ngx-header',
diff --git a/src/app/@theme/styles/styles.scss b/src/app/@theme/styles/styles.scss
index 852ee3e8..0b340cfb 100644
--- a/src/app/@theme/styles/styles.scss
+++ b/src/app/@theme/styles/styles.scss
@@ -2,8 +2,8 @@
 @import 'variables';
 
 // framework component themes (styles tied to theme variables)
-@import '~@nga/theme/styles/globals';
-@import '~@nga/auth/styles/all';
+@import '~@akveo/nga-theme/styles/globals';
+@import '~@akveo/nga-auth/styles/all';
 
 // custom global styles
 @import 'global';
diff --git a/src/app/@theme/styles/variables.scss b/src/app/@theme/styles/variables.scss
index f44d994c..4f16613e 100644
--- a/src/app/@theme/styles/variables.scss
+++ b/src/app/@theme/styles/variables.scss
@@ -1,7 +1,7 @@
 // nga theming framework
-@import '~@nga/theme/styles/theming';
+@import '~@akveo/nga-theme/styles/theming';
 // nga our of the box themes
-@import '~@nga/theme/styles/themes';
+@import '~@akveo/nga-theme/styles/themes';
 
 // which themes you what to enable (empty to enable all - not recommended)
 $nga-enabled-themes: (default, light, cosmic);
diff --git a/src/app/@theme/theme.module.ts b/src/app/@theme/theme.module.ts
index 81e1df54..1682f879 100644
--- a/src/app/@theme/theme.module.ts
+++ b/src/app/@theme/theme.module.ts
@@ -12,7 +12,7 @@ import {
   NgaUserModule,
   NgaActionsModule,
   NgaSearchModule,
-} from '@nga/theme';
+} from '@akveo/nga-theme';
 
 import {
   HeaderComponent,
diff --git a/src/app/pages/dashboard/dashboard.component.scss b/src/app/pages/dashboard/dashboard.component.scss
index 4fc61182..5d432378 100644
--- a/src/app/pages/dashboard/dashboard.component.scss
+++ b/src/app/pages/dashboard/dashboard.component.scss
@@ -1,5 +1,5 @@
 @import '../../@theme/styles/variables';
-@import '~@nga/theme/styles/global/bootstrap/hero-buttons';
+@import '~@akveo/nga-theme/styles/global/bootstrap/hero-buttons';
 
 @include nga-install-component() {
   nga-card-header {
diff --git a/src/app/pages/dashboard/dashboard.module.ts b/src/app/pages/dashboard/dashboard.module.ts
index 76fdf4b7..e662a580 100644
--- a/src/app/pages/dashboard/dashboard.module.ts
+++ b/src/app/pages/dashboard/dashboard.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { NgaTabsetModule } from '@nga/theme';
+import { NgaTabsetModule } from '@akveo/nga-theme';
 
 import { SharedModule } from '../../shared.module';
 import { DashboardComponent } from './dashboard.component';
diff --git a/src/app/pages/dashboard/status-cards/status-cards.component.scss b/src/app/pages/dashboard/status-cards/status-cards.component.scss
index 2515dce7..b342ee02 100644
--- a/src/app/pages/dashboard/status-cards/status-cards.component.scss
+++ b/src/app/pages/dashboard/status-cards/status-cards.component.scss
@@ -1,5 +1,5 @@
 @import '../../../@theme/styles/variables';
-@import '~@nga/theme/styles/global/bootstrap/hero-buttons';
+@import '~@akveo/nga-theme/styles/global/bootstrap/hero-buttons';
 
 @include nga-install-component() {
   nga-card {
diff --git a/src/app/pages/pages-menu.ts b/src/app/pages/pages-menu.ts
index 705d56e6..ffbacceb 100644
--- a/src/app/pages/pages-menu.ts
+++ b/src/app/pages/pages-menu.ts
@@ -1,4 +1,4 @@
-import { NgaMenuItem } from '@nga/theme';
+import { NgaMenuItem } from '@akveo/nga-theme';
 
 import { List } from 'immutable';
 
diff --git a/src/app/pages/pages.module.ts b/src/app/pages/pages.module.ts
index 18d65c41..fa1347af 100644
--- a/src/app/pages/pages.module.ts
+++ b/src/app/pages/pages.module.ts
@@ -1,6 +1,6 @@
 import { NgModule } from '@angular/core';
 
-import { NgaMenuModule, NgaSidebarModule, NgaThemeModule } from '@nga/theme';
+import { NgaMenuModule, NgaSidebarModule, NgaThemeModule } from '@akveo/nga-theme';
 
 import { menuItems } from './pages-menu';
 
diff --git a/src/app/pages/ui-features/buttons/buttons.component.scss b/src/app/pages/ui-features/buttons/buttons.component.scss
index 344a8475..bc4259e6 100644
--- a/src/app/pages/ui-features/buttons/buttons.component.scss
+++ b/src/app/pages/ui-features/buttons/buttons.component.scss
@@ -1,5 +1,5 @@
 @import '../../../@theme/styles/variables';
-@import '~@nga/theme/styles/global/bootstrap/buttons';
+@import '~@akveo/nga-theme/styles/global/bootstrap/buttons';
 
 @mixin btn-bg($background) {
   background-color: $background;
diff --git a/src/app/pages/ui-features/buttons/buttons.module.ts b/src/app/pages/ui-features/buttons/buttons.module.ts
index 7acd6446..64c9860f 100644
--- a/src/app/pages/ui-features/buttons/buttons.module.ts
+++ b/src/app/pages/ui-features/buttons/buttons.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { NgaActionsModule, NgaSearchModule, NgaUserModule } from '@nga/theme';
+import { NgaActionsModule, NgaSearchModule, NgaUserModule } from '@akveo/nga-theme';
 
 import { SharedModule } from '../../../shared.module';
 
diff --git a/src/app/pages/ui-features/ui-features.module.ts b/src/app/pages/ui-features/ui-features.module.ts
index 3641f7e7..722abf46 100644
--- a/src/app/pages/ui-features/ui-features.module.ts
+++ b/src/app/pages/ui-features/ui-features.module.ts
@@ -1,5 +1,5 @@
 import { NgModule } from '@angular/core';
-import { NgaTabsetModule, NgaRouteTabsetModule, NgaSearchModule } from '@nga/theme';
+import { NgaTabsetModule, NgaRouteTabsetModule, NgaSearchModule } from '@akveo/nga-theme';
 
 import { SharedModule } from '../../shared.module';
 
diff --git a/src/app/shared.module.ts b/src/app/shared.module.ts
index 984292dd..d1cee856 100644
--- a/src/app/shared.module.ts
+++ b/src/app/shared.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { RouterModule } from '@angular/router';
-import { NgaCardModule, NgaThemeModule } from '@nga/theme';
+import { NgaCardModule, NgaThemeModule } from '@akveo/nga-theme';
 
 @NgModule({
   exports: [