diff --git a/pkgs/rime-all/package.nix b/pkgs/rime-all/package.nix
index 834d446..873152e 100644
--- a/pkgs/rime-all/package.nix
+++ b/pkgs/rime-all/package.nix
@@ -4,6 +4,8 @@
   rime-moegirl,
   rime-zhwiki,
   buildEnv,
+  librime,
+  rime-data,
 }:
 buildEnv {
   name = "rime-all";
@@ -13,9 +15,19 @@ buildEnv {
     rime-zhwiki
     rime-moegirl
   ];
+  nativeBuildInputs = [
+    librime
+  ];
   postBuild = ''
     ln -s ${./yustar_sc.custom.yaml} $out/share/rime-data/yustar_sc.custom.yaml
     ln -s ${./double_pinyin_flypy.custom.yaml} $out/share/rime-data/double_pinyin_flypy.custom.yaml
     ln -s ${./default.custom.yaml} $out/share/rime-data/default.custom.yaml
+
+    cd $out/share/rime-data/
+    for s in *.schema.yaml; do
+      rime_deployer --compile "$s" . "${rime-data}/share/rime-data/" ./build
+    done
+
+    rm ./build/*.txt
   '';
 }
diff --git a/pkgs/rime-yuhaostar/package.nix b/pkgs/rime-yuhaostar/package.nix
index 828efdc..4c807ee 100644
--- a/pkgs/rime-yuhaostar/package.nix
+++ b/pkgs/rime-yuhaostar/package.nix
@@ -20,7 +20,6 @@ in
     sourceRoot = "schema";
 
     patches = [
-      ./punctuator.patch
       ./key_binder.patch
     ];
 
diff --git a/pkgs/rime-yuhaostar/punctuator.patch b/pkgs/rime-yuhaostar/punctuator.patch
deleted file mode 100644
index 9b83efa..0000000
--- a/pkgs/rime-yuhaostar/punctuator.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff --git a/yuhao_pinyin.schema.yaml b/yuhao_pinyin.schema.yaml
-index 7b5f1cb..f036a64 100644
---- a/yuhao_pinyin.schema.yaml
-+++ b/yuhao_pinyin.schema.yaml
-@@ -60,7 +60,7 @@ translator:
-     - xform/([jqxy])v/$1u/
- 
- punctuator:
--  import_preset: symbols
-+  import_preset: default
-   half_shape:
-     "`": "`"
-     "#": "#"
-diff --git a/yustar.schema.yaml b/yustar.schema.yaml
-index e4b432c..a2da46c 100644
---- a/yustar.schema.yaml
-+++ b/yustar.schema.yaml
-@@ -292,7 +292,7 @@ yuhao_macro:
-         expr: return require("yuhao.yuhao_core").unicode()
- 
- punctuator:
--  import_preset: symbols
-+  import_preset: default
-   half_shape:
-     "`": "`"
-     "#": "#"
-diff --git a/yustar_sc.schema.yaml b/yustar_sc.schema.yaml
-index 806f636..c57500c 100644
---- a/yustar_sc.schema.yaml
-+++ b/yustar_sc.schema.yaml
-@@ -286,7 +286,7 @@ yuhao_macro:
-         expr: return require("yuhao.yuhao_core").unicode()
- 
- punctuator:
--  import_preset: symbols
-+  import_preset: default
-   half_shape:
-     "`": "`"
-     "#": "#"
-diff --git a/yustar_tw.schema.yaml b/yustar_tw.schema.yaml
-index 93943fe..8370091 100644
---- a/yustar_tw.schema.yaml
-+++ b/yustar_tw.schema.yaml
-@@ -285,7 +285,7 @@ yuhao_macro:
-         expr: return require("yuhao.yuhao_core").unicode()
- 
- punctuator:
--  import_preset: symbols
-+  import_preset: default
-   half_shape:
-     "`": "`"
-     "#": "#"