diff --git a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt
index b9d3f54dc..59a43c1a5 100644
--- a/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt
+++ b/AndroidCompat/Config/src/main/java/xyz/nulldev/ts/config/ConfigManager.kt
@@ -1,5 +1,12 @@
 package xyz.nulldev.ts.config
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import com.typesafe.config.Config
 import com.typesafe.config.ConfigFactory
 import com.typesafe.config.ConfigRenderOptions
diff --git a/AndroidCompat/getAndroid.ps1 b/AndroidCompat/getAndroid.ps1
index ca743ecca..45d2a9e81 100644
--- a/AndroidCompat/getAndroid.ps1
+++ b/AndroidCompat/getAndroid.ps1
@@ -1,4 +1,10 @@
-# This is a windows only powershell script to create android.jar stubs
+# Copyright (C) Contributors to the Suwayomi project
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+# This is a windows only PowerShell script to create android.jar stubs
 
 # foolproof against running from AndroidCompat dir instead of running from project root
 if ($(Split-Path -Path (Get-Location) -Leaf) -eq "AndroidCompat" ) {
diff --git a/AndroidCompat/getAndroid.sh b/AndroidCompat/getAndroid.sh
index 2eef7cbe1..78b7b52f9 100755
--- a/AndroidCompat/getAndroid.sh
+++ b/AndroidCompat/getAndroid.sh
@@ -1,4 +1,11 @@
 #!/usr/bin/env bash
+
+# Copyright (C) Contributors to the Suwayomi project
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 # This is a bash script to create android.jar stubs
 
 # foolproof against running from AndroidCompat dir instead of running from project root
diff --git a/README.md b/README.md
index c35a670ab..35d40927e 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ Changes to both codebases is licensed under `MPL v. 2.0` as the rest of this pro
 
 ## License
 
-    Copyright (C) 2020-2021 Aria Moradi and contributors
+    Copyright (C) Contributors to the Suwayomi project
 
     This Source Code Form is subject to the terms of the Mozilla Public
     License, v. 2.0. If a copy of the MPL was not distributed with this
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/App.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/App.kt
index 8366e24f1..86ad19557 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/App.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/App.kt
@@ -1,5 +1,12 @@
 package eu.kanade.tachiyomi
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import android.app.Application
 import android.content.Context
 // import android.content.res.Configuration
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt
index ffeacbdaa..60a17ac46 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/AppModule.kt
@@ -1,5 +1,12 @@
 package eu.kanade.tachiyomi
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import android.app.Application
 import com.google.gson.Gson
 // import eu.kanade.tachiyomi.data.cache.ChapterCache
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
index a6c3b1fa3..f96e9aca2 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/extension/api/ExtensionGithubApi.kt
@@ -1,5 +1,12 @@
 package eu.kanade.tachiyomi.extension.api
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 // import android.content.Context
 // import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.extension.model.Extension
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt
index 92c4f68cf..4cff8989a 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/extension/util/ExtensionLoader.kt
@@ -1,5 +1,12 @@
 package eu.kanade.tachiyomi.extension.util
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 // import android.annotation.SuppressLint
 // import android.content.Context
 // import android.content.pm.PackageInfo
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
index d52f74695..beb976118 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/CloudflareInterceptor.kt
@@ -1,5 +1,12 @@
 package eu.kanade.tachiyomi.network
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 // import android.annotation.SuppressLint
 // import android.content.Context
 // import android.os.Build
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt
index 100c66e6c..89c402ffe 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/MemoryCookieJar.kt
@@ -1,5 +1,12 @@
 package eu.kanade.tachiyomi.network
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import okhttp3.Cookie
 import okhttp3.CookieJar
 import okhttp3.HttpUrl
diff --git a/server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt b/server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
index dbf87cc8f..ca1182606 100644
--- a/server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
+++ b/server/src/main/kotlin/eu/kanade/tachiyomi/network/NetworkHelper.kt
@@ -1,5 +1,12 @@
 package eu.kanade.tachiyomi.network
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 // import android.content.Context
 // import eu.kanade.tachiyomi.BuildConfig
 // import eu.kanade.tachiyomi.data.preference.PreferencesHelper
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/Main.kt b/server/src/main/kotlin/ir/armor/tachidesk/Main.kt
index 64cb9cfbe..8ef887830 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/Main.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/Main.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/ServerConfig.kt b/server/src/main/kotlin/ir/armor/tachidesk/ServerConfig.kt
index 26dc6ec0b..96d34a6c5 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/ServerConfig.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/ServerConfig.kt
@@ -1,5 +1,12 @@
 package ir.armor.tachidesk
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import com.typesafe.config.Config
 import xyz.nulldev.ts.config.ConfigModule
 import java.io.File
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/ServerSetup.kt b/server/src/main/kotlin/ir/armor/tachidesk/ServerSetup.kt
index d2ea04c9e..a54dafbee 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/ServerSetup.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/ServerSetup.kt
@@ -1,5 +1,12 @@
 package ir.armor.tachidesk
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import eu.kanade.tachiyomi.App
 import ir.armor.tachidesk.database.makeDataBaseTables
 import ir.armor.tachidesk.util.systemTray
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/DBMangaer.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/DBMangaer.kt
index 8f1619729..887320495 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/DBMangaer.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/DBMangaer.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/CategoryDataClass.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/CategoryDataClass.kt
index 81e0a87a0..250d01371 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/CategoryDataClass.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/CategoryDataClass.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.dataclass
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ChapterDataClass.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ChapterDataClass.kt
index 8b59a03ad..d0fdf9d0b 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ChapterDataClass.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ChapterDataClass.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.dataclass
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ExtensionDataClass.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ExtensionDataClass.kt
index c8eac3af6..8df7f7694 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ExtensionDataClass.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/ExtensionDataClass.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.dataclass
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/MangaDataClass.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/MangaDataClass.kt
index e7e81f090..dffe8eea0 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/MangaDataClass.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/MangaDataClass.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.dataclass
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/PageDataClass.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/PageDataClass.kt
index 6b3401a0f..0d58d5d59 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/PageDataClass.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/PageDataClass.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.dataclass
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/SourceDataClass.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/SourceDataClass.kt
index 53a02ca93..2d6990afe 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/SourceDataClass.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/dataclass/SourceDataClass.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.dataclass
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/entity/ExtensionEntity.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/entity/ExtensionEntity.kt
index 9ef2f3357..06a5f8d21 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/entity/ExtensionEntity.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/entity/ExtensionEntity.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.entity
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/entity/MangaEntity.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/entity/MangaEntity.kt
index 51a18af0c..7890c6d2f 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/entity/MangaEntity.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/entity/MangaEntity.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.entity
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/entity/SourceEntity.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/entity/SourceEntity.kt
index 460c00378..b516ed130 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/entity/SourceEntity.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/entity/SourceEntity.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.entity
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/table/CategoryMangaTable.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/table/CategoryMangaTable.kt
index dee38f24f..1e1e9c9c1 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/table/CategoryMangaTable.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/table/CategoryMangaTable.kt
@@ -1,10 +1,14 @@
 package ir.armor.tachidesk.database.table
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import org.jetbrains.exposed.dao.id.IntIdTable
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 object CategoryMangaTable : IntIdTable() {
     val category = reference("category", CategoryTable)
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/table/CategoryTable.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/table/CategoryTable.kt
index d645c928b..6f9c1c649 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/table/CategoryTable.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/table/CategoryTable.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.table
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/table/ChapterTable.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/table/ChapterTable.kt
index bc4e8fd19..8ecf6ae4e 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/table/ChapterTable.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/table/ChapterTable.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.table
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/table/ExtensionTable.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/table/ExtensionTable.kt
index c044c60e8..b9b735161 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/table/ExtensionTable.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/table/ExtensionTable.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.table
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/table/MangaTable.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/table/MangaTable.kt
index 1312aac9b..9f454b6e2 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/table/MangaTable.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/table/MangaTable.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.table
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/table/PageTable.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/table/PageTable.kt
index 35ab8a00e..c56816b1b 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/table/PageTable.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/table/PageTable.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.table
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/database/table/SourceTable.kt b/server/src/main/kotlin/ir/armor/tachidesk/database/table/SourceTable.kt
index 25f54d43e..4af6cc5cc 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/database/table/SourceTable.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/database/table/SourceTable.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.database.table
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/java/ir/armor/tachidesk/APKExtractor.java b/server/src/main/kotlin/ir/armor/tachidesk/util/APKExtractor.java
similarity index 98%
rename from server/src/main/java/ir/armor/tachidesk/APKExtractor.java
rename to server/src/main/kotlin/ir/armor/tachidesk/util/APKExtractor.java
index 99fb8e4ba..2f8e7f986 100644
--- a/server/src/main/java/ir/armor/tachidesk/APKExtractor.java
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/APKExtractor.java
@@ -1,6 +1,9 @@
-package ir.armor.tachidesk;
+package ir.armor.tachidesk.util;
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
@@ -16,7 +19,6 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
-import java.util.zip.ZipInputStream;
 
 public class APKExtractor {
     // decompressXML -- Parse the 'compressed' binary form of Android XML docs
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Category.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Category.kt
index ae851b521..0bf01194a 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Category.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Category.kt
@@ -1,5 +1,12 @@
 package ir.armor.tachidesk.util
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.database.dataclass.CategoryDataClass
 import ir.armor.tachidesk.database.table.CategoryMangaTable
 import ir.armor.tachidesk.database.table.CategoryTable
@@ -12,10 +19,6 @@ import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 fun createCategory(name: String) {
     transaction {
         val count = CategoryTable.selectAll().count()
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/CategoryManga.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/CategoryManga.kt
index 01a47163a..440f890c1 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/CategoryManga.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/CategoryManga.kt
@@ -1,5 +1,12 @@
 package ir.armor.tachidesk.util
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.database.dataclass.CategoryDataClass
 import ir.armor.tachidesk.database.dataclass.MangaDataClass
 import ir.armor.tachidesk.database.table.CategoryMangaTable
@@ -14,10 +21,6 @@ import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
-
 fun addMangaToCategory(mangaId: Int, categoryId: Int) {
     transaction {
         if (CategoryMangaTable.select { (CategoryMangaTable.category eq categoryId) and (CategoryMangaTable.manga eq mangaId) }.firstOrNull() == null) {
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Chapter.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Chapter.kt
index 4cae70338..92d9562ac 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Chapter.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Chapter.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Extension.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Extension.kt
index 44d5a421d..eb73758fa 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Extension.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Extension.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
@@ -12,7 +15,6 @@ import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.NetworkHelper
 import eu.kanade.tachiyomi.source.SourceFactory
 import eu.kanade.tachiyomi.source.online.HttpSource
-import ir.armor.tachidesk.APKExtractor
 import ir.armor.tachidesk.applicationDirs
 import ir.armor.tachidesk.database.table.ExtensionTable
 import ir.armor.tachidesk.database.table.SourceTable
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/ExtensionsList.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/ExtensionsList.kt
index 22dbef524..cb30be6bc 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/ExtensionsList.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/ExtensionsList.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/File.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/File.kt
index f37304acf..c48de687c 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/File.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/File.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Library.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Library.kt
index b37ca2da5..e2e4a7235 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Library.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Library.kt
@@ -1,5 +1,12 @@
 package ir.armor.tachidesk.util
 
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 import ir.armor.tachidesk.database.dataclass.MangaDataClass
 import ir.armor.tachidesk.database.table.CategoryMangaTable
 import ir.armor.tachidesk.database.table.MangaTable
@@ -11,9 +18,6 @@ import org.jetbrains.exposed.sql.select
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 fun addMangaToLibrary(mangaId: Int) {
     val manga = getManga(mangaId)
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt
index 85daf78b5..51ebfc2e1 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Manga.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/MangaDexHelper.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/MangaDexHelper.kt
index f8115ecb2..687a408fe 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/MangaDexHelper.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/MangaDexHelper.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/MangaList.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/MangaList.kt
index 2a7ffe0e0..e0b4c3dc8 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/MangaList.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/MangaList.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Page.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Page.kt
index eb2cc984d..3f2312e84 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Page.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Page.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Search.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Search.kt
index 69b7b2086..6670b619d 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Search.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Search.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt
index e7105dc16..e78ee49cf 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/SourceList.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/server/src/main/kotlin/ir/armor/tachidesk/util/Util.kt b/server/src/main/kotlin/ir/armor/tachidesk/util/Util.kt
index 0e6203724..ad7acae3f 100644
--- a/server/src/main/kotlin/ir/armor/tachidesk/util/Util.kt
+++ b/server/src/main/kotlin/ir/armor/tachidesk/util/Util.kt
@@ -1,6 +1,9 @@
 package ir.armor.tachidesk.util
 
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/App.tsx b/webUI/react/src/App.tsx
index c4ce248e8..3cbaa05b5 100644
--- a/webUI/react/src/App.tsx
+++ b/webUI/react/src/App.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/CategorySelect.tsx b/webUI/react/src/components/CategorySelect.tsx
index 2e31893a7..166a858bc 100644
--- a/webUI/react/src/components/CategorySelect.tsx
+++ b/webUI/react/src/components/CategorySelect.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/ChapterCard.tsx b/webUI/react/src/components/ChapterCard.tsx
index 0aa65e9dd..75213866e 100644
--- a/webUI/react/src/components/ChapterCard.tsx
+++ b/webUI/react/src/components/ChapterCard.tsx
@@ -1,5 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/ExtensionCard.tsx b/webUI/react/src/components/ExtensionCard.tsx
index 245075a9f..e44afa0eb 100644
--- a/webUI/react/src/components/ExtensionCard.tsx
+++ b/webUI/react/src/components/ExtensionCard.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/ExtensionLangSelect.tsx b/webUI/react/src/components/ExtensionLangSelect.tsx
index c5e65c7ab..95382acae 100644
--- a/webUI/react/src/components/ExtensionLangSelect.tsx
+++ b/webUI/react/src/components/ExtensionLangSelect.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/MangaCard.tsx b/webUI/react/src/components/MangaCard.tsx
index 734001147..82220ec9d 100644
--- a/webUI/react/src/components/MangaCard.tsx
+++ b/webUI/react/src/components/MangaCard.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/MangaDetails.tsx b/webUI/react/src/components/MangaDetails.tsx
index 45c4e528b..517745fed 100644
--- a/webUI/react/src/components/MangaDetails.tsx
+++ b/webUI/react/src/components/MangaDetails.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/MangaGrid.tsx b/webUI/react/src/components/MangaGrid.tsx
index a08e6e3dc..2af00d474 100644
--- a/webUI/react/src/components/MangaGrid.tsx
+++ b/webUI/react/src/components/MangaGrid.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/NavBar.tsx b/webUI/react/src/components/NavBar.tsx
index 702dedbe4..87f09abb7 100644
--- a/webUI/react/src/components/NavBar.tsx
+++ b/webUI/react/src/components/NavBar.tsx
@@ -1,5 +1,7 @@
-// TODO: remove above!
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/Page.tsx b/webUI/react/src/components/Page.tsx
index c738a060a..58350d306 100644
--- a/webUI/react/src/components/Page.tsx
+++ b/webUI/react/src/components/Page.tsx
@@ -1,6 +1,9 @@
 /* eslint-disable react/no-unused-prop-types */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/ReaderNavBar.tsx b/webUI/react/src/components/ReaderNavBar.tsx
index def80dcd2..654c83cc8 100644
--- a/webUI/react/src/components/ReaderNavBar.tsx
+++ b/webUI/react/src/components/ReaderNavBar.tsx
@@ -1,5 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/SourceCard.tsx b/webUI/react/src/components/SourceCard.tsx
index bd71d08de..e1562fed1 100644
--- a/webUI/react/src/components/SourceCard.tsx
+++ b/webUI/react/src/components/SourceCard.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/components/TemporaryDrawer.tsx b/webUI/react/src/components/TemporaryDrawer.tsx
index c486588b5..86b8f7b8b 100644
--- a/webUI/react/src/components/TemporaryDrawer.tsx
+++ b/webUI/react/src/components/TemporaryDrawer.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/context/DarkTheme.tsx b/webUI/react/src/context/DarkTheme.tsx
index 313bb0de4..011762c1b 100644
--- a/webUI/react/src/context/DarkTheme.tsx
+++ b/webUI/react/src/context/DarkTheme.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/context/NavbarContext.tsx b/webUI/react/src/context/NavbarContext.tsx
index b4d80c2d7..c59b5b512 100644
--- a/webUI/react/src/context/NavbarContext.tsx
+++ b/webUI/react/src/context/NavbarContext.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/index.css b/webUI/react/src/index.css
index e78bdd204..3c9044adf 100644
--- a/webUI/react/src/index.css
+++ b/webUI/react/src/index.css
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ * 
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/index.tsx b/webUI/react/src/index.tsx
index c10d98b90..c3f91a373 100644
--- a/webUI/react/src/index.tsx
+++ b/webUI/react/src/index.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/react-app-env.d.ts b/webUI/react/src/react-app-env.d.ts
index b74f6f93f..87b106f79 100644
--- a/webUI/react/src/react-app-env.d.ts
+++ b/webUI/react/src/react-app-env.d.ts
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/screens/Extensions.tsx b/webUI/react/src/screens/Extensions.tsx
index 4eb6244c6..9e6124b4e 100644
--- a/webUI/react/src/screens/Extensions.tsx
+++ b/webUI/react/src/screens/Extensions.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/screens/Library.tsx b/webUI/react/src/screens/Library.tsx
index 814032fff..f14206bbe 100644
--- a/webUI/react/src/screens/Library.tsx
+++ b/webUI/react/src/screens/Library.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/screens/Manga.tsx b/webUI/react/src/screens/Manga.tsx
index a5ff2f669..ea05f0ef7 100644
--- a/webUI/react/src/screens/Manga.tsx
+++ b/webUI/react/src/screens/Manga.tsx
@@ -1,5 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/screens/Reader.tsx b/webUI/react/src/screens/Reader.tsx
index 2c0a2d45a..5a787bacf 100644
--- a/webUI/react/src/screens/Reader.tsx
+++ b/webUI/react/src/screens/Reader.tsx
@@ -1,5 +1,8 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/screens/SearchSingle.tsx b/webUI/react/src/screens/SearchSingle.tsx
index c23ac48de..06a5a6d44 100644
--- a/webUI/react/src/screens/SearchSingle.tsx
+++ b/webUI/react/src/screens/SearchSingle.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/screens/Settings.tsx b/webUI/react/src/screens/Settings.tsx
index 529bf6822..d1b6d67c8 100644
--- a/webUI/react/src/screens/Settings.tsx
+++ b/webUI/react/src/screens/Settings.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/screens/SourceMangas.tsx b/webUI/react/src/screens/SourceMangas.tsx
index 15868e1f3..e0f438169 100644
--- a/webUI/react/src/screens/SourceMangas.tsx
+++ b/webUI/react/src/screens/SourceMangas.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/screens/Sources.tsx b/webUI/react/src/screens/Sources.tsx
index 0c68f2175..7b37b2518 100644
--- a/webUI/react/src/screens/Sources.tsx
+++ b/webUI/react/src/screens/Sources.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/screens/settings/Categories.jsx b/webUI/react/src/screens/settings/Categories.jsx
index 8ac1d98f1..1e0d2bd24 100644
--- a/webUI/react/src/screens/settings/Categories.jsx
+++ b/webUI/react/src/screens/settings/Categories.jsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/typings.d.ts b/webUI/react/src/typings.d.ts
index 9de79607c..018165cce 100644
--- a/webUI/react/src/typings.d.ts
+++ b/webUI/react/src/typings.d.ts
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/util/client.tsx b/webUI/react/src/util/client.tsx
index 1f69400d0..024d1aeaf 100644
--- a/webUI/react/src/util/client.tsx
+++ b/webUI/react/src/util/client.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/util/language.tsx b/webUI/react/src/util/language.tsx
index b6c2fb803..920f6c9a6 100644
--- a/webUI/react/src/util/language.tsx
+++ b/webUI/react/src/util/language.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/util/localStorage.tsx b/webUI/react/src/util/localStorage.tsx
index bdb836b3f..1861a5a01 100644
--- a/webUI/react/src/util/localStorage.tsx
+++ b/webUI/react/src/util/localStorage.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
diff --git a/webUI/react/src/util/useLocalStorage.tsx b/webUI/react/src/util/useLocalStorage.tsx
index 119f73f1f..83392830b 100644
--- a/webUI/react/src/util/useLocalStorage.tsx
+++ b/webUI/react/src/util/useLocalStorage.tsx
@@ -1,4 +1,7 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
+/*
+ * Copyright (C) Contributors to the Suwayomi project
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */