diff --git a/src/app/core-ui/main-header/main-header.component.ts b/src/app/core-ui/main-header/main-header.component.ts
index b352e8150b..3dd120f2b7 100644
--- a/src/app/core-ui/main-header/main-header.component.ts
+++ b/src/app/core-ui/main-header/main-header.component.ts
@@ -24,8 +24,7 @@ import { SimpleCounter } from '../../features/simple-counter/simple-counter.mode
   animations: [fadeAnimation, expandFadeHorizontalAnimation]
 })
 export class MainHeaderComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   progressCircleRadius: number = 10;
   circumference: number = this.progressCircleRadius * Math.PI * 2;
 
diff --git a/src/app/core-ui/side-nav/side-nav.component.ts b/src/app/core-ui/side-nav/side-nav.component.ts
index 0d6b34f679..3379e9b57f 100644
--- a/src/app/core-ui/side-nav/side-nav.component.ts
+++ b/src/app/core-ui/side-nav/side-nav.component.ts
@@ -53,8 +53,7 @@ export class SideNavComponent implements OnDestroy {
     )
   );
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   readonly PROJECTS_SIDE_NAV: string = 'PROJECTS_SIDE_NAV';
   readonly TAG_SIDE_NAV: string = 'TAG_SIDE_NAV';
   activeWorkContextId?: string | null;
diff --git a/src/app/core-ui/work-context-menu/work-context-menu.component.ts b/src/app/core-ui/work-context-menu/work-context-menu.component.ts
index 246fa7707c..c367132338 100644
--- a/src/app/core-ui/work-context-menu/work-context-menu.component.ts
+++ b/src/app/core-ui/work-context-menu/work-context-menu.component.ts
@@ -19,8 +19,7 @@ import { Router } from '@angular/router';
 })
 export class WorkContextMenuComponent implements OnDestroy {
   @Input() contextId?: string;
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   TODAY_TAG_ID: string = TODAY_TAG.id as string;
   isForProject: boolean = true;
   base: string = 'project';
diff --git a/src/app/core/banner/banner/banner.component.ts b/src/app/core/banner/banner/banner.component.ts
index 3378a43ed5..cea9e1f585 100644
--- a/src/app/core/banner/banner/banner.component.ts
+++ b/src/app/core/banner/banner/banner.component.ts
@@ -14,8 +14,7 @@ import { T } from '../../../t.const';
   animations: [slideAnimation]
 })
 export class BannerComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   height: number = 120;
   private _dirtyReference?: string | null;
   // TODO maybe improve if initial delay is annoying
