diff --git a/package-lock.json b/package-lock.json
index fb5724336..658abe296 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -46,7 +46,7 @@
         "@cypress/code-coverage": "^3.10.0",
         "@rsksmart/mock-web3-provider": "^1.0.1",
         "@sveltejs/vite-plugin-svelte": "^1.0.1",
-        "@tsconfig/svelte": "^1.0.13",
+        "@tsconfig/svelte": "^3.0.0",
         "@types/connect-history-api-fallback": "^1.3.5",
         "@types/express-serve-static-core": "^4.17.30",
         "@types/lodash": "^4.14.184",
@@ -3346,9 +3346,9 @@
       }
     },
     "node_modules/@tsconfig/svelte": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-1.0.13.tgz",
-      "integrity": "sha512-5lYJP45Xllo4yE/RUBccBT32eBlRDbqN8r1/MIvQbKxW3aFqaYPCNgm8D5V20X4ShHcwvYWNlKg3liDh1MlBoA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-3.0.0.tgz",
+      "integrity": "sha512-pYrtLtOwku/7r1i9AMONsJMVYAtk3hzOfiGNekhtq5tYBGA7unMve8RvUclKLMT3PrihvJqUmzsRGh0RP84hKg==",
       "dev": true
     },
     "node_modules/@types/bn.js": {
@@ -14060,9 +14060,9 @@
       }
     },
     "@tsconfig/svelte": {
-      "version": "1.0.13",
-      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-1.0.13.tgz",
-      "integrity": "sha512-5lYJP45Xllo4yE/RUBccBT32eBlRDbqN8r1/MIvQbKxW3aFqaYPCNgm8D5V20X4ShHcwvYWNlKg3liDh1MlBoA==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@tsconfig/svelte/-/svelte-3.0.0.tgz",
+      "integrity": "sha512-pYrtLtOwku/7r1i9AMONsJMVYAtk3hzOfiGNekhtq5tYBGA7unMve8RvUclKLMT3PrihvJqUmzsRGh0RP84hKg==",
       "dev": true
     },
     "@types/bn.js": {
diff --git a/package.json b/package.json
index 6887b3c85..4d2ba09f3 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
     "@cypress/code-coverage": "^3.10.0",
     "@rsksmart/mock-web3-provider": "^1.0.1",
     "@sveltejs/vite-plugin-svelte": "^1.0.1",
-    "@tsconfig/svelte": "^1.0.13",
+    "@tsconfig/svelte": "^3.0.0",
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/express-serve-static-core": "^4.17.30",
     "@types/lodash": "^4.14.184",
diff --git a/src/Review.svelte b/src/Review.svelte
index f6429655f..3ce5ee171 100644
--- a/src/Review.svelte
+++ b/src/Review.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import { onMount } from "svelte";
   import type { Config } from "@app/config";
-  import { formatVerdict, Review } from "@app/patch";
+  import type { Review } from "@app/patch";
+  import { formatVerdict } from "@app/patch";
   import type { Blob } from "@app/project";
   import { Profile, ProfileType } from "@app/profile";
   import Authorship from "@app/Authorship.svelte";
diff --git a/src/base/faucet/Withdraw.svelte b/src/base/faucet/Withdraw.svelte
index ec842b078..cae92d89b 100644
--- a/src/base/faucet/Withdraw.svelte
+++ b/src/base/faucet/Withdraw.svelte
@@ -5,7 +5,8 @@
   import Loading from "@app/Loading.svelte";
   import Modal from "@app/Modal.svelte";
   import Err from "@app/Error.svelte";
-  import { Status, State } from "@app/utils";
+  import type { State } from "@app/utils";
+  import { Status } from "@app/utils";
   import { withdraw } from "./lib";
   import { session } from "@app/session";
   import Button from "@app/Button.svelte";
diff --git a/src/base/home/Index.svelte b/src/base/home/Index.svelte
index 518981342..2b053512d 100644
--- a/src/base/home/Index.svelte
+++ b/src/base/home/Index.svelte
@@ -3,7 +3,8 @@
   import type { Config } from "@app/config";
   import Loading from "@app/Loading.svelte";
   import Widget from "@app/base/projects/Widget.svelte";
-  import { Project, ProjectInfo } from "@app/project";
+  import type { ProjectInfo } from "@app/project";
+  import { Project } from "@app/project";
   import type { Host } from "@app/api";
   import * as proj from "@app/project";
   import Message from "@app/Message.svelte";
diff --git a/src/base/projects/BranchSelector.svelte b/src/base/projects/BranchSelector.svelte
index ec1954919..07c8dabaa 100644
--- a/src/base/projects/BranchSelector.svelte
+++ b/src/base/projects/BranchSelector.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
   import { createEventDispatcher } from "svelte";
-  import { ProjectInfo, Branches, getOid } from "@app/project";
+  import type { ProjectInfo, Branches } from "@app/project";
+  import { getOid } from "@app/project";
   import { formatCommit } from "@app/utils";
   import Dropdown from "@app/Dropdown.svelte";
   import Floating from "@app/Floating.svelte";
diff --git a/src/base/projects/Header.svelte b/src/base/projects/Header.svelte
index ed2e7aac4..136263625 100644
--- a/src/base/projects/Header.svelte
+++ b/src/base/projects/Header.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import type { Writable } from "svelte/store";
   import { navigate } from "svelte-routing";
-  import { Browser, ProjectContent, Project } from "@app/project";
+  import type { Browser } from "@app/project";
+  import { ProjectContent, Project } from "@app/project";
   import BranchSelector from "@app/base/projects/BranchSelector.svelte";
   import CloneButton from "@app/base/projects/CloneButton.svelte";
   import PeerSelector from "@app/base/projects/PeerSelector.svelte";
diff --git a/src/base/projects/History.svelte b/src/base/projects/History.svelte
index d33cf3262..41d017570 100644
--- a/src/base/projects/History.svelte
+++ b/src/base/projects/History.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import CommitTeaser from "./Commit/CommitTeaser.svelte";
   import { Project, ProjectContent } from "@app/project";
-  import { CommitMetadata, CommitsHistory, groupCommits } from "@app/commit";
+  import type { CommitMetadata, CommitsHistory } from "@app/commit";
+  import { groupCommits } from "@app/commit";
   import List from "@app/List.svelte";
 
   export let project: Project;
diff --git a/src/base/projects/Patch/PatchTabBar.svelte b/src/base/projects/Patch/PatchTabBar.svelte
index 04530b353..a9d9374c8 100644
--- a/src/base/projects/Patch/PatchTabBar.svelte
+++ b/src/base/projects/Patch/PatchTabBar.svelte
@@ -5,7 +5,8 @@
   import Floating from "@app/Floating.svelte";
   import ToggleButton from "@app/ToggleButton.svelte";
 
-  import { PatchTab, Revision } from "@app/patch";
+  import type { Revision } from "@app/patch";
+  import { PatchTab } from "@app/patch";
   import { formatCommit, formatTimestamp } from "@app/utils";
   import { createEventDispatcher } from "svelte";
 
diff --git a/src/base/registrations/Update.svelte b/src/base/registrations/Update.svelte
index 0f49e5c7f..cfbbbb170 100644
--- a/src/base/registrations/Update.svelte
+++ b/src/base/registrations/Update.svelte
@@ -6,7 +6,8 @@
   import type { Config } from "@app/config";
   import Loading from "@app/Loading.svelte";
   import Modal from "@app/Modal.svelte";
-  import { Status, State } from "@app/utils";
+  import type { State } from "@app/utils";
+  import { Status } from "@app/utils";
   import Button from "@app/Button.svelte";
 
   export let domain: string;
diff --git a/src/patch.ts b/src/patch.ts
index 8c40ec0f5..74115972a 100644
--- a/src/patch.ts
+++ b/src/patch.ts
@@ -1,5 +1,6 @@
 import type { PeerId, Urn } from "@app/project";
-import { Host, Request } from "@app/api";
+import type { Host } from "@app/api";
+import { Request } from "@app/api";
 import type { Comment, Thread } from "@app/issue";
 import type { Author, PeerInfo } from "@app/cobs";
 import type { Diff } from "@app/diff";
diff --git a/src/utils.ts b/src/utils.ts
index 3a869ffa5..e993c3cbd 100644
--- a/src/utils.ts
+++ b/src/utils.ts
@@ -4,19 +4,14 @@ import md5 from "md5";
 import { BigNumber } from "ethers";
 import multibase from "multibase";
 import multihashes from "multihashes";
-import EthersSafe, {
-  EthersAdapter,
-  TransactionResult,
-} from "@gnosis.pm/safe-core-sdk";
+import type { TransactionResult } from "@gnosis.pm/safe-core-sdk";
+import EthersSafe, { EthersAdapter } from "@gnosis.pm/safe-core-sdk";
 import type { SafeSignature } from "@gnosis.pm/safe-core-sdk-types";
 import type { Config } from "@app/config";
 import config from "@app/config.json";
 import { assert } from "@app/error";
-import {
-  EnsProfile,
-  getAddress,
-  getResolver,
-} from "@app/base/registrations/registrar";
+import type { EnsProfile } from "@app/base/registrations/registrar";
+import { getAddress, getResolver } from "@app/base/registrations/registrar";
 import {
   getAvatar,
   getSeed,