diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e7082a5c6a2fac250b7023a58edd0aeef7c3999..aef99f392341eb0fa435dee3e544fbd8f92ef4a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ ngbuild:
   script:
     - npm install -g @angular/cli
     - npm install
-    - ng build --prod --aot=false --build-optimizer=false
+    - ng build --prod --aot
   artifacts:
     paths:
       - "$BUILD_DIR"
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 3c32c0b5a89c67ddaef615bfc85574454deddce0..789cfea205a78f19caed0dadb2e377a8f6bc752b 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -21,6 +21,7 @@ import { UserActivationComponent } from './components/home/_dialogs/user-activat
 import { AuthenticationInterceptor } from './interceptors/authentication.interceptor';
 import { EssentialsModule } from './components/essentials/essentials.module';
 import { SharedModule } from './components/shared/shared.module';
+import { CreatorModule } from './components/creator/creator.module';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { LanguageService } from './services/util/language.service';
@@ -31,6 +32,9 @@ import { AppConfig } from './app.config';
 import { ThemeModule } from '../theme/theme.module';
 import { ServiceWorkerModule } from '@angular/service-worker';
 import { environment } from '../environments/environment';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { HttpClient } from '@angular/common/http';
+import { TranslateHttpLoader } from '@ngx-translate/http-loader';
 
 export function dialogClose(dialogResult: any) {
 }
@@ -60,7 +64,16 @@ export function initializeApp(appConfig: AppConfig) {
     EssentialsModule,
     SharedModule,
     ThemeModule,
-    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production })
+    CreatorModule,
+    ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production }),
+    TranslateModule.forChild({
+      loader: {
+        provide: TranslateLoader,
+        useFactory: (HttpLoaderFactory),
+        deps: [HttpClient]
+      },
+      isolate: true
+    })
   ],
   providers: [
     AppConfig,
@@ -104,3 +117,7 @@ export function initializeApp(appConfig: AppConfig) {
 })
 export class AppModule {
 }
+
+export function HttpLoaderFactory(http: HttpClient) {
+  return new TranslateHttpLoader(http, '../../assets/i18n/home/', '.json');
+}