diff --git a/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts b/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts
index 791e5c99f3..ab32ba6f8c 100644
--- a/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts
+++ b/src/app/features/bookmark/bookmark-bar/bookmark-bar.component.ts
@@ -24,8 +24,7 @@ export class BookmarkBarComponent implements OnDestroy {
   isEditMode: boolean = false;
   dragEnterTarget?: HTMLElement;
   LIST_ID: string = 'BOOKMARKS';
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   isContextMenuDisabled: boolean = false;
   bookmarkBarHeight: number = 50;
   private _subs: Subscription = new Subscription();
diff --git a/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.ts b/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.ts
index d6a19e93be..a87b7f8575 100644
--- a/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.ts
+++ b/src/app/features/bookmark/dialog-edit-bookmark/dialog-edit-bookmark.component.ts
@@ -20,8 +20,7 @@ interface BookmarkSelectType {
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogEditBookmarkComponent implements OnInit {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   types?: BookmarkSelectType[];
   bookmarkCopy?: BookmarkCopy;
   customIcons: string[] = MATERIAL_ICONS;
diff --git a/src/app/features/config/config-form/config-form.component.ts b/src/app/features/config/config-form/config-form.component.ts
index 2033f0f618..3df139243a 100644
--- a/src/app/features/config/config-form/config-form.component.ts
+++ b/src/app/features/config/config-form/config-form.component.ts
@@ -14,8 +14,7 @@ import { exists } from '../../../util/exists';
 })
 export class ConfigFormComponent {
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   config?: {};
   @Input() sectionKey?: GlobalConfigSectionKey | ProjectCfgFormKey;
   @Output() save: EventEmitter<{ sectionKey: GlobalConfigSectionKey | ProjectCfgFormKey, config: unknown }> = new EventEmitter();
diff --git a/src/app/features/config/repeat-section-type/repeat-section-type.component.ts b/src/app/features/config/repeat-section-type/repeat-section-type.component.ts
index da3f502179..7423345402 100644
--- a/src/app/features/config/repeat-section-type/repeat-section-type.component.ts
+++ b/src/app/features/config/repeat-section-type/repeat-section-type.component.ts
@@ -13,8 +13,7 @@ import { standardListAnimation } from '../../../ui/animations/standard-list.ani'
   animations: [standardListAnimation],
 })
 export class RepeatSectionTypeComponent extends FieldArrayType {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor() {
     super();
diff --git a/src/app/features/config/select-project/select-project.component.ts b/src/app/features/config/select-project/select-project.component.ts
index 79003107e3..e513667ba2 100644
--- a/src/app/features/config/select-project/select-project.component.ts
+++ b/src/app/features/config/select-project/select-project.component.ts
@@ -13,8 +13,7 @@ import { T } from 'src/app/t.const';
 export class SelectProjectComponent extends FieldType {
   // @ViewChild(MatInput) formFieldControl: MatInput;
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     public projectService: ProjectService,
diff --git a/src/app/features/dropbox/dialog-dbx-sync-conflict/dialog-dbx-sync-conflict.component.ts b/src/app/features/dropbox/dialog-dbx-sync-conflict/dialog-dbx-sync-conflict.component.ts
index 6ff485dba5..6b654f8c59 100644
--- a/src/app/features/dropbox/dialog-dbx-sync-conflict/dialog-dbx-sync-conflict.component.ts
+++ b/src/app/features/dropbox/dialog-dbx-sync-conflict/dialog-dbx-sync-conflict.component.ts
@@ -11,8 +11,7 @@ import { DropboxConflictResolution } from '../dropbox.model';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogDbxSyncConflictComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   remote: string = this._formatDate(this.data.remote);
   local: string = this._formatDate(this.data.local);
diff --git a/src/app/features/google/dialog-confirm-drive-sync-load/dialog-confirm-drive-sync-load.component.ts b/src/app/features/google/dialog-confirm-drive-sync-load/dialog-confirm-drive-sync-load.component.ts
index 2a25b03e06..01e7b1d6a9 100644
--- a/src/app/features/google/dialog-confirm-drive-sync-load/dialog-confirm-drive-sync-load.component.ts
+++ b/src/app/features/google/dialog-confirm-drive-sync-load/dialog-confirm-drive-sync-load.component.ts
@@ -9,8 +9,7 @@ import { T } from '../../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogConfirmDriveSyncLoadComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     private _matDialogRef: MatDialogRef<DialogConfirmDriveSyncLoadComponent>,
diff --git a/src/app/features/google/dialog-confirm-drive-sync-save/dialog-confirm-drive-sync-save.component.ts b/src/app/features/google/dialog-confirm-drive-sync-save/dialog-confirm-drive-sync-save.component.ts
index 9995bfef4a..40faf1852b 100644
--- a/src/app/features/google/dialog-confirm-drive-sync-save/dialog-confirm-drive-sync-save.component.ts
+++ b/src/app/features/google/dialog-confirm-drive-sync-save/dialog-confirm-drive-sync-save.component.ts
@@ -9,8 +9,7 @@ import { T } from '../../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogConfirmDriveSyncSaveComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     private _matDialogRef: MatDialogRef<DialogConfirmDriveSyncSaveComponent>,
diff --git a/src/app/features/google/google-sync-cfg/google-sync-cfg.component.ts b/src/app/features/google/google-sync-cfg/google-sync-cfg.component.ts
index 2befb3c346..b5d9b97267 100644
--- a/src/app/features/google/google-sync-cfg/google-sync-cfg.component.ts
+++ b/src/app/features/google/google-sync-cfg/google-sync-cfg.component.ts
@@ -25,8 +25,7 @@ import { T } from '../../../t.const';
   animations: [expandFadeAnimation]
 })
 export class GoogleSyncCfgComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   tmpSyncFile: any;
   cfg?: GoogleDriveSyncConfig;
   loginPromise?: Promise<any>;
diff --git a/src/app/features/initial-dialog/dialog-initial/dialog-initial.component.ts b/src/app/features/initial-dialog/dialog-initial/dialog-initial.component.ts
index 9c097b0309..22c7f51f61 100644
--- a/src/app/features/initial-dialog/dialog-initial/dialog-initial.component.ts
+++ b/src/app/features/initial-dialog/dialog-initial/dialog-initial.component.ts
@@ -11,8 +11,7 @@ import { version } from '../../../../../package.json';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogInitialComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   version: string = version;
 
   constructor(
diff --git a/src/app/features/issue/providers/github/github-issue/github-issue-content/github-issue-content.component.ts b/src/app/features/issue/providers/github/github-issue/github-issue-content/github-issue-content.component.ts
index 3cff3bdb8b..7d3bed3cbf 100644
--- a/src/app/features/issue/providers/github/github-issue/github-issue-content/github-issue-content.component.ts
+++ b/src/app/features/issue/providers/github/github-issue/github-issue-content/github-issue-content.component.ts
@@ -16,8 +16,7 @@ export class GithubIssueContentComponent {
   @Input() issue?: GithubIssue;
   @Input() task?: TaskWithSubTasks;
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     private readonly  _taskService: TaskService,
diff --git a/src/app/features/issue/providers/github/github-issue/github-issue-header/github-issue-header.component.ts b/src/app/features/issue/providers/github/github-issue/github-issue-header/github-issue-header.component.ts
index e42a3e3042..43fdf25c3a 100644
--- a/src/app/features/issue/providers/github/github-issue/github-issue-header/github-issue-header.component.ts
+++ b/src/app/features/issue/providers/github/github-issue/github-issue-header/github-issue-header.component.ts
@@ -9,8 +9,7 @@ import { T } from '../../../../../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class GithubIssueHeaderComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   @Input() task?: TaskWithSubTasks;
 
   constructor() {
diff --git a/src/app/features/issue/providers/github/github-view-components/dialog-github-initial-setup/dialog-github-initial-setup.component.ts b/src/app/features/issue/providers/github/github-view-components/dialog-github-initial-setup/dialog-github-initial-setup.component.ts
index 38292ed43b..ca7a0bc483 100644
--- a/src/app/features/issue/providers/github/github-view-components/dialog-github-initial-setup/dialog-github-initial-setup.component.ts
+++ b/src/app/features/issue/providers/github/github-view-components/dialog-github-initial-setup/dialog-github-initial-setup.component.ts
@@ -13,8 +13,7 @@ import { T } from '../../../../../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogGithubInitialSetupComponent implements OnInit {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   githubCfg: GithubCfg;
   formGroup: FormGroup = new FormGroup({});
   formConfig: FormlyFieldConfig[] = GITHUB_CONFIG_FORM;
diff --git a/src/app/features/issue/providers/gitlab/dialog-gitlab-initial-setup/dialog-gitlab-initial-setup.component.ts b/src/app/features/issue/providers/gitlab/dialog-gitlab-initial-setup/dialog-gitlab-initial-setup.component.ts
index 45a1d76368..17941f238d 100644
--- a/src/app/features/issue/providers/gitlab/dialog-gitlab-initial-setup/dialog-gitlab-initial-setup.component.ts
+++ b/src/app/features/issue/providers/gitlab/dialog-gitlab-initial-setup/dialog-gitlab-initial-setup.component.ts
@@ -13,8 +13,7 @@ import { DEFAULT_GITLAB_CFG, GITLAB_CONFIG_FORM } from '../gitlab.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogGitlabInitialSetupComponent implements OnInit {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   gitlabCfg: GitlabCfg;
   formGroup: FormGroup = new FormGroup({});
   formConfig: FormlyFieldConfig[] = GITLAB_CONFIG_FORM;
diff --git a/src/app/features/issue/providers/gitlab/gitlab-issue/gitlab-issue-content/gitlab-issue-content.component.ts b/src/app/features/issue/providers/gitlab/gitlab-issue/gitlab-issue-content/gitlab-issue-content.component.ts
index 4beda6e6da..46a311fc87 100644
--- a/src/app/features/issue/providers/gitlab/gitlab-issue/gitlab-issue-content/gitlab-issue-content.component.ts
+++ b/src/app/features/issue/providers/gitlab/gitlab-issue/gitlab-issue-content/gitlab-issue-content.component.ts
@@ -16,8 +16,7 @@ export class GitlabIssueContentComponent {
   @Input() issue?: GitlabIssue;
   @Input() task?: TaskWithSubTasks;
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     private readonly  _taskService: TaskService,
diff --git a/src/app/features/issue/providers/gitlab/gitlab-issue/gitlab-issue-header/gitlab-issue-header.component.ts b/src/app/features/issue/providers/gitlab/gitlab-issue/gitlab-issue-header/gitlab-issue-header.component.ts
index 429799365e..464cdba9bf 100644
--- a/src/app/features/issue/providers/gitlab/gitlab-issue/gitlab-issue-header/gitlab-issue-header.component.ts
+++ b/src/app/features/issue/providers/gitlab/gitlab-issue/gitlab-issue-header/gitlab-issue-header.component.ts
@@ -9,8 +9,7 @@ import { TaskWithSubTasks } from 'src/app/features/tasks/task.model';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class GitlabIssueHeaderComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   @Input() public task?: TaskWithSubTasks;
 
   constructor() {
diff --git a/src/app/features/issue/providers/jira/jira-issue/jira-issue-content/jira-issue-content.component.ts b/src/app/features/issue/providers/jira/jira-issue/jira-issue-content/jira-issue-content.component.ts
index 146160fbc9..be6c907ad3 100644
--- a/src/app/features/issue/providers/jira/jira-issue/jira-issue-content/jira-issue-content.component.ts
+++ b/src/app/features/issue/providers/jira/jira-issue/jira-issue-content/jira-issue-content.component.ts
@@ -21,8 +21,7 @@ import { switchMap } from 'rxjs/operators';
 export class JiraIssueContentComponent {
   description?: string;
   attachments?: TaskAttachment[];
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   issue?: JiraIssue;
   task?: TaskWithSubTasks;
   private _task$: ReplaySubject<TaskWithSubTasks> = new ReplaySubject(1);
diff --git a/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-add-worklog/dialog-jira-add-worklog.component.ts b/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-add-worklog/dialog-jira-add-worklog.component.ts
index 612a0354b4..7e060bac1f 100644
--- a/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-add-worklog/dialog-jira-add-worklog.component.ts
+++ b/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-add-worklog/dialog-jira-add-worklog.component.ts
@@ -15,8 +15,7 @@ import { first } from 'rxjs/operators';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogJiraAddWorklogComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   timeSpent: number;
   started: string;
   comment: string;
diff --git a/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-initial-setup/dialog-jira-initial-setup.component.ts b/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-initial-setup/dialog-jira-initial-setup.component.ts
index 0ad2c05408..039da62d39 100644
--- a/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-initial-setup/dialog-jira-initial-setup.component.ts
+++ b/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-initial-setup/dialog-jira-initial-setup.component.ts
@@ -10,8 +10,7 @@ import { T } from '../../../../../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogJiraInitialSetupComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   jiraCfg: JiraCfg;
 
   constructor(
diff --git a/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-transition/dialog-jira-transition.component.ts b/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-transition/dialog-jira-transition.component.ts
index e20516337f..2f89f07cef 100644
--- a/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-transition/dialog-jira-transition.component.ts
+++ b/src/app/features/issue/providers/jira/jira-view-components/dialog-jira-transition/dialog-jira-transition.component.ts
@@ -20,8 +20,7 @@ import { JiraCfg } from '../../jira.model';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogJiraTransitionComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   _jiraCfg$: Observable<JiraCfg> = this._projectService.getJiraCfgForProject$(this.data.task.projectId as string);
 
diff --git a/src/app/features/issue/providers/jira/jira-view-components/jira-cfg-stepper/jira-cfg-stepper.component.ts b/src/app/features/issue/providers/jira/jira-view-components/jira-cfg-stepper/jira-cfg-stepper.component.ts
index 822e923440..348d4df160 100644
--- a/src/app/features/issue/providers/jira/jira-view-components/jira-cfg-stepper/jira-cfg-stepper.component.ts
+++ b/src/app/features/issue/providers/jira/jira-view-components/jira-cfg-stepper/jira-cfg-stepper.component.ts
@@ -27,8 +27,7 @@ import { HANDLED_ERROR_PROP_STR, HelperClasses } from '../../../../../../app.con
   animations: [expandAnimation]
 })
 export class JiraCfgStepperComponent implements OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   HelperClasses: typeof HelperClasses = HelperClasses;
   credentialsFormGroup: FormGroup = new FormGroup({});
   credentialsFormConfig: FormlyFieldConfig[] = [];
diff --git a/src/app/features/issue/providers/jira/jira-view-components/jira-cfg/jira-cfg.component.ts b/src/app/features/issue/providers/jira/jira-view-components/jira-cfg/jira-cfg.component.ts
index 0a5f7b8c23..9de1e3661d 100644
--- a/src/app/features/issue/providers/jira/jira-view-components/jira-cfg/jira-cfg.component.ts
+++ b/src/app/features/issue/providers/jira/jira-view-components/jira-cfg/jira-cfg.component.ts
@@ -29,8 +29,7 @@ import { JIRA_TYPE } from '../../../../issue.const';
 export class JiraCfgComponent implements OnInit, OnDestroy {
   @Input() section?: ConfigFormSection<JiraCfg>;
   @Output() save: EventEmitter<{ sectionKey: GlobalConfigSectionKey | ProjectCfgFormKey, config: any }> = new EventEmitter();
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   HelperClasses: typeof HelperClasses = HelperClasses;
   issueSuggestionsCtrl: FormControl = new FormControl();
   customFieldSuggestionsCtrl: FormControl = new FormControl();
diff --git a/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts b/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts
index 1f8ff1418c..70c9a0c5c5 100644
--- a/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts
+++ b/src/app/features/metric/evaluation-sheet/evaluation-sheet.component.ts
@@ -27,8 +27,7 @@ import { MatDialog } from '@angular/material/dialog';
 })
 export class EvaluationSheetComponent implements OnDestroy, OnInit {
   @Output() save: EventEmitter<any> = new EventEmitter();
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   metricForDay?: MetricCopy;
   day$: BehaviorSubject<string> = new BehaviorSubject(getWorklogStr());
   private _metricForDay$: Observable<MetricCopy> = this.day$.pipe(
diff --git a/src/app/features/metric/improvement-banner/improvement-banner.component.ts b/src/app/features/metric/improvement-banner/improvement-banner.component.ts
index a6ef032718..1d8a777416 100644
--- a/src/app/features/metric/improvement-banner/improvement-banner.component.ts
+++ b/src/app/features/metric/improvement-banner/improvement-banner.component.ts
@@ -14,8 +14,7 @@ import { T } from '../../../t.const';
   animations: [improvementBannerAnimation]
 })
 export class ImprovementBannerComponent implements OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   improvements: Improvement[] = [];
 
   private _subs: Subscription = new Subscription();
diff --git a/src/app/features/metric/metric.component.ts b/src/app/features/metric/metric.component.ts
index ae58e02d94..3571dc6c85 100644
--- a/src/app/features/metric/metric.component.ts
+++ b/src/app/features/metric/metric.component.ts
@@ -15,8 +15,7 @@ import { T } from '../../t.const';
   animations: [fadeAnimation],
 })
 export class MetricComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   productivityHappiness$: Observable<LineChartData> = this.metricService.getProductivityHappinessChartData$();
 
diff --git a/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.ts b/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.ts
index c2733596cb..e00c65e5ac 100644
--- a/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.ts
+++ b/src/app/features/note/dialog-add-note-reminder/dialog-add-note-reminder.component.ts
@@ -14,8 +14,7 @@ import { throttle } from 'helpful-decorators';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogAddNoteReminderComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   dateTime?: number;
   title: string;
   isEdit: boolean;
diff --git a/src/app/features/note/dialog-add-note/dialog-add-note.component.ts b/src/app/features/note/dialog-add-note/dialog-add-note.component.ts
index b4a0134669..212d8bb969 100644
--- a/src/app/features/note/dialog-add-note/dialog-add-note.component.ts
+++ b/src/app/features/note/dialog-add-note/dialog-add-note.component.ts
@@ -16,8 +16,7 @@ import { map } from 'rxjs/operators';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogAddNoteComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   noteContent: string;
   reminderDate?: number;
   isSubmitted: boolean = false;
diff --git a/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.ts b/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.ts
index aeaec7ae98..9945f0e0a8 100644
--- a/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.ts
+++ b/src/app/features/note/dialog-view-note-reminder/dialog-view-note-reminder.component.ts
@@ -20,8 +20,7 @@ import { TagService } from '../../tag/tag.service';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogViewNoteReminderComponent implements OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   note$: Observable<Note> = this._noteService.getById$(this.data.reminder.relatedId);
   reminder: Reminder = this.data.reminder;
   isForCurrentContext: boolean = (this.reminder.workContextId === this._workContextService.activeWorkContextId);
diff --git a/src/app/features/note/note/note.component.ts b/src/app/features/note/note/note.component.ts
index aabd98c5a1..bbf2d93227 100644
--- a/src/app/features/note/note/note.component.ts
+++ b/src/app/features/note/note/note.component.ts
@@ -18,8 +18,7 @@ export class NoteComponent {
 
   @ViewChild('markdownEl') markdownEl?: HTMLElement;
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     private readonly _matDialog: MatDialog,
diff --git a/src/app/features/note/notes/notes.component.ts b/src/app/features/note/notes/notes.component.ts
index ba93d1f2d5..4158a7c1c5 100644
--- a/src/app/features/note/notes/notes.component.ts
+++ b/src/app/features/note/notes/notes.component.ts
@@ -31,8 +31,7 @@ import { Task } from '../../tasks/task.model';
 export class NotesComponent implements OnInit, OnDestroy {
   @Output() scrollToSidenav: EventEmitter<void> = new EventEmitter();
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   isElementWasAdded: boolean = false;
   isDragOver: boolean = false;
   dragEnterTarget?: HTMLElement;
diff --git a/src/app/features/pomodoro/dialog-pomodoro-break/dialog-pomodoro-break.component.ts b/src/app/features/pomodoro/dialog-pomodoro-break/dialog-pomodoro-break.component.ts
index fe62898ac9..236fcb6764 100644
--- a/src/app/features/pomodoro/dialog-pomodoro-break/dialog-pomodoro-break.component.ts
+++ b/src/app/features/pomodoro/dialog-pomodoro-break/dialog-pomodoro-break.component.ts
@@ -12,8 +12,7 @@ import { T } from '../../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogPomodoroBreakComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   isStopCurrentTime$: Subject<boolean> = new Subject();
   currentTime$: Observable<number> = this.pomodoroService.currentSessionTime$.pipe(
     takeUntil(this.isStopCurrentTime$),
diff --git a/src/app/features/procrastination/procrastination.component.ts b/src/app/features/procrastination/procrastination.component.ts
index c0dfb4bd9b..3cbda2e45e 100644
--- a/src/app/features/procrastination/procrastination.component.ts
+++ b/src/app/features/procrastination/procrastination.component.ts
@@ -9,8 +9,7 @@ import { T } from '../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ProcrastinationComponent implements OnInit {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     public taskService: TaskService,
diff --git a/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts b/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts
index 39d889d1a7..e5cabbcb24 100644
--- a/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts
+++ b/src/app/features/project/dialogs/create-project/dialog-create-project.component.ts
@@ -31,8 +31,7 @@ import { DialogGitlabInitialSetupComponent } from 'src/app/features/issue/provid
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DialogCreateProjectComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   projectData: ProjectCopy | Partial<ProjectCopy> = DEFAULT_PROJECT;
   jiraCfg?: JiraCfg;
   githubCfg?: GithubCfg;
diff --git a/src/app/features/simple-counter/dialog-simple-counter-edit/dialog-simple-counter-edit.component.ts b/src/app/features/simple-counter/dialog-simple-counter-edit/dialog-simple-counter-edit.component.ts
index 9928578beb..561ae0ea20 100644
--- a/src/app/features/simple-counter/dialog-simple-counter-edit/dialog-simple-counter-edit.component.ts
+++ b/src/app/features/simple-counter/dialog-simple-counter-edit/dialog-simple-counter-edit.component.ts
@@ -12,8 +12,7 @@ import { getWorklogStr } from '../../../util/get-work-log-str';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogSimpleCounterEditComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   SimpleCounterType: typeof SimpleCounterType = SimpleCounterType;
 
   todayStr: string = getWorklogStr();
diff --git a/src/app/features/simple-counter/simple-counter-button/simple-counter-button.component.ts b/src/app/features/simple-counter/simple-counter-button/simple-counter-button.component.ts
index 77ad27d55d..b120e6cc2a 100644
--- a/src/app/features/simple-counter/simple-counter-button/simple-counter-button.component.ts
+++ b/src/app/features/simple-counter/simple-counter-button/simple-counter-button.component.ts
@@ -13,8 +13,7 @@ import { getWorklogStr } from '../../../util/get-work-log-str';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SimpleCounterButtonComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   SimpleCounterType: typeof SimpleCounterType = SimpleCounterType;
   todayStr: string = getWorklogStr();
 
diff --git a/src/app/features/simple-counter/simple-counter-cfg/simple-counter-cfg.component.ts b/src/app/features/simple-counter/simple-counter-cfg/simple-counter-cfg.component.ts
index 8ddf224975..5477537ebf 100644
--- a/src/app/features/simple-counter/simple-counter-cfg/simple-counter-cfg.component.ts
+++ b/src/app/features/simple-counter/simple-counter-cfg/simple-counter-cfg.component.ts
@@ -22,8 +22,7 @@ export class SimpleCounterCfgComponent implements OnDestroy {
   @Input() cfg?: SimpleCounterConfig;
   @Output() save: EventEmitter<{ sectionKey: GlobalConfigSectionKey | ProjectCfgFormKey, config: any }> = new EventEmitter();
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   form: FormGroup = new FormGroup({});
   options: FormlyFormOptions = {};
 
diff --git a/src/app/features/tag/dialog-edit-tags/dialog-edit-tags-for-task.component.ts b/src/app/features/tag/dialog-edit-tags/dialog-edit-tags-for-task.component.ts
index 1a62776d69..0c33eae3c3 100644
--- a/src/app/features/tag/dialog-edit-tags/dialog-edit-tags-for-task.component.ts
+++ b/src/app/features/tag/dialog-edit-tags/dialog-edit-tags-for-task.component.ts
@@ -17,8 +17,7 @@ import { Tag } from '../tag.model';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogEditTagsForTaskComponent implements OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   title: string = truncate(this.data.task.title, 20);
   task$: Observable<Task> = this._taskService.getByIdLive$(this.data.task.id);
   task: Task = this.data.task;
diff --git a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts
index 30dd33aced..3ab341ddd4 100644
--- a/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts
+++ b/src/app/features/task-repeat-cfg/dialog-edit-task-repeat-cfg/dialog-edit-task-repeat-cfg.component.ts
@@ -21,8 +21,7 @@ import { exists } from '../../../util/exists';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogEditTaskRepeatCfgComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   task: Task = this.data.task;
 
   taskRepeatCfg: Omit<TaskRepeatCfgCopy, 'id'> = {
diff --git a/src/app/features/tasks/add-task-bar/add-task-bar.component.ts b/src/app/features/tasks/add-task-bar/add-task-bar.component.ts
index f2c07fcc62..b4c2e9b8d7 100644
--- a/src/app/features/tasks/add-task-bar/add-task-bar.component.ts
+++ b/src/app/features/tasks/add-task-bar/add-task-bar.component.ts
@@ -50,8 +50,7 @@ export class AddTaskBarComponent implements AfterViewInit, OnDestroy {
 
   @ViewChild('inputEl', {static: true}) inputEl?: ElementRef;
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   isLoading$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
   doubleEnterCount: number = 0;
 
diff --git a/src/app/features/tasks/dialog-add-task-reminder/dialog-add-task-reminder.component.ts b/src/app/features/tasks/dialog-add-task-reminder/dialog-add-task-reminder.component.ts
index cf58503409..b0d96cab32 100644
--- a/src/app/features/tasks/dialog-add-task-reminder/dialog-add-task-reminder.component.ts
+++ b/src/app/features/tasks/dialog-add-task-reminder/dialog-add-task-reminder.component.ts
@@ -15,8 +15,7 @@ import { Task } from '../task.model';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogAddTaskReminderComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   task: Task = this.data.task;
   reminder?: ReminderCopy = this.task.reminderId
     ? this._reminderService.getById(this.task.reminderId) || undefined
diff --git a/src/app/features/tasks/dialog-add-time-estimate-for-other-day/dialog-add-time-estimate-for-other-day.component.ts b/src/app/features/tasks/dialog-add-time-estimate-for-other-day/dialog-add-time-estimate-for-other-day.component.ts
index 1ec7ba1a9f..bc485edc31 100644
--- a/src/app/features/tasks/dialog-add-time-estimate-for-other-day/dialog-add-time-estimate-for-other-day.component.ts
+++ b/src/app/features/tasks/dialog-add-time-estimate-for-other-day/dialog-add-time-estimate-for-other-day.component.ts
@@ -14,8 +14,7 @@ interface NewTimeEntry {
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DialogAddTimeEstimateForOtherDayComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   newEntry: NewTimeEntry;
 
   constructor(private _matDialogRef: MatDialogRef<DialogAddTimeEstimateForOtherDayComponent>) {
diff --git a/src/app/features/tasks/dialog-time-estimate/dialog-time-estimate.component.ts b/src/app/features/tasks/dialog-time-estimate/dialog-time-estimate.component.ts
index 47c377dcfa..4110cf0c6c 100644
--- a/src/app/features/tasks/dialog-time-estimate/dialog-time-estimate.component.ts
+++ b/src/app/features/tasks/dialog-time-estimate/dialog-time-estimate.component.ts
@@ -15,8 +15,7 @@ import { T } from '../../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class DialogTimeEstimateComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   todayStr: string;
   task: Task;
   taskCopy: TaskCopy;
diff --git a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts
index d0fa66e3a3..525e887372 100644
--- a/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts
+++ b/src/app/features/tasks/dialog-view-task-reminders/dialog-view-task-reminders.component.ts
@@ -24,8 +24,7 @@ const M = 1000 * 60;
   animations: [standardListAnimation],
 })
 export class DialogViewTaskRemindersComponent implements OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   isDisableControls: boolean = false;
   reminders$: BehaviorSubject<Reminder[]> = new BehaviorSubject(this.data.reminders);
   tasks$: Observable<TaskWithReminderData[]> = this.reminders$.pipe(
diff --git a/src/app/features/tasks/select-task/select-task.component.ts b/src/app/features/tasks/select-task/select-task.component.ts
index db0db4b058..965b6a2a0d 100644
--- a/src/app/features/tasks/select-task/select-task.component.ts
+++ b/src/app/features/tasks/select-task/select-task.component.ts
@@ -13,8 +13,7 @@ import { WorkContextService } from '../../work-context/work-context.service';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SelectTaskComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   taskSelectCtrl: FormControl = new FormControl();
   filteredTasks: Task[] = [];
   isCreate: boolean = false;
diff --git a/src/app/features/tasks/task-additional-info/task-additional-info.component.ts b/src/app/features/tasks/task-additional-info/task-additional-info.component.ts
index c39fe924c9..b0e5224797 100644
--- a/src/app/features/tasks/task-additional-info/task-additional-info.component.ts
+++ b/src/app/features/tasks/task-additional-info/task-additional-info.component.ts
@@ -70,8 +70,7 @@ export class TaskAdditionalInfoComponent implements AfterViewInit, OnDestroy {
   ShowSubTasksMode: typeof ShowSubTasksMode = ShowSubTasksMode;
   selectedItemIndex: number = 0;
   isFocusNotes: boolean = false;
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   issueAttachments: TaskAttachment[] = [];
   reminderId$: BehaviorSubject<string | null> = new BehaviorSubject<string | null>(null);
   reminderData$: Observable<ReminderCopy | null> = this.reminderId$.pipe(
diff --git a/src/app/features/tasks/task-attachment/dialog-edit-attachment/dialog-edit-task-attachment.component.ts b/src/app/features/tasks/task-attachment/dialog-edit-attachment/dialog-edit-task-attachment.component.ts
index c1013fb02b..2619f5041a 100644
--- a/src/app/features/tasks/task-attachment/dialog-edit-attachment/dialog-edit-task-attachment.component.ts
+++ b/src/app/features/tasks/task-attachment/dialog-edit-attachment/dialog-edit-task-attachment.component.ts
@@ -18,8 +18,7 @@ interface TaskAttachmentSelectType {
 export class DialogEditTaskAttachmentComponent {
   types: TaskAttachmentSelectType[];
   attachmentCopy: TaskAttachmentCopy;
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     private _matDialogRef: MatDialogRef<DialogEditTaskAttachmentComponent>,
diff --git a/src/app/features/tasks/task-attachment/task-attachment-list/task-attachment-list.component.ts b/src/app/features/tasks/task-attachment/task-attachment-list/task-attachment-list.component.ts
index f7922b395f..0591686b27 100644
--- a/src/app/features/tasks/task-attachment/task-attachment-list/task-attachment-list.component.ts
+++ b/src/app/features/tasks/task-attachment/task-attachment-list/task-attachment-list.component.ts
@@ -18,8 +18,7 @@ export class TaskAttachmentListComponent {
   @Input() attachments?: TaskAttachment[];
   @Input() isDisableControls: boolean = false;
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   isError: boolean[] = [];
 
   constructor(
diff --git a/src/app/features/tasks/task-list/task-list.component.ts b/src/app/features/tasks/task-list/task-list.component.ts
index 0f4d2c5b84..d1787e33ba 100644
--- a/src/app/features/tasks/task-list/task-list.component.ts
+++ b/src/app/features/tasks/task-list/task-list.component.ts
@@ -27,8 +27,7 @@ import { T } from '../../../t.const';
 
 })
 export class TaskListComponent implements OnDestroy, OnInit {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   tasksIN: TaskWithSubTasks[] = [];
   tasks$: ReplaySubject<TaskWithSubTasks[]> = new ReplaySubject(1);
   isHideDoneIN: boolean = false;
diff --git a/src/app/features/tasks/task-summary-table/task-summary-table.component.ts b/src/app/features/tasks/task-summary-table/task-summary-table.component.ts
index 1701ada787..f239433d16 100644
--- a/src/app/features/tasks/task-summary-table/task-summary-table.component.ts
+++ b/src/app/features/tasks/task-summary-table/task-summary-table.component.ts
@@ -15,8 +15,7 @@ export class TaskSummaryTableComponent {
   @Input() day: string = getWorklogStr();
   @Output() updated: EventEmitter<void> = new EventEmitter();
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     private _taskService: TaskService,
diff --git a/src/app/features/tasks/task-summary-tables/task-summary-tables.component.ts b/src/app/features/tasks/task-summary-tables/task-summary-tables.component.ts
index b7ecd6f715..7af32bd337 100644
--- a/src/app/features/tasks/task-summary-tables/task-summary-tables.component.ts
+++ b/src/app/features/tasks/task-summary-tables/task-summary-tables.component.ts
@@ -22,8 +22,7 @@ import { mapToProjectWithTasks, ProjectWithTasks } from './map-to-project-with-t
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class TaskSummaryTablesComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   @Input() dayStr: string = getWorklogStr();
 
diff --git a/src/app/features/tasks/task/task.component.ts b/src/app/features/tasks/task/task.component.ts
index 631575f96f..8e5ca2a3b1 100644
--- a/src/app/features/tasks/task/task.component.ts
+++ b/src/app/features/tasks/task/task.component.ts
@@ -49,8 +49,7 @@ import { environment } from '../../../../environments/environment';
 export class TaskComponent implements OnInit, OnDestroy, AfterViewInit {
   task?: TaskWithSubTasks;
   @Input() isBacklog: boolean = false;
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   isTouchOnly: boolean = IS_TOUCH_ONLY;
   isDragOver: boolean = false;
   isLockPanLeft: boolean = false;
diff --git a/src/app/features/time-tracking/dialog-idle/dialog-idle.component.ts b/src/app/features/time-tracking/dialog-idle/dialog-idle.component.ts
index bc5d31aa3d..330590fd71 100644
--- a/src/app/features/time-tracking/dialog-idle/dialog-idle.component.ts
+++ b/src/app/features/time-tracking/dialog-idle/dialog-idle.component.ts
@@ -13,8 +13,7 @@ import { T } from '../../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogIdleComponent implements OnInit {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   lastCurrentTask$: Observable<Task> = this._taskService.getByIdOnce$(this.data.lastCurrentTaskId);
   selectedTask: Task | null = null;
   newTaskTitle?: string;
diff --git a/src/app/features/work-view/backlog/backlog.component.ts b/src/app/features/work-view/backlog/backlog.component.ts
index 4d71a6b8e7..1c871295e7 100644
--- a/src/app/features/work-view/backlog/backlog.component.ts
+++ b/src/app/features/work-view/backlog/backlog.component.ts
@@ -16,8 +16,7 @@ export class BacklogComponent {
 
   @Output() closeBacklog: EventEmitter<any> = new EventEmitter<any>();
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   // we do it here to have the tasks in memory all the time
   // backlogTasks$: Observable<TaskWithSubTasks[]> = this._projectService.isProjectChanging$.pipe(
diff --git a/src/app/features/work-view/work-view.component.ts b/src/app/features/work-view/work-view.component.ts
index 17893bf8b5..19fa632b75 100644
--- a/src/app/features/work-view/work-view.component.ts
+++ b/src/app/features/work-view/work-view.component.ts
@@ -43,8 +43,7 @@ export class WorkViewComponent implements OnInit, OnDestroy, AfterContentInit {
   isShowTimeWorkedWithoutBreak: boolean = true;
   splitInputPos: number = 100;
   isPreloadBacklog: boolean = false;
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   // NOTE: not perfect but good enough for now
   isTriggerBacklogIconAni$: Observable<boolean> = this.workContextService.onMoveToBacklog$.pipe(
diff --git a/src/app/features/worklog/dialog-worklog-export/dialog-worklog-export.component.ts b/src/app/features/worklog/dialog-worklog-export/dialog-worklog-export.component.ts
index b4f540f8ed..aadc58592f 100644
--- a/src/app/features/worklog/dialog-worklog-export/dialog-worklog-export.component.ts
+++ b/src/app/features/worklog/dialog-worklog-export/dialog-worklog-export.component.ts
@@ -12,8 +12,7 @@ import { WORKLOG_EXPORT_DEFAULTS } from '../../work-context/work-context.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogWorklogExportComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   options: WorklogExportSettingsCopy = WORKLOG_EXPORT_DEFAULTS;
   strStart: string;
   strEnd: string;
diff --git a/src/app/features/worklog/worklog-export/worklog-export.component.ts b/src/app/features/worklog/worklog-export/worklog-export.component.ts
index 27d2d7dd0c..7452b19720 100644
--- a/src/app/features/worklog/worklog-export/worklog-export.component.ts
+++ b/src/app/features/worklog/worklog-export/worklog-export.component.ts
@@ -63,8 +63,7 @@ export class WorklogExportComponent implements OnInit, OnDestroy {
 
   @Output() cancel: EventEmitter<void> = new EventEmitter();
 
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   isShowAsText: boolean = false;
   headlineCols: string[] = [];
   formattedRows?: (string | number | undefined)[][];
diff --git a/src/app/features/worklog/worklog-week/worklog-week.component.ts b/src/app/features/worklog/worklog-week/worklog-week.component.ts
index 33d66ddd10..43788dbc7d 100644
--- a/src/app/features/worklog/worklog-week/worklog-week.component.ts
+++ b/src/app/features/worklog/worklog-week/worklog-week.component.ts
@@ -21,8 +21,7 @@ import { SimpleCounterService } from '../../simple-counter/simple-counter.servic
 })
 export class WorklogWeekComponent {
   visibility: boolean[] = [];
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   keys: (o: object) => string[] = Object.keys;
 
   constructor(
diff --git a/src/app/features/worklog/worklog.component.ts b/src/app/features/worklog/worklog.component.ts
index 7a5bbcaaa2..29fcd26ba6 100644
--- a/src/app/features/worklog/worklog.component.ts
+++ b/src/app/features/worklog/worklog.component.ts
@@ -24,8 +24,7 @@ import { WorkContextService } from '../work-context/work-context.service';
   animations: [expandFadeAnimation, standardListAnimation, fadeAnimation]
 })
 export class WorklogComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   expanded: { [key: string]: boolean } = {};
 
   constructor(
diff --git a/src/app/imex/file-imex/file-imex.component.ts b/src/app/imex/file-imex/file-imex.component.ts
index 094635a131..c76d5b8268 100644
--- a/src/app/imex/file-imex/file-imex.component.ts
+++ b/src/app/imex/file-imex/file-imex.component.ts
@@ -13,8 +13,7 @@ import { T } from '../../t.const';
 })
 export class FileImexComponent {
   @ViewChild('fileInput', {static: true}) fileInputRef?: ElementRef;
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     private _dataImportService: DataImportService,
diff --git a/src/app/pages/config-page/config-page.component.ts b/src/app/pages/config-page/config-page.component.ts
index ff8280e7bf..e7f33c6851 100644
--- a/src/app/pages/config-page/config-page.component.ts
+++ b/src/app/pages/config-page/config-page.component.ts
@@ -26,8 +26,7 @@ import { MatSlideToggleChange } from '@angular/material/slide-toggle';
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class ConfigPageComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   globalConfigFormCfg: ConfigFormConfig;
   globalSyncProviderFormCfg: ConfigFormConfig;
   globalProductivityConfigFormCfg: ConfigFormConfig;
diff --git a/src/app/pages/daily-summary/daily-summary.component.ts b/src/app/pages/daily-summary/daily-summary.component.ts
index 09d14055d7..08ccbbbdd4 100644
--- a/src/app/pages/daily-summary/daily-summary.component.ts
+++ b/src/app/pages/daily-summary/daily-summary.component.ts
@@ -27,8 +27,7 @@ const SUCCESS_ANIMATION_DURATION = 500;
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DailySummaryComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   cfg: any = {
     isBlockFinishDayUntilTimeTimeTracked: false
diff --git a/src/app/pages/metric-page/metric-page.component.ts b/src/app/pages/metric-page/metric-page.component.ts
index 24e9e9e6ed..d3db4e9471 100644
--- a/src/app/pages/metric-page/metric-page.component.ts
+++ b/src/app/pages/metric-page/metric-page.component.ts
@@ -8,8 +8,7 @@ import { T } from '../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class MetricPageComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor() {
   }
diff --git a/src/app/pages/project-overview-page/project-overview-page.component.ts b/src/app/pages/project-overview-page/project-overview-page.component.ts
index e0fa18d8e4..e630008dd3 100644
--- a/src/app/pages/project-overview-page/project-overview-page.component.ts
+++ b/src/app/pages/project-overview-page/project-overview-page.component.ts
@@ -24,8 +24,7 @@ import { ExportedProject } from '../../features/project/project-archive.model';
   animations: [standardListAnimation],
 })
 export class ProjectOverviewPageComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   private _subs: Subscription = new Subscription();
 
   constructor(
diff --git a/src/app/pages/project-settings-page/project-settings-page.component.ts b/src/app/pages/project-settings-page/project-settings-page.component.ts
index 106afe58f7..c397fbe33e 100644
--- a/src/app/pages/project-settings-page/project-settings-page.component.ts
+++ b/src/app/pages/project-settings-page/project-settings-page.component.ts
@@ -23,8 +23,7 @@ import { DEFAULT_GITLAB_CFG } from 'src/app/features/issue/providers/gitlab/gitl
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ProjectSettingsPageComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   projectThemeSettingsFormCfg: ConfigFormSection<WorkContextThemeCfg>;
   issueIntegrationFormCfg: ConfigFormConfig;
   globalConfigFormCfg: ConfigFormConfig;
diff --git a/src/app/pages/schedule-page/schedule-page.component.ts b/src/app/pages/schedule-page/schedule-page.component.ts
index 2f8b631d6b..f4872a1485 100644
--- a/src/app/pages/schedule-page/schedule-page.component.ts
+++ b/src/app/pages/schedule-page/schedule-page.component.ts
@@ -22,8 +22,7 @@ import { Tag } from '../../features/tag/tag.model';
   animations: [standardListAnimation]
 })
 export class SchedulePageComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   TODAY_TAG: Tag = TODAY_TAG;
 
   constructor(
diff --git a/src/app/pages/tag-settings-page/tag-settings-page.component.ts b/src/app/pages/tag-settings-page/tag-settings-page.component.ts
index 4d053b3e8d..b710163e2c 100644
--- a/src/app/pages/tag-settings-page/tag-settings-page.component.ts
+++ b/src/app/pages/tag-settings-page/tag-settings-page.component.ts
@@ -23,8 +23,7 @@ import { BASIC_TAG_CONFIG_FORM_CONFIG } from '../../features/tag/tag-form-cfg.co
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class TagSettingsPageComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   tagThemeSettingsFormCfg: ConfigFormSection<WorkContextThemeCfg>;
   globalConfigFormCfg: ConfigFormConfig;
   basicFormCfg: ConfigFormSection<Tag>;
diff --git a/src/app/pages/worklog-page/worklog-page.component.ts b/src/app/pages/worklog-page/worklog-page.component.ts
index c6e4fd5706..d6f397b26d 100644
--- a/src/app/pages/worklog-page/worklog-page.component.ts
+++ b/src/app/pages/worklog-page/worklog-page.component.ts
@@ -8,8 +8,7 @@ import { T } from '../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class WorklogPageComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor() {
   }
diff --git a/src/app/ui/chip-list-input/chip-list-input.component.ts b/src/app/ui/chip-list-input/chip-list-input.component.ts
index 43316ea8e7..f34d5a24a0 100644
--- a/src/app/ui/chip-list-input/chip-list-input.component.ts
+++ b/src/app/ui/chip-list-input/chip-list-input.component.ts
@@ -21,8 +21,7 @@ interface Suggestion {
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ChipListInputComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   @Input() label?: string;
   @Input() additionalActionIcon?: string;
diff --git a/src/app/ui/datetime-input/datetime-input.component.ts b/src/app/ui/datetime-input/datetime-input.component.ts
index adbf40e949..dbe177d961 100644
--- a/src/app/ui/datetime-input/datetime-input.component.ts
+++ b/src/app/ui/datetime-input/datetime-input.component.ts
@@ -17,8 +17,7 @@ export class DatetimeInputComponent {
   nrValue: number | undefined;
   strValue: string | undefined | null;
   lastVal: number | undefined;
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor() {
     const lastVal = localStorage.getItem(LS_LAST_REMINDER_DATE);
diff --git a/src/app/ui/dialog-confirm/dialog-confirm.component.ts b/src/app/ui/dialog-confirm/dialog-confirm.component.ts
index a913416cbc..a7f6065bb7 100644
--- a/src/app/ui/dialog-confirm/dialog-confirm.component.ts
+++ b/src/app/ui/dialog-confirm/dialog-confirm.component.ts
@@ -9,8 +9,7 @@ import { T } from '../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogConfirmComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   constructor(
     private _matDialogRef: MatDialogRef<DialogConfirmComponent>,
diff --git a/src/app/ui/dialog-fullscreen-markdown/dialog-fullscreen-markdown.component.ts b/src/app/ui/dialog-fullscreen-markdown/dialog-fullscreen-markdown.component.ts
index 4c426984c7..08731b214e 100644
--- a/src/app/ui/dialog-fullscreen-markdown/dialog-fullscreen-markdown.component.ts
+++ b/src/app/ui/dialog-fullscreen-markdown/dialog-fullscreen-markdown.component.ts
@@ -11,8 +11,7 @@ import { ESCAPE } from '@angular/cdk/keycodes';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogFullscreenMarkdownComponent implements OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
 
   private _subs: Subscription = new Subscription();
 
diff --git a/src/app/ui/dialog-prompt/dialog-prompt.component.ts b/src/app/ui/dialog-prompt/dialog-prompt.component.ts
index d6d6cdb892..a295d203be 100644
--- a/src/app/ui/dialog-prompt/dialog-prompt.component.ts
+++ b/src/app/ui/dialog-prompt/dialog-prompt.component.ts
@@ -9,8 +9,7 @@ import { T } from '../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class DialogPromptComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   txtVal: string = '';
 
   constructor(
diff --git a/src/app/ui/duration/input-duration-slider/input-duration-slider.component.ts b/src/app/ui/duration/input-duration-slider/input-duration-slider.component.ts
index ac565679b4..3c136ba583 100644
--- a/src/app/ui/duration/input-duration-slider/input-duration-slider.component.ts
+++ b/src/app/ui/duration/input-duration-slider/input-duration-slider.component.ts
@@ -23,8 +23,7 @@ import { T } from '../../../t.const';
   animations: [dotAnimation],
 })
 export class InputDurationSliderComponent implements OnInit, OnDestroy {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   minutesBefore: number = 0;
   dots: any[] = [];
   uid: string = 'duration-input-slider' + shortid();
diff --git a/src/app/ui/owl-wrapper/owl-wrapper.component.ts b/src/app/ui/owl-wrapper/owl-wrapper.component.ts
index e3fee66ccf..ab6279362f 100644
--- a/src/app/ui/owl-wrapper/owl-wrapper.component.ts
+++ b/src/app/ui/owl-wrapper/owl-wrapper.component.ts
@@ -19,8 +19,7 @@ export class OwlWrapperComponent {
 
   @Output()
   triggerSubmit: EventEmitter<number> = new EventEmitter();
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   date: Date = new Date();
   laterTodaySlots: string[] = [
     '9:00',
diff --git a/src/app/ui/theme-select/theme-select.component.ts b/src/app/ui/theme-select/theme-select.component.ts
index df0c9363b4..c697dd0050 100644
--- a/src/app/ui/theme-select/theme-select.component.ts
+++ b/src/app/ui/theme-select/theme-select.component.ts
@@ -9,8 +9,7 @@ import { T } from '../../t.const';
   changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class ThemeSelectComponent {
-  // tslint:disable-next-line:typedef
-  T = T;
+  T: typeof T = T;
   themes: string[] = ALL_THEMES;
 
   trackBy(i: number, theme: string) {