diff --git a/index.html b/index.html
index 0df520ef..5e22a1be 100644
--- a/index.html
+++ b/index.html
@@ -610,15 +610,21 @@
         <div class="mt-3 property-list d-none">
         </div>
         <div class="input-group mt-3 condition-raining d-none">
-          <div class="custom-control custom-checkbox">
-            <input type="checkbox" class="custom-control-input" id="rainingCheckbox" onchange="updateCheckedField(this, 'raining')">
-            <label class="custom-control-label" for="rainingCheckbox">Raining</label>
+          <div class="input-group-prepend">
+            <span class="input-group-text">Raining</span>
+          </div>
+          <div class="btn-group">
+            <button type="button" value="false" class="btn btn-secondary rounded-0" onclick="updateRadioField(this, 'raining')">False</button>
+            <button type="button" value="true" class="btn btn-secondary" onclick="updateRadioField(this, 'raining')">True</button>
           </div>
         </div>
         <div class="input-group mt-3 condition-thundering d-none">
-          <div class="custom-control custom-checkbox">
-            <input type="checkbox" class="custom-control-input" id="thunderingCheckbox" onchange="updateCheckedField(this, 'thundering')">
-            <label class="custom-control-label" for="thunderingCheckbox">Thundering</label>
+          <div class="input-group-prepend">
+            <span class="input-group-text">Thundering</span>
+          </div>
+          <div class="btn-group">
+            <button type="button" value="false" class="btn btn-secondary rounded-0" onclick="updateRadioField(this, 'thundering')">False</button>
+            <button type="button" value="true" class="btn btn-secondary" onclick="updateRadioField(this, 'thundering')">True</button>
           </div>
         </div>
       </div>
diff --git a/view.js b/view.js
index b4e720b1..ee95b4e8 100644
--- a/view.js
+++ b/view.js
@@ -571,26 +571,9 @@ function generateCondition(condition, i) {
 
   if (condition.condition === 'minecraft:weather_check') {
     $condition.find('.condition-raining').removeClass('d-none');
-    let raining = false;
-    if (condition.raining) {
-      raining = true;
-    } else {
-      delete condition.raining;
-    }
-    let id = 'rainingCheckbox' + Math.floor(1000000*Math.random());
-    $condition.find('.condition-raining label').attr('for', id);
-    $condition.find('.condition-raining input').prop('checked', raining).attr('id', id);
-
     $condition.find('.condition-thundering').removeClass('d-none');
-    let thundering = false;
-    if (condition.thundering) {
-      thundering = true;
-    } else {
-      delete condition.thundering;
-    }
-    let id2 = 'thunderingCheckbox' + Math.floor(1000000*Math.random());
-    $condition.find('.condition-thundering label').attr('for', id2);
-    $condition.find('.condition-thundering input').prop('checked', thundering).attr('id', id2);
+    generateRadio($condition.find('.condition-raining'), condition.raining);
+    generateRadio($condition.find('.condition-thundering'), condition.thundering);
   } else {
     delete condition.raining;
     delete condition.thundering;