diff --git a/.hidev/config.yml b/.hidev/config.yml
index 5c63e82..0bb082f 100644
--- a/.hidev/config.yml
+++ b/.hidev/config.yml
@@ -1,7 +1,7 @@
 package:
     type:           yii2-extension
     name:           yii2-theme-original
-    title:          Original Theme for hiqdev/yii2-thememanager
+    title:          Yii2 Original Theme for hiqdev/yii2-thememanager
     headline:       Yii2 Original Theme
     keywords:       original, theme, extension, yii2
     namespace:      hiqdev\themes\original
diff --git a/.php_cs b/.php_cs
new file mode 100644
index 0000000..19c002c
--- /dev/null
+++ b/.php_cs
@@ -0,0 +1,54 @@
+<?php
+
+$header = <<<EOF
+Yii2 Original Theme for hiqdev/yii2-thememanager
+
+@link      https://github.com/hiqdev/yii2-theme-original
+@package   yii2-theme-original
+@license   BSD-3-Clause
+@copyright Copyright (c) 2016, HiQDev (http://hiqdev.com/)
+EOF;
+
+return PhpCsFixer\Config::create()
+    ->setUsingCache(true)
+    ->setRiskyAllowed(true)
+    ->setRules(array(
+        '@Symfony' => true,
+        'header_comment'                             =>  [
+            'header'        => $header,
+            'separate'      => 'bottom',
+            'location'      => 'after_declare_strict',
+            'commentType'   => 'PHPDoc',
+        ],
+        'binary_operator_spaces'                     =>  [
+            'align_double_arrow' => null,
+            'align_equals'       => null,
+        ],
+        'concat_space'                               =>  ['spacing' => 'one'],
+        'array_syntax'                               =>  ['syntax' => 'short'],
+        'empty_return'                               =>  false,
+        'blank_line_before_return'                   =>  false,
+        'phpdoc_align'                               =>  false,
+        'phpdoc_params'                              =>  false,
+        'phpdoc_scalar'                              =>  false,
+        'phpdoc_separation'                          =>  false,
+        'phpdoc_to_comment'                          =>  false,
+        'method_argument_space'                      =>  false,
+        'ereg_to_preg'                               =>  true,
+        'blank_line_after_opening_tag'               =>  true,
+        'single_blank_line_before_namespace'         =>  true,
+        'ordered_imports'                            =>  true,
+        'phpdoc_order'                               =>  true,
+        'pre_increment'                              =>  true,
+        'strict_comparison'                          =>  true,
+        'strict_param'                               =>  true,
+        'no_multiline_whitespace_before_semicolons'  =>  true,
+    ))
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->in(__DIR__)
+            ->notPath('vendor')
+            ->notPath('runtime')
+            ->notPath('web/assets')
+        )
+;
diff --git a/README.md b/README.md
index ff3f635..5522df5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Yii2 Original Theme
 ===================
 
