diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 125628410..723fff50b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -14,6 +14,7 @@
             <option value="$PROJECT_DIR$/app" />
             <option value="$PROJECT_DIR$/autofill-parser" />
             <option value="$PROJECT_DIR$/buildSrc" />
+            <option value="$PROJECT_DIR$/format-common" />
             <option value="$PROJECT_DIR$/openpgp-ktx" />
           </set>
         </option>
diff --git a/.idea/kotlinScripting.xml b/.idea/kotlinScripting.xml
new file mode 100644
index 000000000..bc444dead
--- /dev/null
+++ b/.idea/kotlinScripting.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinScriptingSettings">
+    <option name="suppressDefinitionsCheck" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/format-common/build.gradle.kts b/format-common/build.gradle.kts
new file mode 100644
index 000000000..c1f3eef88
--- /dev/null
+++ b/format-common/build.gradle.kts
@@ -0,0 +1,8 @@
+/*
+ * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+plugins {
+  kotlin("jvm")
+  `aps-plugin`
+}
diff --git a/format-common/src/main/AndroidManifest.xml b/format-common/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..4148bbbb8
--- /dev/null
+++ b/format-common/src/main/AndroidManifest.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
+  ~ SPDX-License-Identifier: GPL-3.0-only
+  -->
+
+<manifest package="dev.msfjarvis.aps.format_common" />
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 9fde0bb1a..d2d24bb5f 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,15 +2,18 @@
  * Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved.
  * SPDX-License-Identifier: GPL-3.0-only
  */
-include(":autofill-parser")
 
+// Modules
 include(":app")
-
+include(":autofill-parser")
+include(":format-common")
 include(":openpgp-ktx")
 
+// Experimental features
 enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS")
 enableFeaturePreview("VERSION_CATALOGS")
 
+// Plugin repositories
 pluginManagement {
   repositories {
     gradlePluginPortal()