diff --git a/.gitignore b/.gitignore
index 31fe69a..23a1c33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 node_modules/
 build/appstore/
+*.cache
diff --git a/.php_cs.dist b/.php_cs.dist
new file mode 100644
index 0000000..a43a381
--- /dev/null
+++ b/.php_cs.dist
@@ -0,0 +1,20 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+	->exclude('3rdparty')
+	->exclude('composer')
+	->exclude('3rdparty')
+	->exclude('build')
+	->in(__DIR__);
+
+return PhpCsFixer\Config::create()
+	->setRules([
+		'@PSR2' => true,
+		'array_syntax' => ['syntax' => 'short'],
+		'braces' => ['position_after_functions_and_oop_constructs' => 'same'],
+		'binary_operator_spaces' => ['align_double_arrow' => false, 'align_equals' => false],
+		'align_multiline_comment' => ['comment_type' => 'all_multiline'],
+		'method_argument_space' => ['ensure_fully_multiline' => true]
+	])
+	->setIndent("\t")
+	->setFinder($finder);
diff --git a/appinfo/app.php b/appinfo/app.php
index 008313d..2a9ca9d 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -8,7 +8,7 @@ $app->register();
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
 	'OCA\Files::loadAdditionalScripts',
-	function() {
+	function () {
 		\OC_Util::addScript('groupfolders', 'files');
 	}
 );
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index d52d042..63be49f 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -28,7 +28,6 @@ use OCP\AppFramework\IAppContainer;
 use OCP\Files\NotFoundException;
 
 class Application extends App {
-
 	public function __construct(array $urlParams = []) {
 		parent::__construct('groupfolders', $urlParams);
 
@@ -60,4 +59,3 @@ class Application extends App {
 		$container->getServer()->getMountProviderCollection()->registerProvider($container->query(MountProvider::class));
 	}
 }
-
diff --git a/lib/Controller/FolderController.php b/lib/Controller/FolderController.php
index 0ab3225..ad43f39 100644
--- a/lib/Controller/FolderController.php
+++ b/lib/Controller/FolderController.php
@@ -39,10 +39,11 @@ class FolderController extends Controller {
 	 * @param FolderManager $manager
 	 * @param MountProvider $mountProvider
 	 */
-	public function __construct($AppName,
-								IRequest $request,
-								FolderManager $manager,
-								MountProvider $mountProvider
+	public function __construct(
+		$AppName,
+		IRequest $request,
+		FolderManager $manager,
+		MountProvider $mountProvider
 	) {
 		parent::__construct($AppName, $request);
 		$this->manager = $manager;
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 93ffac9..fe7ccc6 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -31,7 +31,6 @@ class PageController extends Controller {
 	 * @return TemplateResponse
 	 */
 	public function index() {
-
 		$response = new TemplateResponse(
 			$this->appName,
 			'index',
@@ -42,6 +41,4 @@ class PageController extends Controller {
 
 		return $response;
 	}
-
-
 }
diff --git a/lib/Folder/FolderManager.php b/lib/Folder/FolderManager.php
index 6130fe4..1ab7bb3 100644
--- a/lib/Folder/FolderManager.php
+++ b/lib/Folder/FolderManager.php
@@ -92,8 +92,12 @@ class FolderManager {
 
 		$query->select('f.folder_id', 'mount_point', 'permissions', 'quota')
 			->from('group_folders', 'f')
-			->innerJoin('f', 'group_folders_applicable', 'a',
-				$query->expr()->eq('f.folder_id', 'a.folder_id'))
+			->innerJoin(
+				'f',
+				'group_folders_applicable',
+				'a',
+				$query->expr()->eq('f.folder_id', 'a.folder_id')
+			)
 			->where($query->expr()->eq('a.group_id', $query->createNamedParameter($groupId)));
 
 		return $query->execute()->fetchAll();
diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
index 7ca65b2..8b88645 100644
--- a/lib/Settings/Admin.php
+++ b/lib/Settings/Admin.php
@@ -29,10 +29,12 @@ class Admin implements ISettings {
 	 * @return TemplateResponse
 	 */
 	public function getForm() {
-		return new TemplateResponse('groupfolders',
+		return new TemplateResponse(
+			'groupfolders',
 			'index',
 			['appId' => 'groupfolders'],
-			'');
+			''
+		);
 	}
 
 	/**
@@ -52,5 +54,4 @@ class Admin implements ISettings {
 	public function getPriority() {
 		return 90;
 	}
-
 }