-**Original Theme for hiqdev/yii2-thememanager**
+**Yii2 Original Theme for hiqdev/yii2-thememanager**
 
 [![Latest Stable Version](https://poser.pugx.org/hiqdev/yii2-theme-original/v/stable)](https://packagist.org/packages/hiqdev/yii2-theme-original)
 [![Total Downloads](https://poser.pugx.org/hiqdev/yii2-theme-original/downloads)](https://packagist.org/packages/hiqdev/yii2-theme-original)
diff --git a/composer.json b/composer.json
index d44b4bb..1f9d12c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "hiqdev/yii2-theme-original",
     "type": "yii2-extension",
-    "description": "Original Theme for hiqdev/yii2-thememanager",
+    "description": "Yii2 Original Theme for hiqdev/yii2-thememanager",
     "keywords": [
         "original",
         "theme",
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
new file mode 100644
index 0000000..60413df
--- /dev/null
+++ b/phpunit.xml.dist
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<phpunit backupGlobals="false" backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" syntaxCheck="false" bootstrap="tests/_bootstrap.php">
+    <testsuites>
+        <testsuite name="Unit Test Suite">
+            <directory>./tests/unit/</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">./src/</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Asset.php b/src/Asset.php
index b875b15..6c296ac 100644
--- a/src/Asset.php
+++ b/src/Asset.php
@@ -1,4 +1,12 @@
 <?php
+/**
+ * Yii2 Original Theme for hiqdev/yii2-thememanager
+ *
+ * @link      https://github.com/hiqdev/yii2-theme-original
+ * @package   yii2-theme-original
+ * @license   BSD-3-Clause
+ * @copyright Copyright (c) 2016, HiQDev (http://hiqdev.com/)
+ */
 
 namespace hiqdev\themes\original;
 
@@ -8,12 +16,12 @@
 class Asset extends \yii\web\AssetBundle
 {
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public $sourcePath = '@hiqdev/themes/original/assets';
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public $css = [
         'css/original.css',
@@ -22,7 +30,7 @@ class Asset extends \yii\web\AssetBundle
     public $js = [];
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     public $depends = [
         \yii\web\YiiAsset::class,
diff --git a/src/Theme.php b/src/Theme.php
index f812ee1..dde8fc7 100644
--- a/src/Theme.php
+++ b/src/Theme.php
@@ -1,9 +1,15 @@
 <?php
+/**
+ * Yii2 Original Theme for hiqdev/yii2-thememanager
+ *
+ * @link      https://github.com/hiqdev/yii2-theme-original
+ * @package   yii2-theme-original
+ * @license   BSD-3-Clause
+ * @copyright Copyright (c) 2016, HiQDev (http://hiqdev.com/)
+ */
 
 namespace hiqdev\themes\original;
 
-use Yii;
-
 /**
  * Theme class.
  */
diff --git a/src/config/hisite.php b/src/config/hisite.php
index 806085b..c00e64c 100644
--- a/src/config/hisite.php
+++ b/src/config/hisite.php
@@ -1,12 +1,11 @@
 <?php
-
-/*
- * Original Theme for hiqdev/yii2-thememanager
+/**
+ * Yii2 Original Theme for hiqdev/yii2-thememanager
  *
  * @link      https://github.com/hiqdev/yii2-theme-original
  * @package   yii2-theme-original
  * @license   BSD-3-Clause
- * @copyright Copyright (c) 2015-2016, HiQDev (http://hiqdev.com/)
+ * @copyright Copyright (c) 2016, HiQDev (http://hiqdev.com/)
  */
 
 return [
diff --git a/src/views/site/login.php b/src/views/site/login.php
index 498f46f..15b9689 100644
--- a/src/views/site/login.php
+++ b/src/views/site/login.php
@@ -4,8 +4,8 @@
 /* @var $form yii\bootstrap\ActiveForm */
 /* @var $model app\models\LoginForm */
 
-use yii\helpers\Html;
 use yii\bootstrap\ActiveForm;
+use yii\helpers\Html;
 
 $this->title = 'Login';
 $this->params['breadcrumbs'][] = $this->title;
diff --git a/tests/_bootstrap.php b/tests/_bootstrap.php
new file mode 100644
index 0000000..d9ffdf2
--- /dev/null
+++ b/tests/_bootstrap.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Yii2 Original Theme for hiqdev/yii2-thememanager
+ *
+ * @link      https://github.com/hiqdev/yii2-theme-original
+ * @package   yii2-theme-original
+ * @license   BSD-3-Clause
+ * @copyright Copyright (c) 2016, HiQDev (http://hiqdev.com/)
+ */
+
+error_reporting(E_ALL & ~E_NOTICE);
+
+$bootstrap = __DIR__ . '/../src/_bootstrap.php';
+
+require_once file_exists($bootstrap) ? $bootstrap : __DIR__ . '/../vendor/autoload.php';