diff --git a/modules/backend/src/main/scala/docspell/backend/ops/OClientSettings.scala b/modules/backend/src/main/scala/docspell/backend/ops/OClientSettings.scala
index 16b653a1..4d2d71a2 100644
--- a/modules/backend/src/main/scala/docspell/backend/ops/OClientSettings.scala
+++ b/modules/backend/src/main/scala/docspell/backend/ops/OClientSettings.scala
@@ -13,11 +13,11 @@ import cats.implicits._
 import docspell.common.AccountId
 import docspell.common._
 import docspell.store.Store
+import docspell.store.records.RClientSettingsCollective
 import docspell.store.records.RClientSettingsUser
 import docspell.store.records.RUser
 
 import io.circe.Json
-import docspell.store.records.RClientSettingsCollective
 
 trait OClientSettings[F[_]] {
 
diff --git a/modules/backend/src/main/scala/docspell/backend/ops/OQueryBookmarks.scala b/modules/backend/src/main/scala/docspell/backend/ops/OQueryBookmarks.scala
index 134b0d46..72ec9de8 100644
--- a/modules/backend/src/main/scala/docspell/backend/ops/OQueryBookmarks.scala
+++ b/modules/backend/src/main/scala/docspell/backend/ops/OQueryBookmarks.scala
@@ -1,13 +1,20 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.backend.ops
 
+import cats.effect._
+import cats.implicits._
+
 import docspell.common._
 import docspell.query.ItemQuery
-import cats.effect._
-import docspell.store.Store
-import docspell.store.records.RQueryBookmark
-import cats.implicits._
-import docspell.store.UpdateResult
 import docspell.store.AddResult
+import docspell.store.Store
+import docspell.store.UpdateResult
+import docspell.store.records.RQueryBookmark
 
 trait OQueryBookmarks[F[_]] {
 
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/BookmarkRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/BookmarkRoutes.scala
index 24b6eb05..744c7370 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/BookmarkRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/BookmarkRoutes.scala
@@ -1,17 +1,25 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.restserver.routes
 
+import cats.effect.Async
+import cats.implicits._
+
+import docspell.backend.BackendApp
 import docspell.backend.auth.AuthToken
+import docspell.backend.ops.OQueryBookmarks
+import docspell.common.Ident
+import docspell.restapi.model.BookmarkedQuery
+import docspell.restserver.conv.Conversions
+
 import org.http4s.HttpRoutes
 import org.http4s.circe.CirceEntityDecoder._
 import org.http4s.circe.CirceEntityEncoder._
 import org.http4s.dsl.Http4sDsl
-import cats.effect.Async
-import docspell.backend.ops.OQueryBookmarks
-import docspell.restapi.model.BookmarkedQuery
-import docspell.backend.BackendApp
-import cats.implicits._
-import docspell.restserver.conv.Conversions
-import docspell.common.Ident
 
 object BookmarkRoutes {
 
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ClientSettingsRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ClientSettingsRoutes.scala
index 278b8154..aef0b386 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/ClientSettingsRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ClientSettingsRoutes.scala
@@ -8,6 +8,7 @@ package docspell.restserver.routes
 
 import cats.effect._
 import cats.implicits._
+import cats.kernel.Semigroup
 
 import docspell.backend.BackendApp
 import docspell.backend.auth.AuthToken
@@ -19,7 +20,6 @@ import org.http4s.HttpRoutes
 import org.http4s.circe.CirceEntityDecoder._
 import org.http4s.circe.CirceEntityEncoder._
 import org.http4s.dsl.Http4sDsl
-import cats.kernel.Semigroup
 
 object ClientSettingsRoutes {
 
diff --git a/modules/store/src/main/scala/docspell/store/records/RQueryBookmark.scala b/modules/store/src/main/scala/docspell/store/records/RQueryBookmark.scala
index 1a486db3..5dbf34a5 100644
--- a/modules/store/src/main/scala/docspell/store/records/RQueryBookmark.scala
+++ b/modules/store/src/main/scala/docspell/store/records/RQueryBookmark.scala
@@ -1,5 +1,14 @@
+/*
+ * Copyright 2020 Eike K. & Contributors
+ *
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
 package docspell.store.records
 
+import cats.data.NonEmptyList
+import cats.syntax.option._
+
 import docspell.common._
 import docspell.query.ItemQuery
 import docspell.store.qb.DSL._
@@ -7,8 +16,6 @@ import docspell.store.qb._
 
 import doobie._
 import doobie.implicits._
-import cats.data.NonEmptyList
-import cats.syntax.option._
 
 final case class RQueryBookmark(
     id: Ident,
@@ -52,8 +59,8 @@ object RQueryBookmark {
       account: AccountId,
       name: String,
       label: Option[String],
-    query: ItemQuery,
-    personal: Boolean
+      query: ItemQuery,
+      personal: Boolean
   ): ConnectionIO[RQueryBookmark] =
     for {
       userId <- RUser.getIdByAccount(account)
diff --git a/modules/store/src/main/scala/docspell/store/records/RUser.scala b/modules/store/src/main/scala/docspell/store/records/RUser.scala
index 9ddd9467..c100f19d 100644
--- a/modules/store/src/main/scala/docspell/store/records/RUser.scala
+++ b/modules/store/src/main/scala/docspell/store/records/RUser.scala
@@ -7,6 +7,8 @@
 package docspell.store.records
 
 import cats.data.NonEmptyList
+import cats.data.OptionT
+import cats.effect.Sync
 
 import docspell.common._
 import docspell.store.qb.DSL._
@@ -14,8 +16,6 @@ import docspell.store.qb._
 
 import doobie._
 import doobie.implicits._
-import cats.data.OptionT
-import cats.effect.Sync
 
 case class RUser(
     uid: Ident,
diff --git a/modules/webapp/src/main/elm/Comp/BookmarkChooser.elm b/modules/webapp/src/main/elm/Comp/BookmarkChooser.elm
index 64fb0044..d888a65d 100644
--- a/modules/webapp/src/main/elm/Comp/BookmarkChooser.elm
+++ b/modules/webapp/src/main/elm/Comp/BookmarkChooser.elm
@@ -1,3 +1,10 @@
+{-
+   Copyright 2020 Eike K. & Contributors
+
+   SPDX-License-Identifier: AGPL-3.0-or-later
+-}
+
+
 module Comp.BookmarkChooser exposing
     ( Model
     , Msg
diff --git a/modules/webapp/src/main/elm/Comp/BookmarkQueryManage.elm b/modules/webapp/src/main/elm/Comp/BookmarkQueryManage.elm
index 1661f8b9..deec76c4 100644
--- a/modules/webapp/src/main/elm/Comp/BookmarkQueryManage.elm
+++ b/modules/webapp/src/main/elm/Comp/BookmarkQueryManage.elm
@@ -1,3 +1,10 @@
+{-
+   Copyright 2020 Eike K. & Contributors
+
+   SPDX-License-Identifier: AGPL-3.0-or-later
+-}
+
+
 module Comp.BookmarkQueryManage exposing (..)
 
 import Api
diff --git a/modules/webapp/src/main/elm/Data/Bookmarks.elm b/modules/webapp/src/main/elm/Data/Bookmarks.elm
index a1fdb08f..e9c83c5c 100644
--- a/modules/webapp/src/main/elm/Data/Bookmarks.elm
+++ b/modules/webapp/src/main/elm/Data/Bookmarks.elm
@@ -1,3 +1,10 @@
+{-
+   Copyright 2020 Eike K. & Contributors
+
+   SPDX-License-Identifier: AGPL-3.0-or-later
+-}
+
+
 module Data.Bookmarks exposing
     ( AllBookmarks
     , Bookmarks