diff --git a/database/entity/0002-add_settings/User.ts b/database/entity/0002-add_settings/User.ts
index 4f333fd50..c26602cd5 100644
--- a/database/entity/0002-add_settings/User.ts
+++ b/database/entity/0002-add_settings/User.ts
@@ -1,5 +1,5 @@
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToMany } from 'typeorm'
-import { UserSetting } from '../0002-add_settings/UserSetting'
+import { UserSetting } from './UserSetting'
 
 // Moriz: I do not like the idea of having two user tables
 @Entity('state_users', { engine: 'InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci' })
diff --git a/database/entity/0028-decimal_types/Transaction.ts b/database/entity/0028-decimal_types/Transaction.ts
index 9352e6335..6c08fe3c0 100644
--- a/database/entity/0028-decimal_types/Transaction.ts
+++ b/database/entity/0028-decimal_types/Transaction.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 
diff --git a/database/entity/0029-clean_transaction_table/Transaction.ts b/database/entity/0029-clean_transaction_table/Transaction.ts
index 5931c153f..f253b9d58 100644
--- a/database/entity/0029-clean_transaction_table/Transaction.ts
+++ b/database/entity/0029-clean_transaction_table/Transaction.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 
diff --git a/database/entity/0030-transaction_link/TransactionLink.ts b/database/entity/0030-transaction_link/TransactionLink.ts
index 177f23561..59179c3be 100644
--- a/database/entity/0030-transaction_link/TransactionLink.ts
+++ b/database/entity/0030-transaction_link/TransactionLink.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, DeleteDateColumn } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 
diff --git a/database/entity/0031-remove_sendEmail_from_transaction_link/TransactionLink.ts b/database/entity/0031-remove_sendEmail_from_transaction_link/TransactionLink.ts
index 9cd42258a..6c8edf30f 100644
--- a/database/entity/0031-remove_sendEmail_from_transaction_link/TransactionLink.ts
+++ b/database/entity/0031-remove_sendEmail_from_transaction_link/TransactionLink.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, DeleteDateColumn } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 
diff --git a/database/entity/0032-add-transaction-link-to-transaction/Transaction.ts b/database/entity/0032-add-transaction-link-to-transaction/Transaction.ts
index 398fa03db..e9e206e14 100644
--- a/database/entity/0032-add-transaction-link-to-transaction/Transaction.ts
+++ b/database/entity/0032-add-transaction-link-to-transaction/Transaction.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 
diff --git a/database/entity/0035-admin_pending_creations_decimal/AdminPendingCreation.ts b/database/entity/0035-admin_pending_creations_decimal/AdminPendingCreation.ts
index 3cd83a3a5..f2d0d1386 100644
--- a/database/entity/0035-admin_pending_creations_decimal/AdminPendingCreation.ts
+++ b/database/entity/0035-admin_pending_creations_decimal/AdminPendingCreation.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Column, Entity, PrimaryGeneratedColumn } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 
diff --git a/database/entity/0036-unique_previous_in_transactions/Transaction.ts b/database/entity/0036-unique_previous_in_transactions/Transaction.ts
index 3b6baf47a..2f2899429 100644
--- a/database/entity/0036-unique_previous_in_transactions/Transaction.ts
+++ b/database/entity/0036-unique_previous_in_transactions/Transaction.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-use-before-define */
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne, JoinColumn } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 import { Contribution } from '../Contribution'
diff --git a/database/entity/0038-add_contribution_links_table/ContributionLink.ts b/database/entity/0038-add_contribution_links_table/ContributionLink.ts
index 496f57d71..3d79e84fd 100644
--- a/database/entity/0038-add_contribution_links_table/ContributionLink.ts
+++ b/database/entity/0038-add_contribution_links_table/ContributionLink.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, DeleteDateColumn } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 
diff --git a/database/entity/0039-contributions_table/Contribution.ts b/database/entity/0039-contributions_table/Contribution.ts
index b5e6ac0e0..7b0abd29a 100644
--- a/database/entity/0039-contributions_table/Contribution.ts
+++ b/database/entity/0039-contributions_table/Contribution.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import {
   BaseEntity,
   Column,
diff --git a/database/entity/0043-add_event_protocol_table/EventProtocol.ts b/database/entity/0043-add_event_protocol_table/EventProtocol.ts
index 72470d2ed..13eebcce5 100644
--- a/database/entity/0043-add_event_protocol_table/EventProtocol.ts
+++ b/database/entity/0043-add_event_protocol_table/EventProtocol.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 
diff --git a/database/entity/0045-add_denied_type_and_status_to_contributions/Contribution.ts b/database/entity/0045-add_denied_type_and_status_to_contributions/Contribution.ts
index c376ae53e..21300fd4d 100644
--- a/database/entity/0045-add_denied_type_and_status_to_contributions/Contribution.ts
+++ b/database/entity/0045-add_denied_type_and_status_to_contributions/Contribution.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import {
   BaseEntity,
   Column,
diff --git a/database/entity/0047-messages_tables/Contribution.ts b/database/entity/0047-messages_tables/Contribution.ts
index 1ba31bb88..323bf91b6 100644
--- a/database/entity/0047-messages_tables/Contribution.ts
+++ b/database/entity/0047-messages_tables/Contribution.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import {
   BaseEntity,
   Column,
diff --git a/database/entity/0050-add_messageId_to_event_protocol/EventProtocol.ts b/database/entity/0050-add_messageId_to_event_protocol/EventProtocol.ts
index e457cc0a3..ca7d27069 100644
--- a/database/entity/0050-add_messageId_to_event_protocol/EventProtocol.ts
+++ b/database/entity/0050-add_messageId_to_event_protocol/EventProtocol.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 
diff --git a/database/entity/0051-add_delete_by_to_contributions/Contribution.ts b/database/entity/0051-add_delete_by_to_contributions/Contribution.ts
index 32c6f32a3..8e8d0d172 100644
--- a/database/entity/0051-add_delete_by_to_contributions/Contribution.ts
+++ b/database/entity/0051-add_delete_by_to_contributions/Contribution.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import {
   BaseEntity,
   Column,
diff --git a/database/entity/0052-add_updated_at_to_contributions/Contribution.ts b/database/entity/0052-add_updated_at_to_contributions/Contribution.ts
index 4676c14af..941e9da38 100644
--- a/database/entity/0052-add_updated_at_to_contributions/Contribution.ts
+++ b/database/entity/0052-add_updated_at_to_contributions/Contribution.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import {
   BaseEntity,
   Column,
diff --git a/database/entity/0061-event_refactoring/Event.ts b/database/entity/0061-event_refactoring/Event.ts
index ab75c2d94..a2fbf0adf 100644
--- a/database/entity/0061-event_refactoring/Event.ts
+++ b/database/entity/0061-event_refactoring/Event.ts
@@ -2,7 +2,7 @@ import { Contribution } from '../Contribution'
 import { ContributionMessage } from '../ContributionMessage'
 import { User } from '../User'
 import { Transaction } from '../Transaction'
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import {
   BaseEntity,
   Entity,
diff --git a/database/entity/0063-event_link_fields/Event.ts b/database/entity/0063-event_link_fields/Event.ts
index dc7fa776c..40f1ea7c0 100644
--- a/database/entity/0063-event_link_fields/Event.ts
+++ b/database/entity/0063-event_link_fields/Event.ts
@@ -2,7 +2,7 @@ import { Contribution } from '../Contribution'
 import { ContributionMessage } from '../ContributionMessage'
 import { User } from '../User'
 import { Transaction } from '../Transaction'
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import {
   BaseEntity,
   Entity,
diff --git a/database/entity/0066-x-community-sendcoins-transactions_table/Transaction.ts b/database/entity/0066-x-community-sendcoins-transactions_table/Transaction.ts
index 319bd81de..105972310 100644
--- a/database/entity/0066-x-community-sendcoins-transactions_table/Transaction.ts
+++ b/database/entity/0066-x-community-sendcoins-transactions_table/Transaction.ts
@@ -1,5 +1,5 @@
 /* eslint-disable no-use-before-define */
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { BaseEntity, Entity, PrimaryGeneratedColumn, Column, OneToOne, JoinColumn } from 'typeorm'
 import { DecimalTransformer } from '../../src/typeorm/DecimalTransformer'
 import { Contribution } from '../Contribution'
diff --git a/database/migrations/0028-decimal_types.ts b/database/migrations/0028-decimal_types.ts
index e79d120a8..65a985b4f 100644
--- a/database/migrations/0028-decimal_types.ts
+++ b/database/migrations/0028-decimal_types.ts
@@ -22,7 +22,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-unused-vars */
 
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 
 // Set precision value
 Decimal.set({
diff --git a/database/migrations/0054-recalculate_balance_and_decay.ts b/database/migrations/0054-recalculate_balance_and_decay.ts
index b2add3a58..868cbf526 100644
--- a/database/migrations/0054-recalculate_balance_and_decay.ts
+++ b/database/migrations/0054-recalculate_balance_and_decay.ts
@@ -15,7 +15,7 @@
 /* eslint-disable no-unused-vars */
 
 import fs from 'fs'
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 
 // Set precision value
 Decimal.set({
diff --git a/database/src/typeorm/DecimalTransformer.ts b/database/src/typeorm/DecimalTransformer.ts
index 92efaf3bc..b1bcb8ca3 100644
--- a/database/src/typeorm/DecimalTransformer.ts
+++ b/database/src/typeorm/DecimalTransformer.ts
@@ -1,4 +1,4 @@
-import Decimal from 'decimal.js-light'
+import { Decimal } from 'decimal.js-light'
 import { ValueTransformer } from 'typeorm'
 
 Decimal.set({