diff --git a/fab.dcm b/fab.dcm
index b38fbc5a59723cb471c4ec0ff1eb7f29412f669b..db2eaefab607a73f59ce87a9e6cf6d49af017ded 100644
--- a/fab.dcm
+++ b/fab.dcm
@@ -253,6 +253,12 @@ K RF Radio ESP Espressif
 F https://www.espressif.com/sites/default/files/documentation/esp-wroom-02u_esp-wroom-02d_datasheet_en.pdf
 $ENDCMP
 #
+$CMP Radio_ESP32-WROOM-32E
+D Bluetooth, WiFi 802.11b/g/n, Bluetooth v4.2 +EDR, Class 1, 2 and 3 Transceiver Module 2.4GHz ~ 2.5GHz Integrated, Trace Surface Mount
+K RF Radio BT ESP ESP32 Espressif onboard PCB antenna
+F https://www.espressif.com/sites/default/files/documentation/esp32-wroom-32e_esp32-wroom-32ue_datasheet_en.pdf
+$ENDCMP
+#
 $CMP Radio_Microchip_RN4871
 D Bluetooth Bluetooth v5.0 Transceiver Module 2.4GHz Integrated, Chip Surface Mount
 K Bluetooth Low Energy 4.2 Module
diff --git a/fab.lib b/fab.lib
index f33240056d2fa6982bdcb94f0900f8dea8905130..ecc7c9979c77f4ed7d4d9c3ade71ca240a96296f 100644
--- a/fab.lib
+++ b/fab.lib
@@ -2934,6 +2934,60 @@ X GND 9 0 -600 100 U 50 50 1 1 W
 ENDDRAW
 ENDDEF
 #
+# Radio_ESP32-WROOM-32E
+#
+DEF Radio_ESP32-WROOM-32E U 0 20 Y Y 1 F N
+F0 "U" -500 1350 50 H V L CNN
+F1 "Radio_ESP32-WROOM-32E" 50 1350 50 H V L CNN
+F2 "fab:ESP32-WROOM-32E" 0 -1500 50 H I C CNN
+F3 "" -300 50 50 H I C CNN
+$FPLIST
+ ESP32?WROOM?32*
+$ENDFPLIST
+DRAW
+S -500 1300 500 -1300 0 1 10 f
+X GND 1 0 -1400 100 U 50 50 1 1 W
+X IO25 10 600 -500 100 L 50 50 1 1 B
+X IO26 11 600 -600 100 L 50 50 1 1 B
+X IO27 12 600 -700 100 L 50 50 1 1 B
+X IO14 13 600 400 100 L 50 50 1 1 B
+X IO12 14 600 600 100 L 50 50 1 1 B
+X GND 15 0 -1400 100 U 50 50 1 1 P N
+X IO13 16 600 500 100 L 50 50 1 1 B
+X SHD/SD2 17 -600 -200 100 R 50 50 1 1 B
+X SWP/SD3 18 -600 -300 100 R 50 50 1 1 B
+X SCS/CMD 19 -600 -500 100 R 50 50 1 1 B
+X VDD 2 0 1400 100 D 50 50 1 1 W
+X SCK/CLK 20 -600 -400 100 R 50 50 1 1 B
+X SDO/SD0 21 -600 0 100 R 50 50 1 1 B
+X SDI/SD1 22 -600 -100 100 R 50 50 1 1 B
+X IO15 23 600 300 100 L 50 50 1 1 B
+X IO2 24 600 1000 100 L 50 50 1 1 B
+X IO0 25 600 1200 100 L 50 50 1 1 B
+X IO4 26 600 800 100 L 50 50 1 1 B
+X IO16 27 600 200 100 L 50 50 1 1 B
+X IO17 28 600 100 100 L 50 50 1 1 B
+X IO5 29 600 700 100 L 50 50 1 1 B
+X EN 3 -600 1200 100 R 50 50 1 1 I
+X IO18 30 600 0 100 L 50 50 1 1 B
+X IO19 31 600 -100 100 L 50 50 1 1 B
+X NC 32 -500 -1100 100 R 50 50 1 1 N N
+X IO21 33 600 -200 100 L 50 50 1 1 B
+X RXD0/IO3 34 600 900 100 L 50 50 1 1 B
+X TXD0/IO1 35 600 1100 100 L 50 50 1 1 B
+X IO22 36 600 -300 100 L 50 50 1 1 B
+X IO23 37 600 -400 100 L 50 50 1 1 B
+X GND 38 0 -1400 100 U 50 50 1 1 P N
+X GND 39 0 -1400 100 U 50 50 1 1 P N
+X SENSOR_VP 4 -600 1000 100 R 50 50 1 1 I
+X SENSOR_VN 5 -600 900 100 R 50 50 1 1 I
+X IO34 6 600 -1000 100 L 50 50 1 1 I
+X IO35 7 600 -1100 100 L 50 50 1 1 I
+X IO32 8 600 -800 100 L 50 50 1 1 B
+X IO33 9 600 -900 100 L 50 50 1 1 B
+ENDDRAW
+ENDDEF
+#
 # Radio_Microchip_RN4871
 #
 DEF Radio_Microchip_RN4871 U 0 40 Y Y 1 F N
