diff --git a/index.html b/index.html
index d032e21..e1180c0 100644
--- a/index.html
+++ b/index.html
@@ -28,9 +28,9 @@
         <div class='answer' type="button" v-for='v in answers' v-on:click="answer(v)" :class="{disabled:wrongAnswers.contains(v)}">{{ v }}</div>
       </div>
       <h3>Options</h3>
-      <input type="checkbox" id="opt_rh" v-model="options.rh"><label for="opt_rh">Romaji ↔ ひらがな</label><br />
-      <input type="checkbox" id="opt_rk" v-model="options.rk"><label for="opt_rk">Romaji ↔ カタカナ</label><br />
-      <input type="checkbox" id="opt_hk" v-model="options.hk"><label for="opt_hk">ひらがな ↔ カタカナ</label><br />
+      <input type="checkbox" id="opt_rh" v-model="options.rh"><label for="opt_rh">Romaji → ひらがな</label> <input type="checkbox" id="opt_hr" v-model="options.hr"><label for="opt_hr">ひらがな → Romaji</label><br />
+      <input type="checkbox" id="opt_rk" v-model="options.rk"><label for="opt_rk">Romaji → カタカナ</label> <input type="checkbox" id="opt_kr" v-model="options.kr"><label for="opt_kr">カタカナ → Romaji</label><br />
+      <input type="checkbox" id="opt_hk" v-model="options.hk"><label for="opt_hk">ひらがな ↔ カタカナ</label> <input type="checkbox" id="opt_kh" v-model="options.kh"><label for="opt_kh">カタカナ → ひらがな</label><br />
       <br />
       <span v-for="char in options.available">
         <input type="checkbox" :id="'opt_' + char" v-model="options.selected" :value="char"><label :for="'opt_' + char">{{ char ? char : '()' }}&nbsp;</label>
diff --git a/main.js b/main.js
index 0da2197..fbb63d3 100644
--- a/main.js
+++ b/main.js
@@ -88,8 +88,11 @@ let app = {
       available: kanas.rows,
       selected: kanas.rows,
       rh: true,
+      hr: true,
       rk: false,
+      kr: false,
       hk: false,
+      kh: false,
       answers: 6,
     },
     kanas: [],
@@ -142,15 +145,12 @@ let app = {
       //TODO add difficulty
 
       const mappings = [];
-      if (self.options.rh) {
-        mappings.push([0, 1], [1, 0]);
-      }
-      if (self.options.rk) {
-        mappings.push([0, 2], [2, 0]);
-      }
-      if (self.options.hk) {
-        mappings.push([1, 2], [2, 1]);
-      }
+      if (self.options.rh) { mappings.push([0, 1]); }
+      if (self.options.hr) { mappings.push([1, 0]); }
+      if (self.options.rk) { mappings.push([0, 2]); }
+      if (self.options.kr) { mappings.push([2, 0]); }
+      if (self.options.hk) { mappings.push([1, 2]); }
+      if (self.options.kh) { mappings.push([2, 1]); }
       const mapping = utils.randitem(mappings);
 
       self.question = self.kanas[questionIndex][mapping[0]];