diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/analogue-compass.ts b/ui-ngx/src/app/modules/home/components/widget/lib/analogue-compass.ts
index d3a8db18a7..8b519fe859 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/analogue-compass.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/analogue-compass.ts
@@ -30,6 +30,7 @@ import RadialGauge = CanvasGauges.RadialGauge;
 
 const analogueCompassSettingsSchemaValue = analogueCompassSettingsSchema;
 
+// @dynamic
 export class TbAnalogueCompass extends TbBaseGauge<AnalogueCompassSettings, RadialGaugeOptions> {
 
   static get settingsSchema(): JsonSettingsSchema {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/analogue-linear-gauge.ts b/ui-ngx/src/app/modules/home/components/widget/lib/analogue-linear-gauge.ts
index 8307069c86..8dbe37c3cd 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/analogue-linear-gauge.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/analogue-linear-gauge.ts
@@ -32,6 +32,7 @@ const tinycolor = tinycolor_;
 
 const analogueLinearGaugeSettingsSchemaValue = getAnalogueLinearGaugeSettingsSchema();
 
+// @dynamic
 export class TbAnalogueLinearGauge extends TbAnalogueGauge<AnalogueLinearGaugeSettings, LinearGaugeOptions>{
 
   static get settingsSchema(): JsonSettingsSchema {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/analogue-radial-gauge.ts b/ui-ngx/src/app/modules/home/components/widget/lib/analogue-radial-gauge.ts
index 05c1969657..658a639a2e 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/analogue-radial-gauge.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/analogue-radial-gauge.ts
@@ -28,6 +28,7 @@ import BaseGauge = CanvasGauges.BaseGauge;
 
 const analogueRadialGaugeSettingsSchemaValue = getAnalogueRadialGaugeSettingsSchema();
 
+// @dynamic
 export class TbAnalogueRadialGauge extends TbAnalogueGauge<AnalogueRadialGaugeSettings, RadialGaugeOptions>{
 
   static get settingsSchema(): JsonSettingsSchema {
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/digital-gauge.ts b/ui-ngx/src/app/modules/home/components/widget/lib/digital-gauge.ts
index 11cc8dc732..8c6f0e56f4 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/digital-gauge.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/digital-gauge.ts
@@ -46,6 +46,7 @@ const tinycolor = tinycolor_;
 
 const digitalGaugeSettingsSchemaValue = digitalGaugeSettingsSchema;
 
+// @dynamic
 export class TbCanvasDigitalGauge {
 
   static get settingsSchema(): JsonSettingsSchema {
diff --git a/ui-ngx/src/app/shared/models/beautify.models.ts b/ui-ngx/src/app/shared/models/beautify.models.ts
index fa07721e29..d28d8e00c4 100644
--- a/ui-ngx/src/app/shared/models/beautify.models.ts
+++ b/ui-ngx/src/app/shared/models/beautify.models.ts
@@ -58,7 +58,7 @@ function loadCssBeautify(): Observable<any> {
   }
 }
 
-export function beautifyJs(source: string, options?: JSBeautifyOptions): Observable<string> {
+export function beautifyJs(source: string, options?: any): Observable<string> {
   return loadJsBeautify().pipe(
     map((mod) => {
       return mod.js_beautify(source, options);
@@ -66,13 +66,13 @@ export function beautifyJs(source: string, options?: JSBeautifyOptions): Observa
   );
 }
 
-export function beautifyCss(source: string, options?: CSSBeautifyOptions): Observable<string> {
+export function beautifyCss(source: string, options?: any): Observable<string> {
   return loadCssBeautify().pipe(
     map((mod) => mod.css_beautify(source, options))
   );
 }
 
-export function beautifyHtml(source: string, options?: HTMLBeautifyOptions): Observable<string> {
+export function beautifyHtml(source: string, options?: any): Observable<string> {
   return loadHtmlBeautify().pipe(
     map((mod) => mod.html_beautify(source, options))
   );