diff --git a/src/app/shared/can-active-guard.service.ts b/src/app/shared/can-active-guard.service.ts
index 69df9f7..201a143 100644
--- a/src/app/shared/can-active-guard.service.ts
+++ b/src/app/shared/can-active-guard.service.ts
@@ -12,7 +12,7 @@ const DEFAULT_LANG = 'en'
 export class CanActivateGuard implements CanActivate {
   constructor(private txService: TranslateService, private config: ConfigurationService) {}
 
-  /* eslint-disable @typescript-eslint/no-unused-vars */ /* TODO: is route and state needed */
+  /* eslint-disable @typescript-eslint/no-unused-vars */
   canActivate(
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot
diff --git a/src/app/shared/image-container/image-container.component.ts b/src/app/shared/image-container/image-container.component.ts
index 7636ba9..b189a7c 100644
--- a/src/app/shared/image-container/image-container.component.ts
+++ b/src/app/shared/image-container/image-container.component.ts
@@ -24,7 +24,7 @@ export class ImageContainerComponent implements OnChanges {
 
       // if image Url does not start with a http the api-prefix ...
       //   ...then it stored in the backend. So we need to put prefix in front
-      if (this.imageUrl && !this.imageUrl.match(/^(http|https)/g) && this.imageUrl.indexOf(this.apiPrefix) !== 0) {
+      if (this.imageUrl && !this.imageUrl.match(/^(http|https)/g) && !this.imageUrl.startsWith(this.apiPrefix)) {
         this.imageUrl = this.apiPrefix + this.imageUrl
       }
     }
diff --git a/src/app/shared/label.resolver.ts b/src/app/shared/label.resolver.ts
index 538e552..cc6206f 100644
--- a/src/app/shared/label.resolver.ts
+++ b/src/app/shared/label.resolver.ts
@@ -7,7 +7,7 @@ import { Observable } from 'rxjs'
 @Injectable()
 export class LabelResolver implements Resolve<string> {
   constructor(private translate: TranslateService) {}
-  /* eslint-disable @typescript-eslint/no-unused-vars */ /* TODO: is state needed */
+  /* eslint-disable @typescript-eslint/no-unused-vars */
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): string | Observable<string> | Promise<string> {
     return route.data['breadcrumb'] ? this.translate.instant(route.data['breadcrumb']) : route.routeConfig?.path
   }
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 96e818c..42e965a 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -45,10 +45,8 @@ import { ImageContainerComponent } from './image-container/image-container.compo
 import { ThemeColorBoxComponent } from './theme-color-box/theme-color-box.component'
 
 export const basePathProvider = (mfeInfo: MfeInfo) => {
-  console.log(
-    'Base path provider: ' + (mfeInfo ? mfeInfo.remoteBaseUrl + '' + environment.apiPrefix : '' + environment.apiPrefix)
-  )
-  return mfeInfo ? mfeInfo.remoteBaseUrl + '' + environment.apiPrefix : '' + environment.apiPrefix
+  console.log('Base path provider: ' + (mfeInfo ? mfeInfo?.remoteBaseUrl : '') + environment.apiPrefix)
+  return (mfeInfo ? mfeInfo?.remoteBaseUrl : '') + environment.apiPrefix
 }
 
 export function HttpLoaderFactory(http: HttpClient, mfeInfo: MfeInfo) {
@@ -56,7 +54,7 @@ export function HttpLoaderFactory(http: HttpClient, mfeInfo: MfeInfo) {
     console.log(`Configuring translation loader ${mfeInfo?.remoteBaseUrl}`)
   }
   // if running standalone then load the app assets directly from remote base URL
-  const appAssetPrefix = mfeInfo && mfeInfo.remoteBaseUrl ? mfeInfo.remoteBaseUrl : './'
+  const appAssetPrefix = mfeInfo?.remoteBaseUrl ? mfeInfo.remoteBaseUrl : './'
   return new TranslateCombinedLoader(
     new TranslateHttpLoader(http, appAssetPrefix + 'assets/i18n/', '.json'),
     new TranslateHttpLoader(http, appAssetPrefix + 'onecx-portal-lib/assets/i18n/', '.json')
diff --git a/src/app/test/mocks/auth-mock.service.ts b/src/app/test/mocks/auth-mock.service.ts
index ed76935..424c944 100644
--- a/src/app/test/mocks/auth-mock.service.ts
+++ b/src/app/test/mocks/auth-mock.service.ts
@@ -6,7 +6,9 @@ export class IAuthMockService implements IAuthService {
   getCurrentUser(): UserProfile | null {
     return null
   }
-  logout(): void {}
+  logout(): void {
+    // logout
+  }
   hasPermission(permissionKey: string): boolean {
     return false
   }
diff --git a/src/app/theme/theme-designer/theme-designer.component.html b/src/app/theme/theme-designer/theme-designer.component.html
index 8d19bd0..55edeca 100644
--- a/src/app/theme/theme-designer/theme-designer.component.html
+++ b/src/app/theme/theme-designer/theme-designer.component.html
@@ -62,14 +62,6 @@
                 <label for="theme_detail_item_description">{{ 'THEME.DESCRIPTION' | translate }}</label>
               </span>
             </div>
-            <!--
-            <div class="field col-12 mb-4">
-              <span class="p-float-label" [title]="'THEME.TOOLTIPS.CSS_FILE' | translate">
-                <input pInputText type="text" id="theme_detail_item_cssFile" formControlName="cssFile" />
-                <label for="theme_detail_item_cssFile">{{'THEME.CSS_FILE' | translate}}</label>
-              </span>
-            </div>
-            -->
             <!-- helper inputs because p-fileupload does not work inside inputgroup -->
             <input
               hidden
diff --git a/src/app/theme/theme-detail/theme-detail.component.html b/src/app/theme/theme-detail/theme-detail.component.html
index 3f1f7ba..c105970 100644
--- a/src/app/theme/theme-detail/theme-detail.component.html
+++ b/src/app/theme/theme-detail/theme-detail.component.html
@@ -34,19 +34,6 @@
               ></textarea>
               <label for="theme_detail_item_description">{{ 'THEME.DESCRIPTION' | translate }}</label>
             </span>
-            <!--
-            <span class="p-float-label" [title]="'THEME.TOOLTIPS.CSS_FILE' | translate">
-              <input
-                pInputText
-                type="text"
-                readonly
-                class="w-full"
-                id="theme_detail_item_cssFile"
-                [value]="theme?.cssFile"
-              />
-              <label for="theme_detail_item_cssFile">{{'THEME.CSS_FILE' | translate}}</label>
-            </span>
-            -->
             <div class="flex flex-wrap sm:flex-nowrap align-items-center pb-2 row-gap-2 column-gap-4">
               <tm-image-container
                 [imageUrl]="headerImageUrl"
diff --git a/src/app/theme/theme-detail/theme-detail.component.ts b/src/app/theme/theme-detail/theme-detail.component.ts
index 5532a8d..88363c5 100644
--- a/src/app/theme/theme-detail/theme-detail.component.ts
+++ b/src/app/theme/theme-detail/theme-detail.component.ts
@@ -218,6 +218,6 @@ export class ThemeDetailComponent implements OnInit {
 
   public prepareUsedInPortalList(): string {
     const arr = this.usedInWorkspace?.map((workspace: Workspace) => workspace.workspaceName)
-    return arr?.sort(sortByLocale).join(', ') || ''
+    return arr?.sort(sortByLocale).join(', ') ?? ''
   }
 }
diff --git a/src/assets/silent-check-sso.html b/src/assets/silent-check-sso.html
index ffe492c..9476448 100644
--- a/src/assets/silent-check-sso.html
+++ b/src/assets/silent-check-sso.html
@@ -1,4 +1,8 @@
-<html>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Some relevant title</title>
+  </head>
   <body>
     <script>
       parent.postMessage(location.href, location.origin)
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 30d6de1..4edbfb4 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -11,12 +11,3 @@ export const environment = {
   skipRemoteConfigLoad: true,
   apiPrefix: 'theme-bff'
 }
-
-/*
- * For easier debugging in development mode, you can import the following file
- * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
- *
- * This import should be commented out in production mode because it will have a negative impact
- * on performance if an error is thrown.
- */
-// import 'zone.js/plugins/zone-error';  // Included with Angular CLI.