diff --git a/.circleci/config.yml b/.circleci/config.yml
index bfbcb02..a333639 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -94,6 +94,17 @@ jobs:
           paths:
             - css
 
+  commitlint:
+    <<: *defaults
+
+    steps:
+      - attach_workspace:
+          at: .
+
+      - run:
+          name: Lint commit messages
+          command: npx semantic-commitlint -- --ci
+
   lint:
     <<: *defaults
 
@@ -105,10 +116,6 @@ jobs:
           name: Lint styles
           command: npx stylelint -- --fix
 
-      - run:
-          name: Lint commit messages
-          command: npx semantic-commitlint -- --ci
-
   # test:
   #   <<: *defaults
 
@@ -172,22 +179,21 @@ workflows:
       # - coverage:
       #     requires:
       #       - install-dependencies
+      - commitlint:
+          requires:
+            - install-dependencies
       - lint:
           requires:
             - install-dependencies
       - build:
           requires:
             - install-dependencies
-          filters:
-            branches:
-              only:
-                - master
-                - develop
       - release:
           requires:
-            # - test
+            - commitlint
             - build
             - lint
+            # - test
           filters:
             branches:
               only: master
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 564edd0..5476494 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,18 @@
-<!-- 
-  I'm not very good at English. So, I'm glad if you write in English as easy as possible.
-  日本語がわかる方はなるべく日本語でお願いします。
--->
+<!-- Please fill your information below the lines starting with `#`. -->
+<!-- You can delete these lines enclosed by `<` and `>` before posting, too. -->
+
+# Description of the issue
+<!-- What is the issue/problem you are facing? -->
+
+# What was expected to be seen
+<!-- What were you expecting to see? -->
+
+# What actually was seen instead
+<!-- What did you actually see? Try to be precise as possible! -->
+
+# Environment
+Browser: <!-- Version of your browser. -->
+Build environment (i.e. NodeJS): <!-- If you have issues building the SCSS into CSS, add your information here. Delete this otherwise. -->
+
+# Suggestion(s) for fixing this issue
+<!-- What are your thoughts? How could this possibly be resolved? -->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 564edd0..9404741 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,4 +1,11 @@
-<!-- 
-  I'm not very good at English. So, I'm glad if you write in English as easy as possible.
-  日本語がわかる方はなるべく日本語でお願いします。
--->
+<!-- Please fill your information below the lines starting with `#`. -->
+<!-- You can delete these lines enclosed by `<` and `>` before posting, too. -->
+
+# Description
+<!-- What does this PR do, what does it want to achieve? -->
+
+# Compatibility
+<!-- Elaborate on how this PR affects the compatibility. Is it breaking, or not? -->
+
+# Caveats
+<!-- Is there something specific you'd like to mention before merge? -->
diff --git a/README-jp.md b/README-jp.md
index 3556195..5e11dcc 100644
--- a/README-jp.md
+++ b/README-jp.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <a href="https://bcrikko.github.io/NES.css/" target="_blank"><img src="https://user-images.githubusercontent.com/5305599/49061716-da649680-f254-11e8-9a89-d95a7407ec6a.png" alt="NES.css: NES-style  CSS framework" style="max-width:100%;" width="600" height="315"></a>
+  <a href="https://nostalgic-css.github.io/NES.css/" target="_blank"><img src="https://user-images.githubusercontent.com/5305599/49061716-da649680-f254-11e8-9a89-d95a7407ec6a.png" alt="NES.css: NES-style  CSS framework" style="max-width:100%;" width="600" height="315"></a>
 
   <a href="README.md">English</a> / <a href="README-jp.md">日本語</a>
 </div>
@@ -47,7 +47,7 @@ NES.cssはコンポーネントのスタイルのみを提供しています。
       html, body, pre, code, kbd, samp {
           font-family: "font-family you want to use";
       }
-    </style>    
+    </style>
 </head>
 ```
 
diff --git a/README.md b/README.md
index c968b97..80f9a73 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 <div align="center">
-  <a href="https://bcrikko.github.io/NES.css/" target="_blank"><img src="https://user-images.githubusercontent.com/5305599/49061716-da649680-f254-11e8-9a89-d95a7407ec6a.png" alt="NES.css: NES-style  CSS framework" style="max-width:100%;" width="600" height="315"></a>
+  <a href="https://nostalgic-css.github.io/NES.css/" target="_blank"><img src="https://user-images.githubusercontent.com/5305599/49061716-da649680-f254-11e8-9a89-d95a7407ec6a.png" alt="NES.css: NES-style  CSS framework" style="max-width:100%;" width="600" height="315"></a>
 
   <a href="README.md">English</a> / <a href="README-jp.md">日本語</a>
 </div>
@@ -46,7 +46,7 @@ The default font is [Press Start 2P](https://fonts.google.com/specimen/Press+Sta
       html, body, pre, code, kbd, samp {
           font-family: "font-family you want to use";
       }
-    </style>    
+    </style>
 </head>
 ```
 
diff --git a/package.json b/package.json
index 0d93950..e1c7f53 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/BcRikko/NES.css.git"
+    "url": "https://github.com/nostalgic-css/NES.css.git"
   },
   "keywords": [
     "css",
@@ -33,9 +33,9 @@
   "author": "BcRikko (https://github.com/Bcrikko)",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/BcRikko/NES.css/issues"
+    "url": "https://github.com/nostalgic-css/NES.css/issues"
   },
-  "homepage": "https://github.com/BcRikko/NES.css#readme",
+  "homepage": "https://github.com/nostalgic-css/NES.css#readme",
   "devDependencies": {
     "@commitlint/cli": "^7.2.1",
     "@commitlint/config-conventional": "^7.1.2",