diff --git a/emulator/Cargo.toml b/emulator/Cargo.toml
index ae25636..814268d 100644
--- a/emulator/Cargo.toml
+++ b/emulator/Cargo.toml
@@ -6,20 +6,21 @@ edition = "2021"
 [dependencies]
 esp32-hal = { version = "0.18.0", optional = true, default-features = false, features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread"] }
 esp32s2-hal = { version = "0.15.0", optional = true, default-features = false, features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread"] }
-esp32s3-hal = { version = "0.15.0", optional = true, default-features = false, features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread"] }
+esp-hal = { version = "1.0.0-beta.1", optional = true, features = [ "esp32s3", "psram"] }
 esp32c3-hal = { version = "0.15.0", optional = true, default-features = false, features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread"] }
 esp32c6-hal = { version = "0.8.0", optional = true, default-features = false, features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread"] }
 #esp32h2-hal = { version = "0.5.0", optional = true, default-features = false, features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread"] }
 
-embassy-executor = { version = "0.5.0", package = "embassy-executor", features = ["nightly", "integrated-timers"] }
-embedded-graphics = "0.8.0"
-embedded-io-async  = "0.6.1"
-embassy-time = { version = "0.3.0" }
+embassy-executor    = { version = "0.7.0", features = ["task-arena-size-20480"] }
+embassy-sync        = "0.7.0"
+embassy-time        = "0.4.0"
+esp-hal-embassy = { version = "0.8.1", features = ["esp32s3"] }
+static_cell         = { version = "2.1.0", features = ["nightly"] }
 # hal = { package = "esp32c6-hal", version = "0.7.0" , features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread"] }
 log = "0.4"
 mipidsi = "0.7.1"
 rustzx-core = {  git = "https://github.com/georgik/rustzx.git", branch = "feature/performance-bounding-box", features = ["embedded-roms"] }
-esp-display-interface-spi-dma = { version = "0.1.0" }
+#esp-display-interface-spi-dma = { version = "0.1.0" }
 
 esp-bsp = { version = "0.2.0" }
 graphics = { path = "../graphics" }
@@ -28,13 +29,15 @@ usb-zx = { path = "../usb-zx" }
 
 [features]
 # default = [ "esp32" ]
-esp32 =   [ "esp32-hal", "esp-display-interface-spi-dma/esp32" ]
-esp32s2 = [ "esp32s2-hal", "esp-display-interface-spi-dma/esp32s2" ]
-esp32s3 = [ "esp32s3-hal", "esp-display-interface-spi-dma/esp32s3" ]
-esp32c3 = [ "esp32c3-hal", "esp-display-interface-spi-dma/esp32c3" ]
-esp32c6 = [ "esp32c6-hal", "esp-display-interface-spi-dma/esp32c6" ]
+#esp32 =   [ "esp32-hal", "esp-display-interface-spi-dma/esp32" ]
+#esp32s2 = [ "esp32s2-hal", "esp-display-interface-spi-dma/esp32s2" ]
+esp32s3 = [ "esp-hal" ]
+#esp32s3 = [ "esp-hal", "esp-display-interface-spi-dma/esp32s3" ]
+
+#esp32c3 = [ "esp32c3-hal", "esp-display-interface-spi-dma/esp32c3" ]
+#esp32c6 = [ "esp32c6-hal", "esp-display-interface-spi-dma/esp32c6" ]
 #esp32h2 = [ "esp32h2-hal", "esp-display-interface-spi-dma/esp32h2" ]
 
-esp32_c6_devkit_c1 = [ "esp32c6" ]
-esp32_s3_box = [ "esp32s3", "esp32s3-hal/opsram-8m" ]
-m5stack_cores3 = [ "esp32s3", "esp32s3-hal/psram-8m" ]
+#esp32_c6_devkit_c1 = [ "esp32c6" ]
+esp32_s3_box = [ "esp32s3", "esp-hal/psram" ]
+#m5stack_cores3 = [ "esp32s3", "esp32s3-hal/psram-8m" ]
diff --git a/esp-now-keyboard/Cargo.toml b/esp-now-keyboard/Cargo.toml
index 8ee2c74..13e33bb 100644
--- a/esp-now-keyboard/Cargo.toml
+++ b/esp-now-keyboard/Cargo.toml
@@ -11,9 +11,11 @@ esp32c3-hal = { version = "0.15.0", optional = true, default-features = false, f
 esp32c6-hal = { version = "0.8.0", optional = true, default-features = false, features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread"] }
 esp32h2-hal = { version = "0.6.0", optional = true, default-features = false, features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread"] }
 
-embassy-executor = { version = "0.5.0", package = "embassy-executor", features = ["nightly", "integrated-timers"] }
-embedded-io-async  = "0.6.1"
-embassy-time = { version = "0.3.0" }
+embassy-executor    = { version = "0.7.0", features = ["task-arena-size-20480"] }
+embassy-sync        = "0.7.0"
+embassy-time        = "0.4.0"
+esp-hal-embassy = { version = "0.8.1", features = ["esp32s3"] }
+static_cell         = { version = "2.1.0", features = ["nightly"] }
 esp-wifi  = { version = "0.3.0", features = [ "wifi", "utils", "tcp", "smoltcp", "esp-now"] }
 # hal = { package = "esp32c6-hal", version = "0.7.0" , features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread"] }
 keyboard-pipe = { path = "../keyboard-pipe" }
diff --git a/esp32-s3-box/.cargo/config.toml b/esp32-s3-box/.cargo/config.toml
index 8a6e473..09b1c92 100644
--- a/esp32-s3-box/.cargo/config.toml
+++ b/esp32-s3-box/.cargo/config.toml
@@ -17,7 +17,6 @@ target = "xtensa-esp32s3-none-elf"
 build-std = [ "core", "alloc" ]
 
 [env]
-# Use clean build after changing ESP_LOGLEVEL
-#ESP_LOGLEVEL="TRACE"
-ESP_LOGLEVEL="DEBUG"
+ESP_LOG="INFO"
+ESP_HAL_CONFIG_PSRAM_MODE = "octal"
 
diff --git a/esp32-s3-box/Cargo.toml b/esp32-s3-box/Cargo.toml
index df00899..2a35368 100644
--- a/esp32-s3-box/Cargo.toml
+++ b/esp32-s3-box/Cargo.toml
@@ -6,47 +6,47 @@ edition = "2021"
 license = "MIT"
 
 [target.xtensa-esp32s3-none-elf.dependencies]
-hal = { package = "esp32s3-hal", version = "0.15.0", features = ["embassy", "async", "embassy-time-timg0", "rt", "embassy-executor-thread", "opsram-8m"] }
-esp-backtrace = { version = "0.10.0", features = [
+esp-hal = { version = "1.0.0-beta.1", features = [ "esp32s3", "psram", "unstable"] }
+esp-backtrace = { version = "0.16.0", features = [
     "esp32s3",
     "panic-handler",
-    "print-uart",
+    "println"
 ] }
-esp-println = { version = "0.8.0", features = ["esp32s3", "log"] }
+esp-println = { version = "0.14.0", features = [ "log-04" ] }
 
 [dependencies]
-critical-section = { version = "1.1.2" }
-display-interface = "0.4"
-esp-alloc = "0.3.0"
-embassy-sync = { version = "0.5.0" }
-embassy-futures = { version = "0.1.0" }
-embassy-executor = { version = "0.5.0", package = "embassy-executor", features = ["nightly", "integrated-timers"] }
-embassy-time = { version = "0.3.0" }
-embedded-graphics = "0.8.0"
+critical-section = { version = "1.2.0" }
+display-interface = "0.5.0"
+esp-alloc = "0.8.0"
+embassy-executor    = { version = "0.7.0", features = ["task-arena-size-20480"] }
+embassy-sync        = "0.7.0"
+embassy-time        = "0.4.0"
+esp-hal-embassy = { version = "0.8.1", features = ["esp32s3"] }
+static_cell         = { version = "2.1.0", features = ["nightly"] }
+embedded-graphics = "0.8.1"
 embedded-hal = "1.0.0"
 embedded-graphics-framebuf = { version = "0.3.0", git = "https://github.com/georgik/embedded-graphics-framebuf.git", branch = "feature/embedded-graphics-0.8" }
 icm42670 = { git = "https://github.com/jessebraham/icm42670/" }
 log = "0.4"
-mipidsi = "0.7.1"
+mipidsi = "0.9.0"
 #panic-halt = "0.2"
-shared-bus = { version = "0.3.0" }
+shared-bus = { version = "0.3.1" }
 #spooky-core = { git = "https://github.com/georgik/esp32-spooky-maze-game.git", rev = "fb5f755", default-features = false, features = ["static_maze"]}
 #spooky-embedded = { git = "https://github.com/georgik/esp32-spooky-maze-game.git", rev = "fb5f755", default-features = false, features = [ "esp32s3", "static_maze", "resolution_320x240" ] }
-esp-display-interface-spi-dma = { version = "0.1.0", features = ["esp32s3"] }
+#esp-display-interface-spi-dma = { version = "0.1.0", features = ["esp32s3"] }
 #rustzx-utils = { version = "0.16.0" }
 #rustzx-core = { version = "0.16.0", features = ["embedded-roms"] }
 #rustzx-utils = { path = "../../rustzx/rustzx-utils" }
 #rustzx-core = { path = "../../rustzx/rustzx-core" , features = ["embedded-roms"] }
 rustzx-utils = { git = "https://github.com/georgik/rustzx.git", branch = "feature/performance-bounding-box" }
 rustzx-core = {  git = "https://github.com/georgik/rustzx.git", branch = "feature/performance-bounding-box", features = ["embedded-roms"] }
-esp-wifi  = { version = "0.3.0", features = [ "wifi", "utils", "tcp", "smoltcp", "dhcpv4", "phy-enable-usb"] }
+#esp-wifi  = { version = "0.3.0", features = [ "wifi", "utils", "tcp", "smoltcp", "dhcpv4", "phy-enable-usb"] }
 
-usb-zx = { path = "../usb-zx" }
-static_cell = { version = "2.0.0", features = ["nightly"] }
+#usb-zx = { path = "../usb-zx" }
 #esp-bsp = { version = "0.1.0" }
-esp-bsp = { git = "https://github.com/georgik/esp-bsp-rs", branch = "feature/display_interface_spi_dma" }
+#esp-bsp = { git = "https://github.com/georgik/esp-bsp-rs", branch = "feature/display_interface_spi_dma" }
 graphics = { path = "../graphics" }
-keyboard-pipe = { path = "../keyboard-pipe" }
-uart-keyboard = { path = "../uart-keyboard", features = [ "esp32s3" ] }
-esp-now-keyboard = { path = "../esp-now-keyboard", features = [ "esp32s3" ] }
+#keyboard-pipe = { path = "../keyboard-pipe" }
+#uart-keyboard = { path = "../uart-keyboard", features = [ "esp32s3" ] }
+#esp-now-keyboard = { path = "../esp-now-keyboard", features = [ "esp32s3" ] }
 emulator = { path = "../emulator", features = [ "esp32_s3_box" ] }