diff --git a/.gitignore b/.gitignore
index 7809cb8c8..4d03d8f42 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,8 +25,10 @@ node_modules
 
 # IDE - IntelliJ
 .idea/*
-!.idea/modules.xml
 !.idea/code.iml
+!.idea/gradle.xml
+!.idea/modules.xml
+!.idea/vcs.xml
 
 # misc
 /.sass-cache
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 000000000..bcd9480b8
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+	<component name="GradleMigrationSettings" migrationVersion="1"/>
+	<component name="GradleSettings">
+		<option name="linkedExternalProjectsSettings">
+			<GradleProjectSettings>
+				<option name="externalProjectPath" value="$PROJECT_DIR$/packages/app-lib/java"/>
+				<option name="gradleJvm" value="#JAVA_HOME"/>
+				<option name="modules">
+					<set>
+						<option value="$PROJECT_DIR$/packages/app-lib/java"/>
+					</set>
+				</option>
+			</GradleProjectSettings>
+		</option>
+	</component>
+</project>
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 23968dc67..ecea560ce 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/code.iml" filepath="$PROJECT_DIR$/.idea/code.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
+	<component name="ProjectModuleManager">
+		<modules>
+			<module fileurl="file://$PROJECT_DIR$/.idea/code.iml"
+					filepath="$PROJECT_DIR$/.idea/code.iml"/>
+			<module fileurl="file://$PROJECT_DIR$/.idea/modules/theseus.iml"
+					filepath="$PROJECT_DIR$/.idea/modules/theseus.iml"/>
+			<module fileurl="file://$PROJECT_DIR$/.idea/modules/theseus.main.iml"
+					filepath="$PROJECT_DIR$/.idea/modules/theseus.main.iml"/>
+			<module fileurl="file://$PROJECT_DIR$/.idea/modules/theseus.test.iml"
+					filepath="$PROJECT_DIR$/.idea/modules/theseus.test.iml"/>
+		</modules>
+	</component>
+</project>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 000000000..71bd863ab
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+	<component name="CommitMessageInspectionProfile">
+		<profile version="1.0">
+			<inspection_tool class="CommitFormat" enabled="true" level="WARNING"
+							 enabled_by_default="true"/>
+			<inspection_tool class="CommitNamingConvention" enabled="true" level="WARNING"
+							 enabled_by_default="true"/>
+		</profile>
+	</component>
+	<component name="VcsDirectoryMappings">
+		<mapping directory="" vcs="Git"/>
+	</component>
+</project>