diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
new file mode 100644
index 0000000..ce4739d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -0,0 +1,38 @@
+---
+name: "\U0001F41E Bug report"
+about: Report an issue
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md
new file mode 100644
index 0000000..f22de3f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -0,0 +1,20 @@
+---
+name: "\U0001F31F Feature request"
+about: Suggest an idea
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/README.md b/README.md
index 34742d7..125367b 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,20 @@
-# Crabfit <img width="100" align="right" src="crabfit-frontend/src/res/logo.svg" alt="avatar">
+# Crab Fit <img width="100" align="right" src="crabfit-frontend/src/res/logo.svg" alt="avatar">
 
 Align your schedules to find the perfect time that works for everyone.
 Licensed under the GNU GPLv3.
 
 <a href="https://www.producthunt.com/posts/crab-fit?utm_source=badge-featured&utm_medium=badge&utm_souce=badge-crab-fit" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/featured.svg?post_id=291656&theme=light" alt="Crab Fit - Use your availability to find a time that works for everyone | Product Hunt" style="width: 250px; height: 54px;" width="250" height="54" /></a>
 
+## Contributing
+
+### ⭐️ Bugs or feature requests
+
+If you find any bugs or have a feature request, please create an issue by <a href="https://github.com/GRA0007/crab.fit/issues/new/choose">clicking here</a>.
+
+### 🌐 Translations
+
+If you speak a language other than English and you want to help translate Crab Fit, fill out this form: https://forms.gle/azz1yGqhpLUka45S9
+
 ## Setup
 
 1. Clone the repo.
@@ -12,18 +22,18 @@ Licensed under the GNU GPLv3.
 3. Run `node index.js` in the backend folder to start the API.
 4. Run `yarn start` in the frontend folder to start the front end.
 
-### Browser extension
+### 🔌 Browser extension
 The browser extension in `crabfit-browser-extension` can be tested by first running the frontend, and changing the iframe url in the extension's `popup.html` to match the local Crab Fit. Then it can be loaded as an unpacked extension in Chrome to test.
 
 ## Deploy
 
-### Frontend
+### 🦀 Frontend
 1. In the frontend folder `cd crabfit-frontend`
 2. Run `./deploy.sh` to compile and deploy.
 
-### Backend
+### ⚙️ Backend
 1. In the backend folder `cd crabfit-backend`
 2. Deploy the backend `gcloud app deploy --project=crabfit --version=v1`
 
-### Browser extension
+### 🔌 Browser extension
 Compress everything inside the `crabfit-browser-extension` folder and use that zip to deploy using Chrome web store and Mozilla Add-on store.
