diff --git a/bluetooth_power_limits_EU.csv b/bluetooth_power_limits_EU.csv
new file mode 100644
index 0000000..4bef57f
--- /dev/null
+++ b/bluetooth_power_limits_EU.csv
@@ -0,0 +1,34 @@
+Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
+off,off,off,off,off,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,off,off,off,on,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,off,off,on,off,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,off,off,on,on,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,off,on,off,off,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,off,on,off,on,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,off,on,on,off,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,off,on,on,on,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,on,off,off,off,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,on,off,off,on,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,on,off,on,off,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,on,off,on,on,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,on,on,off,off,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,on,on,off,on,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,on,on,on,off,on,76,76,44,76,76,40,64,68,40,64,68,40
+off,on,on,on,on,on,76,76,44,76,76,40,64,68,40,64,68,40
+on,off,off,off,off,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,off,off,off,on,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,off,off,on,off,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,off,off,on,on,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,off,on,off,off,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,off,on,off,on,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,off,on,on,off,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,off,on,on,on,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,on,off,off,off,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,on,off,off,on,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,on,off,on,off,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,on,off,on,on,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,on,on,off,off,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,on,on,off,on,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,on,on,on,off,any,76,76,44,76,76,40,64,68,40,64,68,40
+on,on,on,on,on,any,76,76,44,76,76,40,64,68,40,64,68,40
+off,any,any,any,any,off,76,76,44,76,76,40,64,68,40,64,68,40
\ No newline at end of file
diff --git a/bluetooth_power_limits_G9S9B_EU.csv b/bluetooth_power_limits_G9S9B_EU.csv
new file mode 100644
index 0000000..7632724
--- /dev/null
+++ b/bluetooth_power_limits_G9S9B_EU.csv
@@ -0,0 +1,34 @@
+Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
+off,off,off,off,off,on,76,76,40,76,76,40,64,68,40,64,68,40
+off,off,off,off,on,on,76,76,40,76,76,40,64,68,40,64,68,40
+off,off,off,on,off,on,76,76,40,76,76,40,64,68,40,64,68,40
+off,off,off,on,on,on,76,76,40,76,76,40,64,68,40,64,68,40
+off,off,on,off,off,on,76,76,40,76,76,40,64,68,40,64,68,40
+off,off,on,off,on,on,76,76,40,76,76,40,64,68,40,64,68,40
+off,off,on,on,off,on,76,76,40,68,68,40,64,68,40,64,68,40
+off,off,on,on,on,on,76,76,40,68,68,40,64,68,40,64,68,40
+off,on,off,off,off,on,76,76,40,68,68,40,64,68,40,64,68,40
+off,on,off,off,on,on,76,76,40,68,68,40,64,68,40,64,68,40
+off,on,off,on,off,on,76,76,40,68,68,40,64,68,40,64,68,40
+off,on,off,on,on,on,76,76,40,68,68,40,64,68,40,64,68,40
+off,on,on,off,off,on,76,76,40,68,68,40,64,68,40,64,68,40
+off,on,on,off,on,on,76,76,40,68,68,40,64,68,40,64,68,40
+off,on,on,on,off,on,76,76,40,68,68,40,64,68,40,64,68,40
+off,on,on,on,on,on,76,76,40,68,68,40,64,68,40,64,68,40
+on,off,off,off,off,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,off,off,off,on,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,off,off,on,off,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,off,off,on,on,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,off,on,off,off,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,off,on,off,on,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,off,on,on,off,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,off,on,on,on,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,on,off,off,off,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,on,off,off,on,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,on,off,on,off,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,on,off,on,on,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,on,on,off,off,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,on,on,off,on,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,on,on,on,off,any,76,76,40,68,68,40,64,68,40,64,68,40
+on,on,on,on,on,any,76,76,40,68,68,40,64,68,40,64,68,40
+off,any,any,any,any,off,76,76,40,76,76,40,64,68,40,64,68,40
\ No newline at end of file
diff --git a/bluetooth_power_limits_GB7N6_EU.csv b/bluetooth_power_limits_GB7N6_EU.csv
new file mode 100644
index 0000000..28265ca
--- /dev/null
+++ b/bluetooth_power_limits_GB7N6_EU.csv
@@ -0,0 +1,34 @@
+Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1
+off,off,off,off,off,on,76,76,40,76,76,44,64,68,44,64,68,44
+off,off,off,off,on,on,76,76,40,76,76,44,64,68,44,64,68,44
+off,off,off,on,off,on,76,76,40,76,76,44,64,68,44,64,68,44
+off,off,off,on,on,on,76,76,40,76,76,44,64,68,44,64,68,44
+off,off,on,off,off,on,76,76,40,76,76,44,64,68,44,64,68,44
+off,off,on,off,on,on,76,76,40,76,76,44,64,68,44,64,68,44
+off,off,on,on,off,on,68,68,40,68,68,44,56,56,44,56,56,44
+off,off,on,on,on,on,68,68,40,68,68,44,56,56,44,56,56,44
+off,on,off,off,off,on,68,68,40,68,68,44,56,56,44,56,56,44
+off,on,off,off,on,on,68,68,40,68,68,44,56,56,44,56,56,44
+off,on,off,on,off,on,68,68,40,68,68,44,56,56,44,56,56,44
+off,on,off,on,on,on,68,68,40,68,68,44,56,56,44,56,56,44
+off,on,on,off,off,on,68,68,40,68,68,44,56,56,44,56,56,44
+off,on,on,off,on,on,68,68,40,68,68,44,56,56,44,56,56,44
+off,on,on,on,off,on,68,68,40,68,68,44,56,56,44,56,56,44
+off,on,on,on,on,on,68,68,40,68,68,44,56,56,44,56,56,44
+on,off,off,off,off,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,off,off,off,on,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,off,off,on,off,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,off,off,on,on,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,off,on,off,off,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,off,on,off,on,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,off,on,on,off,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,off,on,on,on,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,on,off,off,off,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,on,off,off,on,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,on,off,on,off,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,on,off,on,on,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,on,on,off,off,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,on,on,off,on,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,on,on,on,off,any,76,76,40,76,76,44,64,68,44,64,68,44
+on,on,on,on,on,any,76,76,40,76,76,44,64,68,44,64,68,44
+off,any,any,any,any,off,76,76,40,76,76,44,64,68,44,64,68,44
\ No newline at end of file
diff --git a/device-oriole.mk b/device-oriole.mk
index 3fd8929..fda6e5e 100644
--- a/device-oriole.mk
+++ b/device-oriole.mk
@@ -64,7 +64,9 @@ PRODUCT_PRODUCT_PROPERTIES += \
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth_power_limits_oriole.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
     $(LOCAL_PATH)/bluetooth_power_limits_G9S9B_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_US.csv \
