diff --git a/device-oriole.mk b/device-oriole.mk
index 47721c9..1048193 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -72,6 +72,7 @@ PRODUCT_COPY_FILES += \
 
 # Display Config
 PRODUCT_COPY_FILES += \
+	device/google/raviole/oriole/display_golden_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_golden_cal0.pb \
 	device/google/raviole/oriole/display_colordata_dev_cal0.pb:$(TARGET_COPY_OUT_VENDOR)/etc/display_colordata_dev_cal0.pb
 
 # NFC
diff --git a/oriole/display_golden_cal0.pb b/oriole/display_golden_cal0.pb
new file mode 100644
index 0000000..54eb124
Binary files /dev/null and b/oriole/display_golden_cal0.pb differ
diff --git a/oriole/overlay/frameworks/base/core/res/res/values/config.xml b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
index 46d483f..a7ac7f6 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -35,7 +35,7 @@
 
     <!-- Default screen brightness setting
          Must be in the range specified by minimum and maximum. -->
-    <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.29019607843</item>
+    <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.17429718</item>
 
     <!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set
          this value to 0 so it has no effect. -->
diff --git a/raven/overlay/frameworks/base/core/res/res/values/config.xml b/raven/overlay/frameworks/base/core/res/res/values/config.xml
index d96cd4f..7f184ca 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -71,7 +71,7 @@
 
     <!-- Default screen brightness setting
          Must be in the range specified by minimum and maximum. -->
-    <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.29019607843</item>
+    <item name="config_screenBrightnessSettingDefaultFloat" format="float" type="dimen">0.17429718</item>
 
     <!-- The default refresh rate. Pixel 6 manages this using the peak refresh rate setting, so set
          this value to 0 so it has no effect. -->
diff --git a/thermal_info_config_oriole.json b/thermal_info_config_oriole.json
index b35043d..cd3449b 100644
--- a/thermal_info_config_oriole.json
+++ b/thermal_info_config_oriole.json
@@ -341,6 +341,10 @@
                 },
                 {
                     "CdevRequest": "dc_icl",
+                    "LimitInfo": [0, 1, 2, 3, 3, 3, 3]
+                },
+                {
+                    "CdevRequest": "wlc_fcc",
                     "LimitInfo": [0, 1, 2, 4, 4, 4, 4]
                 }
             ]
@@ -543,26 +547,6 @@
                 {
                     "CdevRequest": "thermal-cpufreq-2",
                     "LimitInfo": [0, 0, 0, 7, 7, 10, 10]
-                },
-                {
-                    "CdevRequest": "thermal-cpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
-                },
-                {
-                    "CdevRequest": "thermal-cpufreq-1",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
-                },
-                {
-                    "CdevRequest": "fcc",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
-                },
-                {
-                    "CdevRequest": "dc_icl",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
                 }
             ]
         },
@@ -794,6 +778,10 @@
         {
             "Name":"dc_icl",
             "Type":"BATTERY"
+        },
+        {
+            "Name":"wlc_fcc",
+            "Type":"BATTERY"
         }
     ]
 }
diff --git a/thermal_info_config_raven.json b/thermal_info_config_raven.json
index f6b488f..054a42b 100644
--- a/thermal_info_config_raven.json
+++ b/thermal_info_config_raven.json
@@ -138,19 +138,19 @@
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-NEUTRAL-DISP",
+            "Name":"VIRTUAL-NEUTRAL-QI",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
                 "neutral_therm",
-                "disp_therm"
+                "qi_therm"
             ],
             "Coefficient":[
-                "0.55",
-                "0.45"
+                "0.6",
+                "0.4"
             ],
-            "Offset":1000,
+            "Offset":-3000,
             "HotThreshold":[
                 "NAN",
                 "NAN",
@@ -216,19 +216,19 @@
             "Multiplier":0.001
         },
         {
-            "Name":"VIRTUAL-QI-BATT",
+            "Name":"VIRTUAL-QI-DISP",
             "Type":"UNKNOWN",
             "VirtualSensor":true,
             "Formula":"WEIGHTED_AVG",
             "Combination":[
                 "qi_therm",
-                "battery"
+                "disp_therm"
             ],
             "Coefficient":[
-                "0.5",
-                "0.5"
+                "0.25",
+                "0.75"
             ],
-            "Offset":-4000,
+            "Offset":1000,
             "HotThreshold":[
                 "NAN",
                 "NAN",
@@ -248,10 +248,10 @@
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",
             "Combination":[
-                "VIRTUAL-NEUTRAL-DISP",
+                "VIRTUAL-NEUTRAL-QI",
                 "VIRTUAL-USB2-BATT",
                 "VIRTUAL-GNSS-BATT",
-                "VIRTUAL-QI-BATT"
+                "VIRTUAL-QI-DISP"
             ],
             "Coefficient":[
                 "1.0",
@@ -261,12 +261,12 @@
             ],
             "HotThreshold":[
                 "NAN",
-                "39.0",
-                "43.0",
-                "45.0",
-                "47.0",
+                "39",
+                "43",
+                "45",
+                "46.5",
                 "52.0",
-                "56.0"
+                "55.0"
             ],
             "HotHysteresis":[
                 0.0,
@@ -341,6 +341,10 @@
                 },
                 {
                     "CdevRequest": "dc_icl",
+                    "LimitInfo": [0, 1, 2, 3, 3, 3, 3]
+                },
+                {
+                    "CdevRequest": "wlc_fcc",
                     "LimitInfo": [0, 1, 2, 4, 4, 4, 4]
                 }
             ]
@@ -352,10 +356,10 @@
             "TriggerSensor":"quiet_therm",
             "Formula":"MAXIMUM",
             "Combination":[
-                "VIRTUAL-NEUTRAL-DISP",
+                "VIRTUAL-NEUTRAL-QI",
                 "VIRTUAL-USB2-BATT",
                 "VIRTUAL-GNSS-BATT",
-                "VIRTUAL-QI-BATT"
+                "VIRTUAL-QI-DISP"
             ],
             "Coefficient":[
                 "1.0",
@@ -543,26 +547,6 @@
                 {
                     "CdevRequest": "thermal-cpufreq-2",
                     "LimitInfo": [0, 0, 0, 7, 7, 10, 10]
-                },
-                {
-                    "CdevRequest": "thermal-cpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
-                },
-                {
-                    "CdevRequest": "thermal-cpufreq-1",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
-                },
-                {
-                    "CdevRequest": "thermal-gpufreq-0",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
-                },
-                {
-                    "CdevRequest": "fcc",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
-                },
-                {
-                    "CdevRequest": "dc_icl",
-                    "LimitInfo": [0, 0, 0, 0, 0, 0, 0]
                 }
             ]
         },
@@ -794,6 +778,10 @@
         {
             "Name":"dc_icl",
             "Type":"BATTERY"
+        },
+        {
+            "Name":"wlc_fcc",
+            "Type":"BATTERY"
         }
     ]
 }