diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 161af9e07..302053215 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -3,7 +3,7 @@ description: File a bug report
 body:
   - type: markdown
     attributes:
-      value: Tech support does not belong here. You should only file an issue here if you think you have experienced an actual bug with Citra.
+      value: Tech support does not belong here. You should only file an issue here if you think you have experienced an actual bug with CitraVR.
   - type: checkboxes
     attributes:
       label: Is there an existing issue for this?
@@ -15,7 +15,7 @@ body:
     attributes:
       label: Affected Build(s)
       description: List the affected build(s) that this issue applies to.
-      placeholder: Nightly 1234 / Canary 1234
+      placeholder: v0.2
     validations:
       required: true
   - type: textarea
@@ -51,14 +51,10 @@ body:
     attributes:
       label: System Configuration
       placeholder: |
-        CPU: Intel i5-10400 / AMD Ryzen 5 3600
-        GPU/Driver: NVIDIA GeForce GTX 1060 (Driver 512.95)
-        RAM: 16GB DDR4-3200
-        OS: Windows 11 22H2 (Build 22621.819)
+        HMD: Quest 2, Quest 3, Quest Pro
       value: |
-        CPU:
-        GPU/Driver:
-        RAM:
-        OS:
+        HMD:
     validations:
       required: true
+
+
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 88575a335..f6f02262e 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
   - name: Citra Discord
-    url: https://citra-emu.org/discord/
-    about: If you are experiencing an issue with Citra, and you need tech support, or if you have a general question, try asking in the official Citra Discord linked here. Piracy is not allowed.
-  - name: Community forums
-    url: https://community.citra-emu.org
-    about: This is an alternative place for tech support, however helpers there are not as active.
+    url:
+    about: If you are experiencing an issue with CitraVR, and you need tech support, or if you have a general question, try asking in the [CitraVR Discord](https://github.com/amwatson/CitraVR/blob/master/README.md#discord). Piracy is not allowed.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
index 7ab8172e3..6490f7f6a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.yml
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -4,7 +4,7 @@ labels: "request"
 body:
   - type: markdown
     attributes:
-      value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make Citra better.
+      value: Tech support does not belong here. You should only file an issue here if you are requesting a feature you believe would make CitraVR better.
   - type: checkboxes
     attributes:
       label: Is there an existing issue for this?
@@ -23,6 +23,6 @@ body:
     id: why-feature
     attributes:
       label: Why would this feature be useful?
-      description: A brief description of why this feature would make Citra better.
+      description: A brief description of why this feature would make CitraVR better.
     validations:
       required: true
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java
index 97f337ca7..5130d0e48 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/ui/SettingsFragmentPresenter.java
@@ -432,6 +432,7 @@ public final class SettingsFragmentPresenter {
         Setting vrExtraPerformanceMode = vrSection.getSetting(SettingsFile.KEY_VR_EXTRA_PERFORMANCE_MODE);
         sl.add(new SingleChoiceSetting(SettingsFile.KEY_VR_ENVIRONMENT, Settings.SECTION_VR, R.string.vr_background, 0, R.array.vrBackgroundNames, R.array.vrBackgroundValues, 1, vrEnvironment));
         sl.add(new CheckBoxSetting(SettingsFile.KEY_VR_EXTRA_PERFORMANCE_MODE, Settings.SECTION_VR, R.string.vr_extra_performance_mode, R.string.vr_extra_performance_mode_description, false, vrExtraPerformanceMode));
+        sl.add(new SingleChoiceSetting(SettingsFile.KEY_VR_ENVIRONMENT, Settings.SECTION_VR, R.string.vr_background, 0, R.array.vrBackgroundNames, R.array.vrBackgroundValues, 1, vrEnvironment));
 
     }
 }
diff --git a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java
index eb3b8cc22..61464b2d7 100644
--- a/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java
+++ b/src/android/app/src/main/java/org/citra/citra_emu/features/settings/utils/SettingsFile.java
@@ -131,10 +131,11 @@ public final class SettingsFile {
     public static final String KEY_CAMERA_INNER_NAME = "camera_inner_name";
     public static final String KEY_CAMERA_INNER_CONFIG = "camera_inner_config";
     public static final String KEY_CAMERA_INNER_FLIP = "camera_inner_flip";
-
     public static final String KEY_VR_ENVIRONMENT = "vr_environment";
     public static final String KEY_VR_EXTRA_PERFORMANCE_MODE = "vr_extra_performance_mode";
 
+    public static final String KEY_VR_CPU_LEVEL = "vr_cpu_level";
+
     public static final String KEY_LOG_FILTER = "log_filter";
 
     private static BiMap<String, String> sectionsMap = new BiMap<>();