-    $(LOCAL_PATH)/bluetooth_power_limits_GB7N6_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_US.csv
+    $(LOCAL_PATH)/bluetooth_power_limits_GB7N6_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_US.csv \
+    $(LOCAL_PATH)/bluetooth_power_limits_G9S9B_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_G9S9B_EU.csv \
+    $(LOCAL_PATH)/bluetooth_power_limits_GB7N6_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_GB7N6_EU.csv
 
 # Bluetooth SAR test tool
 PRODUCT_PACKAGES_DEBUG += \
@@ -162,7 +164,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_one_handed_mode=true
 
 # Enable camera exif model/make reporting
-PRODUCT_PRODUCT_PROPERTIES += \
+PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
 # Bluetooth HAL
diff --git a/device-raven.mk b/device-raven.mk
index fdcd63e..de5d22a 100644
--- a/device-raven.mk
+++ b/device-raven.mk
@@ -69,7 +69,8 @@ PRODUCT_PRODUCT_PROPERTIES += \
 # Bluetooth Tx power caps for raven
 PRODUCT_COPY_FILES += \
     $(LOCAL_PATH)/bluetooth_power_limits_raven.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits.csv \
-    $(LOCAL_PATH)/bluetooth_power_limits_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv
+    $(LOCAL_PATH)/bluetooth_power_limits_US.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_US.csv \
+    $(LOCAL_PATH)/bluetooth_power_limits_EU.csv:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_power_limits_EU.csv
 
 # Bluetooth SAR test tool
 PRODUCT_PACKAGES_DEBUG += \
