diff --git a/svd/patches/_interrupts.yaml b/svd/patches/_interrupts.yaml
index a6f4e0b2..5e453bca 100644
--- a/svd/patches/_interrupts.yaml
+++ b/svd/patches/_interrupts.yaml
@@ -461,4 +461,4 @@ XTENSA:
 
       CACHE_IA_INTR:
         description: "interrupt of Cache Invalid Access, LEVEL"
-        value: 68
+        value: 68
\ No newline at end of file
diff --git a/svd/patches/esp32.yaml b/svd/patches/esp32.yaml
index 6e6b25bc..ebfb4139 100644
--- a/svd/patches/esp32.yaml
+++ b/svd/patches/esp32.yaml
@@ -14,41 +14,31 @@ _modify:
     name: I2C0
   I2C1_EXT:
     name: I2C1
+  TIMERGROUP0:
+    name: TIMG0
+  TIMERGROUP1:
+    name: TIMG1
 
-_copy:
-  TIMG0:
-    from: TIMG
-  TIMG1:
-    from: TIMG
-  SPI0:
-    from: SPI
-  SPI1:
-    from: SPI
-  SPI2:
-    from: SPI
-  SPI3:
-    from: SPI
-  PWM0:
-    from: MCPWM
-  PWM1:
-    from: MCPWM
-  PWM2:
-    from: MCPWM
-  PWM3:
-    from: MCPWM
-  I2C0:
-    from: I2C
-  I2C1:
-    from: I2C
-  UHCI0:
-    from: UHCI
-  UHCI1:
-    from: UHCI
+_add:
   UART0:
-    from: UART1
+    derivedFrom: UART
+    baseAddress: "0x3ff40000"
 
-_modify:
-  TIMG0:
-    baseAddress: "0x3ff5F000"
-  TIMG1:
-    baseAddress: "0x3ff60000"
+_derive:
+  TIMG0: TIMG
+  TIMG1: TIMG
+  SPI0: SPI
+  SPI1: SPI
+  SPI2: SPI
+  SPI3: SPI
+  PWM0: MCPWM
+  PWM1: MCPWM
+  PWM2: MCPWM
+  PWM3: MCPWM
+  I2C0: I2C
+  I2C1: I2C
+  UHCI0: UHCI
+  UHCI1: UHCI
+  UART0: UART
+  UART1: UART
+  UART2: UART