diff --git a/fab.pretty/ESP32-WROOM-32E.kicad_mod b/fab.pretty/ESP32-WROOM-32E.kicad_mod
new file mode 100644
index 0000000000000000000000000000000000000000..15f3f0d007a704a445d2bfa7a947d61f91890f7e
--- /dev/null
+++ b/fab.pretty/ESP32-WROOM-32E.kicad_mod
@@ -0,0 +1,135 @@
+(module ESP32-WROOM-32E (layer F.Cu) (tedit 5B5B4654)
+  (descr "Single 2.4 GHz Wi-Fi and Bluetooth combo chip https://www.espressif.com/sites/default/files/documentation/esp32-wroom-32_datasheet_en.pdf")
+  (tags "Single 2.4 GHz Wi-Fi and Bluetooth combo  chip")
+  (attr smd)
+  (fp_text reference REF** (at -10.61 8.43 90) (layer F.SilkS)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text value ESP32-WROOM-32E (at 0 11.5) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_line (start -9.12 -9.445) (end -9.5 -9.445) (layer F.SilkS) (width 0.12))
+  (fp_line (start -9.12 -15.865) (end -9.12 -9.445) (layer F.SilkS) (width 0.12))
+  (fp_line (start 9.12 -15.865) (end 9.12 -9.445) (layer F.SilkS) (width 0.12))
+  (fp_line (start -9.12 -15.865) (end 9.12 -15.865) (layer F.SilkS) (width 0.12))
+  (fp_line (start 9.12 9.88) (end 8.12 9.88) (layer F.SilkS) (width 0.12))
+  (fp_line (start 9.12 9.1) (end 9.12 9.88) (layer F.SilkS) (width 0.12))
+  (fp_line (start -9.12 9.88) (end -8.12 9.88) (layer F.SilkS) (width 0.12))
+  (fp_line (start -9.12 9.1) (end -9.12 9.88) (layer F.SilkS) (width 0.12))
+  (fp_line (start 8.4 -20.6) (end 8.2 -20.4) (layer Cmts.User) (width 0.1))
+  (fp_line (start 8.4 -16) (end 8.4 -20.6) (layer Cmts.User) (width 0.1))
+  (fp_line (start 8.4 -20.6) (end 8.6 -20.4) (layer Cmts.User) (width 0.1))
+  (fp_line (start 8.4 -16) (end 8.6 -16.2) (layer Cmts.User) (width 0.1))
+  (fp_line (start 8.4 -16) (end 8.2 -16.2) (layer Cmts.User) (width 0.1))
+  (fp_line (start -9.2 -13.875) (end -9.4 -14.075) (layer Cmts.User) (width 0.1))
+  (fp_line (start -13.8 -13.875) (end -9.2 -13.875) (layer Cmts.User) (width 0.1))
+  (fp_line (start -9.2 -13.875) (end -9.4 -13.675) (layer Cmts.User) (width 0.1))
+  (fp_line (start -13.8 -13.875) (end -13.6 -13.675) (layer Cmts.User) (width 0.1))
+  (fp_line (start -13.8 -13.875) (end -13.6 -14.075) (layer Cmts.User) (width 0.1))
+  (fp_line (start 9.2 -13.875) (end 9.4 -13.675) (layer Cmts.User) (width 0.1))
+  (fp_line (start 9.2 -13.875) (end 9.4 -14.075) (layer Cmts.User) (width 0.1))
+  (fp_line (start 13.8 -13.875) (end 13.6 -13.675) (layer Cmts.User) (width 0.1))
+  (fp_line (start 13.8 -13.875) (end 13.6 -14.075) (layer Cmts.User) (width 0.1))
+  (fp_line (start 9.2 -13.875) (end 13.8 -13.875) (layer Cmts.User) (width 0.1))
+  (fp_line (start 14 -11.585) (end 12 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 14 -13.2) (end 10 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 14 -14.815) (end 8 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 14 -16.43) (end 6 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 14 -18.045) (end 4 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 14 -19.66) (end 2 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 13.475 -20.75) (end 0 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 11.475 -20.75) (end -2 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 9.475 -20.75) (end -4 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 7.475 -20.75) (end -6 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -8 -9.97) (end 5.475 -20.75) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 3.475 -20.75) (end -10 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 1.475 -20.75) (end -12 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -0.525 -20.75) (end -14 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -2.525 -20.75) (end -14 -11.585) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -4.525 -20.75) (end -14 -13.2) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -6.525 -20.75) (end -14 -14.815) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -8.525 -20.75) (end -14 -16.43) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -10.525 -20.75) (end -14 -18.045) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -12.525 -20.75) (end -14 -19.66) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 9.75 -9.72) (end 14.25 -9.72) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -14.25 -9.72) (end -9.75 -9.72) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 14.25 -21) (end 14.25 -9.72) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -14.25 -21) (end -14.25 -9.72) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 14 -20.75) (end -14 -20.75) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 14 -9.97) (end 14 -20.75) (layer Dwgs.User) (width 0.1))
+  (fp_line (start 14 -9.97) (end -14 -9.97) (layer Dwgs.User) (width 0.1))
+  (fp_line (start -9 -9.02) (end -8.5 -9.52) (layer F.Fab) (width 0.1))
+  (fp_line (start -8.5 -9.52) (end -9 -10.02) (layer F.Fab) (width 0.1))
+  (fp_line (start -9 -9.02) (end -9 9.76) (layer F.Fab) (width 0.1))
+  (fp_line (start -14.25 -21) (end 14.25 -21) (layer F.CrtYd) (width 0.05))
+  (fp_line (start 9.75 -9.72) (end 9.75 10.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -9.75 10.5) (end 9.75 10.5) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -9.75 10.5) (end -9.75 -9.72) (layer F.CrtYd) (width 0.05))
+  (fp_line (start -9 -15.745) (end 9 -15.745) (layer F.Fab) (width 0.1))
+  (fp_line (start -9 -15.745) (end -9 -10.02) (layer F.Fab) (width 0.1))
+  (fp_line (start -9 9.76) (end 9 9.76) (layer F.Fab) (width 0.1))
+  (fp_line (start 9 9.76) (end 9 -15.745) (layer F.Fab) (width 0.1))
+  (fp_line (start -14 -9.97) (end -14 -20.75) (layer Dwgs.User) (width 0.1))
+  (fp_text user %R (at 0 0) (layer F.Fab)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user "KEEP-OUT ZONE" (at 0 -19) (layer Cmts.User)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user Antenna (at 0 -13) (layer Cmts.User)
+    (effects (font (size 1 1) (thickness 0.15)))
+  )
+  (fp_text user "5 mm" (at 11.8 -14.375) (layer Cmts.User)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (fp_text user "5 mm" (at -11.2 -14.375) (layer Cmts.User)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (fp_text user "5 mm" (at 7.8 -19.075 90) (layer Cmts.User)
+    (effects (font (size 0.5 0.5) (thickness 0.1)))
+  )
+  (pad 39 smd rect (at -1 -0.755) (size 5 5) (layers F.Cu F.Paste F.Mask))
+  (pad 1 smd rect (at -8.5 -8.255) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 2 smd rect (at -8.5 -6.985) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 3 smd rect (at -8.5 -5.715) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 4 smd rect (at -8.5 -4.445) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 5 smd rect (at -8.5 -3.175) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 6 smd rect (at -8.5 -1.905) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 7 smd rect (at -8.5 -0.635) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 8 smd rect (at -8.5 0.635) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 9 smd rect (at -8.5 1.905) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 10 smd rect (at -8.5 3.175) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 11 smd rect (at -8.5 4.445) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 12 smd rect (at -8.5 5.715) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 13 smd rect (at -8.5 6.985) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 14 smd rect (at -8.5 8.255) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 15 smd rect (at -5.715 9.255 90) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 16 smd rect (at -4.445 9.255 90) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 17 smd rect (at -3.175 9.255 90) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 18 smd rect (at -1.905 9.255 90) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 19 smd rect (at -0.635 9.255 90) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 20 smd rect (at 0.635 9.255 90) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 21 smd rect (at 1.905 9.255 90) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 22 smd rect (at 3.175 9.255 90) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 23 smd rect (at 4.445 9.255 90) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 24 smd rect (at 5.715 9.255 90) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 25 smd rect (at 8.5 8.255) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 26 smd rect (at 8.5 6.985) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 27 smd rect (at 8.5 5.715) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 28 smd rect (at 8.5 4.445) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 29 smd rect (at 8.5 3.175) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 30 smd rect (at 8.5 1.905) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 31 smd rect (at 8.5 0.635) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 32 smd rect (at 8.5 -0.635) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 33 smd rect (at 8.5 -1.905) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 34 smd rect (at 8.5 -3.175) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 35 smd rect (at 8.5 -4.445) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 36 smd rect (at 8.5 -5.715) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 37 smd rect (at 8.5 -6.985) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (pad 38 smd rect (at 8.5 -8.255) (size 2 0.9) (layers F.Cu F.Paste F.Mask))
+  (model ${KISYS3DMOD}/RF_Module.3dshapes/ESP32-WROOM-32.wrl
+    (at (xyz 0 0 0))
+    (scale (xyz 1 1 1))
+    (rotate (xyz 0 0 0))
+  )
+)