diff --git a/crabfit-frontend/public/i18n/ja/common.json b/crabfit-frontend/public/i18n/ja/common.json
index 7086ea1..f96b717 100644
--- a/crabfit-frontend/public/i18n/ja/common.json
+++ b/crabfit-frontend/public/i18n/ja/common.json
@@ -1,42 +1,42 @@
 {
-  "name": "Crab Fit",
-  "tagline": "Create your own",
-  "cta": "Create your own Crab Fit!",
-  "created": "{{date}}で作成",
+  "name": "クラーブフィット",
+  "tagline": "自分のを作成しましょう",
+  "cta": "自分のクラーブフィットを作成しましょう！",
+  "created": "{{date}}で作成した",
   "donate": {
-    "info": "Thank you for using Crab Fit. If you like it, consider donating.",
-    "button": "Donate",
-    "title": "Every amount counts :)",
+    "info": "クラーブフィットを使ってありがとうございました。好きだったら、寄付してくれますか？",
+    "button": "寄付する",
+    "title": "いくらでもいいですよ :)",
     "options": {
-      "$2": "Donate $2",
-      "$5": "Donate $5",
-      "$10": "Donate $10",
-      "choose": "Choose an amount"
+      "$2": "$２を寄付する",
+      "$5": "$５を寄付する",
+      "$10": "$１０を寄付する",
+      "choose": "自分で選んだ金額"
     },
     "messages": {
-      "about": "If it's helped you out at all, consider donating to help keep it running. 🦀",
-      "success": "Thank you for your donation! Without you, Crab Fit wouldn't be free, so thank you and keep being super awesome!",
-      "error": "Cannot make donation through Google. Please try donating through the website crab.fit 🦀"
+      "about": "クラブフィットは便利だなと思うなら、寄付してくれませんか？🦀",
+      "success": "寄付ありがとうございます！あなたの補佐がなければ、無料でいられることができませんので、本当に助けてくれました。",
+      "error": "Googleで寄付ができません。crab.fitのサイトで直接寄付してください。🦀"
     }
   },
   "options": {
-    "name": "Options",
+    "name": "設定",
     "weekStart": {
-      "label": "Week starts on",
+      "label": "週間の始まり",
       "options": {
-        "Sunday": "日曜",
-        "Monday": "月曜"
+        "Sunday": "日曜日",
+        "Monday": "月曜日"
       }
     },
     "timeFormat": {
-      "label": "Time format",
+      "label": "時間表記",
       "options": {
-        "12h": "12時間",
-        "24h": "24時間"
+        "12h": "１２時制",
+        "24h": "２４時制"
       }
     },
     "theme": {
-      "label": "色のテーマ",
+      "label": "テーマ",
       "options": {
         "System": "システム",
         "Light": "明色",
@@ -44,11 +44,11 @@
       }
     },
     "highlight": {
-      "label": "Highlight highest availability",
-      "title": "Make the highest availability on the heatmap stand out",
+      "label": "最高t都合がいい時をハイライトする",
+      "title": "最高都合がいい時をもっと見やすくなる",
       "options": {
-        "Off": "オフ",
-        "On": "オン"
+        "Off": "しない",
+        "On": "する"
       }
     },
     "language": {
diff --git a/crabfit-frontend/public/i18n/ja/event.json b/crabfit-frontend/public/i18n/ja/event.json
index 569723a..0ccc402 100644
--- a/crabfit-frontend/public/i18n/ja/event.json
+++ b/crabfit-frontend/public/i18n/ja/event.json
@@ -1,63 +1,65 @@
 {
-  "available": "available",
+  "available": "都合がいい",
+  "greyed_times": "この領域はイベントの範囲ではないので、グレーアウトしました。このイベントは作った時間帯と違う時間帯で見るかもしれません。",
 
   "nav": {
-    "title": "Click to copy",
-    "copied": "Copied!",
-    "shareinfo": "Copy the link to this page, or share via <1>email</1>.",
-    "shareinfo_alt": "Click the link above to copy it to your clipboard, or share via <1>email</1>.",
-    "email_subject": "Scheduling {{event_name}}",
-    "email_body": "Visit this link to enter your availabilities:"
+    "title": "クリックして、コピーする",
+    "copied": "コピーしました！",
+    "shareinfo": "このページのリンクをコーピして、または<1>メール</1>でシェアします。",
+    "shareinfo_alt": "この上にあるリンクをクリックして、クリップボードにコーピして、または<1>メール</1>でシェアーします。",
+    "email_subject": "{{event_name}}を予定",
+    "email_body": "このリンクで都合を登録できます："
   },
   "form": {
-    "signed_out": "Sign in to add your availability",
-    "signed_in": "Signed in as {{name}}",
+    "signed_out": "都合を登録したいなら、最初はログインしてください",
+    "signed_in": "{{name}}でログインしています",
 
-    "name": "Your name",
-    "password": "Password (optional)",
-    "button": "Login",
-    "info": "These details are only for this event. Use a password to prevent others from changing your availability.",
+    "name": "あなたの名前",
+    "password": "パスワード（任意)",
+    "button": "ログイン",
+    "info": "この詳細はこのイベントだけについてです。他人はあなたの都合を変化することを予防したいなら、パスワードを使ってください。",
 
-    "timezone": "Your time zone",
+    "timezone": "あなたの時間帯",
 
     "errors": {
-      "password_incorrect": "Password is incorrect. Check your name is spelled right.",
-      "unknown": "Failed to login. Please try again."
+      "password_incorrect": "パスワードは正しくありません。名前の綴りかたを確認してください。",
+      "unknown": "ログインはできなかったです。もう一度やり直してください。"
     },
 
-    "created_in_timezone": "This event was created in the timezone <strong>{{timezone}}</strong>. <3>Click here</3> to use it.",
-    "local_timezone": "Your local timezone is detected to be <strong>{{timezone}}</strong>. <3>Click here</3> to use it."
+    "created_in_timezone": "このイベントは<strong>{{timezone}}</strong>の時間帯で作成しました。<3>ここをクリックする</3>とその時間帯を使うことができます。",
+    "local_timezone": "システムによると、あなたのローカル時間帯は<strong>{{timezone}}</strong>です。<3>ここをクリックする</3>とその時間帯を使うことでできます。"
   },
   "offline": {
-    "title": "You are offline",
-    "body": "A Crab Fit doesn't work offline.<br />Make sure you're connected to the internet and try again."
+    "title": "インターネットは接続していません",
+    "body": "クラブフィットはオフラインで使われません。<br />インターネット接続を確認してもう一度やり直してください。"
   },
   "error": {
-    "title": "Event not found",
-    "body": "Check that the url you entered is correct."
+    "title": "イベントは見つけられませんでした",
+    "body": "登録したURLを確認してください"
   },
 
   "tabs": {
-    "you": "Your availability",
-    "you_tooltip": "Login to set your availability",
-    "group": "Group availability"
+    "you": "あなたの都合",
+    "you_tooltip": "ログインすると都合を設定することができます",
+    "group": "グループの都合"
   },
 
   "group": {
-    "legend_tooltip": "Click to highlight highest availability",
-    "info1": "Hover or tap the calendar below to see who is available",
-    "info2": "Click the names below to view people individually"
+    "legend_tooltip": "クリックすると最高の都合をハイライトすることができます",
+    "info1": "下のカレンダーの上にマウスカーソルをホバリングしてまたはタップすると都合がいい人を見ることができます",
+    "info2": "下の名前をクリックすると人の都合を見ることができます"
   },
 
   "you": {
-    "info": "Click and drag the calendar below to set your availabilities",
+    "info": "都合を設定したいなら、下のカレンダーをクリックしてドラッグする",
     "google_cal": {
-      "login": "Sync with Google Calendar",
-      "logout": "log out",
-      "select_all": "Select all",
-      "select_none": "Select none",
-      "info": "Importing will overwrite your current availability",
-      "button": "Import availability"
-    }
+      "login": "Googleカレンダーを同期する",
+      "logout": "ログアウト",
+      "select_all": "全部を選択する",
+      "select_none": "どれもないを選択する",
+      "info": "インポートしたら、今の都合が上書きされる",
+      "button": "都合をインポートする"
+    },
+    "outlook_cal": "Outlookカレンダーを同期する"
   }
 }