@@ -169,7 +170,7 @@ PRODUCT_PRODUCT_PROPERTIES += \
     ro.support_one_handed_mode=true
 
 # Enable camera exif model/make reporting
-PRODUCT_PRODUCT_PROPERTIES += \
+PRODUCT_VENDOR_PROPERTIES += \
     persist.vendor.camera.exif_reveal_make_model=true
 
 # Bluetooth HAL
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 83e3c32..4fcf00e 100644
--- a/oriole/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/oriole/overlay/frameworks/base/core/res/res/values/config.xml
@@ -79,7 +79,7 @@
     </string>
 
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">
-        M 480,0
+        M 492,0
         h 118
         v 118
         h -118
@@ -88,14 +88,14 @@
     </string>
 
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">25px</dimen>
+    <dimen name="rounded_corner_radius">28px</dimen>
 
     <!-- Height of the status bar in portrait. The height should be
          Max((status bar content height + waterfall top size), top cutout size) -->
-    <dimen name="status_bar_height_portrait">118px</dimen>
+    <dimen name="status_bar_height_portrait">124px</dimen>
     <dimen name="status_bar_height_landscape">74px</dimen>
     <!-- Height of area above QQS where battery/time go (equal to status bar) -->
-    <dimen name="quick_qs_offset_height">118px</dimen>
+    <dimen name="quick_qs_offset_height">124px</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>
diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index d415b72..806c60d 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -25,13 +25,16 @@
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">1px</dimen>
 
-    <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
-    The icons always have a 4dp padding in the container so we only need 56 extra px of padding
-    for the corners -->
-    <dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen>
+    <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
 
-    <!-- Multi user switch has some intrinsic padding to it -->
-    <dimen name="multi_user_switch_keyguard_margin">40px</dimen>
+    <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
+    The icons always have a 4dp padding in the container so we only need 26 extra px of padding
+    for the corners -->
+    <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
+
+    <!-- Margin on the right side of the system icon group on Keyguard. -->
+    <dimen name="system_icons_keyguard_padding_end">6dp</dimen>
 
     <dimen name="keyguard_carrier_text_margin">0px</dimen>
 
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 11950a9..c87a532 100644
--- a/raven/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/raven/overlay/frameworks/base/core/res/res/values/config.xml
@@ -43,7 +43,7 @@
 
 
     <!-- Radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">38px</dimen>
+    <dimen name="rounded_corner_radius">50px</dimen>
 
     <!-- Adjustment for software rounded corners since corners aren't perfectly round. -->
     <dimen name="rounded_corner_radius_adjustment">5px</dimen>
@@ -200,9 +200,6 @@
     <!-- Height of area above QQS where battery/time go (equal to status bar) -->
     <dimen name="quick_qs_offset_height">145px</dimen>
 
-    <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
-    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
-  
     <!-- If face auth sends the user directly to home/last open app, or stays on keyguard by default-->
     <bool name="config_faceAuthDismissesKeyguard">false</bool>
 
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index 68c8115..899d24b 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -22,10 +22,16 @@
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">1px</dimen>
 
+    <!-- Height of the status bar header bar when on Keyguard (match status_bar_portrait) -->
+    <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height_portrait</dimen>
+
     <!-- Padding for the system icons on the keyguard (when no multi user switch is showing).
-    The icons always have a 4dp padding in the container so we only need 56 extra px of padding
+    The icons always have a 4dp padding in the container so we only need 26 extra px of padding
     for the corners -->
-    <dimen name="system_icons_super_container_avatarless_margin_end">11px</dimen>
+    <dimen name="system_icons_super_container_avatarless_margin_end">26px</dimen>
+
+    <!-- Margin on the right side of the system icon group on Keyguard. -->
+    <dimen name="system_icons_keyguard_padding_end">10dp</dimen>
 
     <!-- A path similar to frameworks/base/core/res/res/values/config.xml
         config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display