diff --git a/frontend/src/app/main/data/comments.cljs b/frontend/src/app/main/data/comments.cljs
index 5276dd781d..3aae536949 100644
--- a/frontend/src/app/main/data/comments.cljs
+++ b/frontend/src/app/main/data/comments.cljs
@@ -97,12 +97,12 @@
 
      ptk/WatchEvent
      (watch [it _ _]
-       (rx/of (ptk/data-event ::ev/event
-                              (merge {::ev/name "create-comment-thread"
-                                      ::ev/origin "workspace"
-                                      :id id
-                                      :content-size (count (:content comment))}
-                                     (meta it))))))))
+       (rx/of (ev/event
+               (merge {::ev/name "create-comment-thread"
+                       ::ev/origin "workspace"
+                       :id id
+                       :content-size (count (:content comment))}
+                      (meta it))))))))
 
 (def ^:private
   schema:create-thread-on-workspace
@@ -156,11 +156,11 @@
 
     ptk/WatchEvent
     (watch [_ _ _]
-      (rx/of (ptk/data-event ::ev/event
-                             {::ev/name "create-comment-thread"
-                              ::ev/origin "viewer"
-                              :id id
-                              :content-size (count (:content comment))})))))
+      (rx/of (ev/event
+              {::ev/name "create-comment-thread"
+               ::ev/origin "viewer"
+               :id id
+               :content-size (count (:content comment))})))))
 
 (def ^:private
   schema:create-thread-on-viewer
@@ -224,8 +224,7 @@
       (let [share-id (-> state :viewer-local :share-id)]
         (rx/concat
          (when is-resolved
-           (rx/of (ptk/event
-                   ::ev/event
+           (rx/of (ev/event
                    (-> {::ev/name "resolve-comment-thread" :thread-id id}
                        (merge (meta it))))))
          (->> (rp/cmd! :update-comment-thread {:id id :is-resolved is-resolved :share-id share-id})
@@ -322,12 +321,12 @@
              (rx/catch #(rx/throw {:type :comment-error}))
              (rx/tap on-delete)
              (rx/ignore))
-        (rx/of (ptk/data-event ::ev/event
-                               (merge
-                                {::ev/name "delete-comment-thread"
-                                 ::ev/origin "workspace"
-                                 :id id}
-                                (meta it)))))))))
+        (rx/of (ev/event
+                (merge
+                 {::ev/name "delete-comment-thread"
+                  ::ev/origin "workspace"
+                  :id id}
+                 (meta it)))))))))
 
 (defn delete-comment-thread-on-viewer
   [{:keys [id] :as thread}]
@@ -350,10 +349,10 @@
          (->> (rp/cmd! :delete-comment-thread {:id id :share-id share-id})
               (rx/catch #(rx/throw {:type :comment-error}))
               (rx/ignore))
-         (rx/of (ptk/data-event ::ev/event
-                                {::ev/name "delete-comment-thread"
-                                 ::ev/origin "viewer"
-                                 :id id})))))))
+         (rx/of (ev/event
+                 {::ev/name "delete-comment-thread"
+                  ::ev/origin "viewer"
+                  :id id})))))))
 (defn delete-comment
   [{:keys [id thread-id] :as comment}]
   (dm/assert!
diff --git a/frontend/src/app/main/data/dashboard.cljs b/frontend/src/app/main/data/dashboard.cljs
index a5ce2cd2c3..85f1ef8581 100644
--- a/frontend/src/app/main/data/dashboard.cljs
+++ b/frontend/src/app/main/data/dashboard.cljs
@@ -479,7 +479,7 @@
            (->> (rp/cmd! :get-file-summary {:id id})
                 (rx/map (fn [summary]
                           (when (-> summary :variants :count pos?)
-                            (ptk/event ::ev/event {::ev/name "set-file-variants-shared" ::ev/origin "dashboard"})))))))))))
+                            (ev/event {::ev/name "set-file-variants-shared" ::ev/origin "dashboard"})))))))))))
 
 (defn set-file-thumbnail
   [file-id thumbnail-id]
diff --git a/frontend/src/app/main/data/exports/assets.cljs b/frontend/src/app/main/data/exports/assets.cljs
index f2c8315a90..dccbb99c81 100644
--- a/frontend/src/app/main/data/exports/assets.cljs
+++ b/frontend/src/app/main/data/exports/assets.cljs
@@ -267,8 +267,7 @@
                           counts))
                       {:png 0, :jpeg 0, :webp 0, :pdf 0, :svg 0}
                       exports)]
-    (ptk/event
-     ::ev/event (merge types
-                       {::ev/name "export-shapes"
-                        ::ev/origin origin
-                        :num-shapes (count exports)}))))
+    (ev/event (merge types
+                     {::ev/name "export-shapes"
+                      ::ev/origin origin
+                      :num-shapes (count exports)}))))
diff --git a/frontend/src/app/main/data/fonts.cljs b/frontend/src/app/main/data/fonts.cljs
index 28f702ed8a..63c7e61bf5 100644
--- a/frontend/src/app/main/data/fonts.cljs
+++ b/frontend/src/app/main/data/fonts.cljs
@@ -261,12 +261,12 @@
     ptk/WatchEvent
     (watch [_ state _]
       (let [team-id (:current-team-id state)]
-        (rx/of (ptk/data-event ::ev/event {::ev/name "add-font"
-                                           :team-id team-id
-                                           :font-id (:id font)
-                                           :font-family (:font-family font)
-                                           :font-style (:font-style font)
-                                           :font-weight (:font-weight font)}))))))
+        (rx/of (ev/event {::ev/name "add-font"
+                          :team-id team-id
+                          :font-id (:id font)
+                          :font-family (:font-family font)
+                          :font-style (:font-style font)
+                          :font-weight (:font-weight font)}))))))
 
 (defn update-font
   [{:keys [id name] :as params}]
@@ -310,9 +310,9 @@
         (rx/concat
          (->> (rp/cmd! :delete-font {:id font-id :team-id team-id})
               (rx/ignore))
-         (rx/of (ptk/data-event ::ev/event {::ev/name "delete-font"
-                                            :team-id team-id
-                                            :font-id font-id})))))))
+         (rx/of (ev/event {::ev/name "delete-font"
+                           :team-id team-id
+                           :font-id font-id})))))))
 
 (defn delete-font-variant
   [id]
@@ -331,9 +331,9 @@
         (rx/concat
          (->> (rp/cmd! :delete-font-variant {:id id :team-id team-id})
               (rx/ignore))
-         (rx/of (ptk/data-event ::ev/event {::ev/name "delete-font-variant"
-                                            :id id
-                                            :team-id team-id})))))))
+         (rx/of (ev/event {::ev/name "delete-font-variant"
+                           :id id
+                           :team-id team-id})))))))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/frontend/src/app/main/data/profile.cljs b/frontend/src/app/main/data/profile.cljs
index 66ded6fc8b..fc98a6a5e2 100644
--- a/frontend/src/app/main/data/profile.cljs
+++ b/frontend/src/app/main/data/profile.cljs
@@ -152,10 +152,10 @@
 
            (when (not= (:theme profile)
                        (:theme profile'))
-             (rx/of (ptk/data-event ::ev/event
-                                    {::ev/name "activate-theme"
-                                     ::ev/origin "settings"
-                                     :theme (:theme profile)})))))))))
+             (rx/of (ev/event
+                     {::ev/name "activate-theme"
+                      ::ev/origin "settings"
+                      :theme (:theme profile)})))))))))
 
 ;; --- Toggle Theme
 
@@ -186,9 +186,9 @@
     (watch [it state _]
       (let [profile (get state :profile)
             origin  (::ev/origin (meta it))]
-        (rx/of (ptk/data-event ::ev/event {:theme (:theme profile)
-                                           ::ev/name "activate-theme"
-                                           ::ev/origin origin})
+        (rx/of (ev/event {:theme (:theme profile)
+                          ::ev/name "activate-theme"
+                          ::ev/origin origin})
                (persist-profile))))))
 
 ;; --- Request Email Change
diff --git a/frontend/src/app/main/data/team.cljs b/frontend/src/app/main/data/team.cljs
index 60846d88bd..cf0576150c 100644
--- a/frontend/src/app/main/data/team.cljs
+++ b/frontend/src/app/main/data/team.cljs
@@ -176,10 +176,10 @@
                           (rx/of (dp/refresh-profile)
                                  (fetch-members team-id)
                                  (fetch-teams)
-                                 (ptk/data-event ::ev/event
-                                                 {::ev/name "delete-team-member"
-                                                  :team-id team-id
-                                                  :member-id member-id})))))))))
+                                 (ev/event
+                                  {::ev/name "delete-team-member"
+                                   :team-id team-id
+                                   :member-id member-id})))))))))
 
 
 (defn- stats-fetched
@@ -240,9 +240,9 @@
              (rx/tap on-success)
              (rx/mapcat (fn [_]
                           (rx/of (fetch-teams)
-                                 (ptk/data-event ::ev/event
-                                                 {::ev/name "update-team-photo"
-                                                  :team-id team-id}))))
+                                 (ev/event
+                                  {::ev/name "update-team-photo"
+                                   :team-id team-id}))))
              (rx/catch on-error))))))
 
 
@@ -345,10 +345,10 @@
                 (rx/merge
                  (rx/of (team-leaved params)
                         (fetch-teams)
-                        (ptk/data-event ::ev/event
-                                        {::ev/name "leave-team"
-                                         :reassign-to reassign-to
-                                         :team-id team-id}))
+                        (ev/event
+                         {::ev/name "leave-team"
+                          :reassign-to reassign-to
+                          :team-id team-id}))
                  (on-success))))
              (rx/catch on-error))))))
 
diff --git a/frontend/src/app/main/data/viewer.cljs b/frontend/src/app/main/data/viewer.cljs
index c1f6083d13..d2ebf4c9dc 100644
--- a/frontend/src/app/main/data/viewer.cljs
+++ b/frontend/src/app/main/data/viewer.cljs
@@ -82,7 +82,7 @@
              (when (some? (:profile state))
                (fetch-comment-threads params))
              (when (:share-id params)
-               (rx/of (ptk/event ::ev/event {::ev/name "shared-prototipe-visited"})))))
+               (rx/of (ev/event {::ev/name "shared-prototipe-visited"})))))
     ptk/EffectEvent
     (effect [_ _ _]
       ;; Set the window name, the window name is used on inter-tab
diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs
index 0d8025fd35..b9c3afe82f 100644
--- a/frontend/src/app/main/data/workspace.cljs
+++ b/frontend/src/app/main/data/workspace.cljs
@@ -1343,7 +1343,7 @@
         (rx/concat
          (rx/of (dch/commit-changes changes))
          (when (nil? annotation)
-           (rx/of (ptk/data-event ::ev/event {::ev/name "delete-component-annotation"}))))))))
+           (rx/of (ev/event {::ev/name "delete-component-annotation"}))))))))
 
 (defn set-annotations-expanded
   [expanded]
@@ -1365,7 +1365,7 @@
     ptk/WatchEvent
     (watch [_ _ _]
       (when (some? id)
-        (rx/of (ptk/data-event ::ev/event {::ev/name "create-component-annotation"}))))))
+        (rx/of (ev/event {::ev/name "create-component-annotation"}))))))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Preview blend modes
diff --git a/frontend/src/app/main/data/workspace/clipboard.cljs b/frontend/src/app/main/data/workspace/clipboard.cljs
index e32de485e5..096bd01b62 100644
--- a/frontend/src/app/main/data/workspace/clipboard.cljs
+++ b/frontend/src/app/main/data/workspace/clipboard.cljs
@@ -960,7 +960,7 @@
                   (ptk/data-event :layout/update {:ids [frame-id]})
                   (dwu/commit-undo-transaction undo-id)
                   (when add-component-to-variant?
-                    (ptk/event ::ev/event {::ev/name "add-component-to-variant"})))))))))
+                    (ev/event {::ev/name "add-component-to-variant"})))))))))
 
 (defn- as-content [text]
   (let [paragraphs (->> (str/lines text)
diff --git a/frontend/src/app/main/data/workspace/libraries.cljs b/frontend/src/app/main/data/workspace/libraries.cljs
index 48a2e8d0b6..0e688517a2 100644
--- a/frontend/src/app/main/data/workspace/libraries.cljs
+++ b/frontend/src/app/main/data/workspace/libraries.cljs
@@ -602,12 +602,12 @@
          (when id-ref
            (reset! id-ref (:id new-shape)))
 
-         (rx/of (ptk/event ::ev/event
-                           (-> {::ev/name "use-library-component"
-                                ::ev/origin origin
-                                :external-library (not= file-id current-file-id)
-                                :is-variant (ctk/is-variant? component)}
-                               (merge (meta it))))
+         (rx/of (ev/event
+                 (-> {::ev/name "use-library-component"
+                      ::ev/origin origin
+                      :external-library (not= file-id current-file-id)
+                      :is-variant (ctk/is-variant? component)}
+                     (merge (meta it))))
                 (dwu/start-undo-transaction undo-id)
                 (dch/commit-changes changes)
                 (ptk/data-event :layout/update {:ids [(:id new-shape)]})
@@ -1401,7 +1401,7 @@
                                     vals
                                     (some ctk/is-variant?))]
              (if has-variants?
-               (rx/of (ptk/event ::ev/event {::ev/name "set-file-variants-shared" ::ev/origin "workspace"}))
+               (rx/of (ev/event {::ev/name "set-file-variants-shared" ::ev/origin "workspace"}))
                (rx/empty)))))))))
 
 ;; --- Link and unlink Files
@@ -1465,11 +1465,11 @@
          (when (pos? variants-count)
            (->> (rp/cmd! :get-library-usage {:file-id library-id})
                 (rx/map (fn [library-usage]
-                          (ptk/event ::ev/event {::ev/name "attach-library-variants"
-                                                 :file-id file-id
-                                                 :library-id library-id
-                                                 :variants-count variants-count
-                                                 :library-used-in (:used-in library-usage)}))))))))))
+                          (ev/event {::ev/name "attach-library-variants"
+                                     :file-id file-id
+                                     :library-id library-id
+                                     :variants-count variants-count
+                                     :library-used-in (:used-in library-usage)}))))))))))
 
 (defn unlink-file-from-library
   [file-id library-id]
diff --git a/frontend/src/app/main/data/workspace/shape_layout.cljs b/frontend/src/app/main/data/workspace/shape_layout.cljs
index 163195f11f..833501b964 100644
--- a/frontend/src/app/main/data/workspace/shape_layout.cljs
+++ b/frontend/src/app/main/data/workspace/shape_layout.cljs
@@ -305,11 +305,11 @@
                 (ptk/data-event :layout/update {:ids ids})
                 (dwu/commit-undo-transaction undo-id)
                 (when (or (:layout-align-content changes) (:layout-justify-content changes))
-                  (ptk/event ::ev/event
-                             {::ev/name "layout-change-alignment"}))
+                  (ev/event
+                   {::ev/name "layout-change-alignment"}))
                 (when (or (:layout-padding changes) (:layout-gap changes))
-                  (ptk/event ::ev/event
-                             {::ev/name "layout-change-margin"}))))))))
+                  (ev/event
+                   {::ev/name "layout-change-margin"}))))))))
 
 (defn add-layout-track
   ([ids type value]
diff --git a/frontend/src/app/main/data/workspace/shortcuts.cljs b/frontend/src/app/main/data/workspace/shortcuts.cljs
index 4f4d9296cc..eb2b55189d 100644
--- a/frontend/src/app/main/data/workspace/shortcuts.cljs
+++ b/frontend/src/app/main/data/workspace/shortcuts.cljs
@@ -602,7 +602,7 @@
                            :subsections [:basics]
                            :fn #(when (features/active-feature? @st/state "plugins/runtime")
                                   (st/emit!
-                                   (ptk/event ::ev/event {::ev/name "open-plugins-manager" ::ev/origin "workspace:shortcuts"})
+                                   (ev/event {::ev/name "open-plugins-manager" ::ev/origin "workspace:shortcuts"})
                                    (modal/show :plugin-management {})))}})
 
 (def debug-shortcuts
diff --git a/frontend/src/app/main/data/workspace/texts.cljs b/frontend/src/app/main/data/workspace/texts.cljs
index f08c942c94..d001aa3a67 100644
--- a/frontend/src/app/main/data/workspace/texts.cljs
+++ b/frontend/src/app/main/data/workspace/texts.cljs
@@ -897,8 +897,8 @@
 
         (rx/concat
          (rx/of (dwl/add-typography typ)
-                (ptk/event ::ev/event {::ev/name "add-asset-to-library"
-                                       :asset-type "typography"}))
+                (ev/event {::ev/name "add-asset-to-library"
+                           :asset-type "typography"}))
 
          (when (not multiple?)
            (rx/of (update-attrs (:id shape)
diff --git a/frontend/src/app/main/data/workspace/tokens/library_edit.cljs b/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
index d0f94cec5c..b60e07dddf 100644
--- a/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
+++ b/frontend/src/app/main/data/workspace/tokens/library_edit.cljs
@@ -426,8 +426,8 @@
                                           token))]
 
            (rx/of (dch/commit-changes changes)
-                  (ptk/data-event ::ev/event (-> {::ev/name "create-token" :type token-type}
-                                                 (merge (meta it))))))
+                  (ev/event (-> {::ev/name "create-token" :type token-type}
+                                (merge (meta it))))))
 
          (rx/of (create-token-with-set token)))))))
 
@@ -455,8 +455,8 @@
                                           id
                                           token'))]
          (rx/of (dch/commit-changes changes)
-                (ptk/data-event ::ev/event (-> {::ev/name "edit-token" :type token-type}
-                                               (merge (meta it))))))))))
+                (ev/event (-> {::ev/name "edit-token" :type token-type}
+                              (merge (meta it))))))))))
 
 (defn delete-token
   [set-id token-id]
@@ -477,8 +477,8 @@
                         (pcb/with-library-data data)
                         (pcb/set-token set-id token-id nil))]
         (rx/of (dch/commit-changes changes)
-               (ptk/data-event ::ev/event (-> {::ev/name "delete-token" :type token-type}
-                                              (merge (meta it)))))))))
+               (ev/event (-> {::ev/name "delete-token" :type token-type}
+                             (merge (meta it)))))))))
 
 (defn bulk-delete-tokens
   [set-id token-ids]
@@ -494,7 +494,7 @@
                                 (pcb/with-library-data data))
                             token-ids)]
         (rx/of (dch/commit-changes changes)
-               (ptk/data-event ::ev/event {::ev/name "delete-token-node"}))))))
+               (ev/event {::ev/name "delete-token-node"}))))))
 
 (defn duplicate-token
   [token-id]
diff --git a/frontend/src/app/main/data/workspace/versions.cljs b/frontend/src/app/main/data/workspace/versions.cljs
index f12565e239..f287455434 100644
--- a/frontend/src/app/main/data/workspace/versions.cljs
+++ b/frontend/src/app/main/data/workspace/versions.cljs
@@ -66,7 +66,7 @@
         ;; Force persist before creating snapshot, otherwise we could loss changes
         (rx/concat
          (rx/of ::dwp/force-persist
-                (ptk/event ::ev/event {::ev/name "create-version"}))
+                (ev/event {::ev/name "create-version"}))
 
          (->> (rx/from-atom refs/persistence-state {:emit-current-value? true})
               (rx/filter #(or (nil? %) (= :saved %)))
@@ -88,8 +88,8 @@
       (let [file-id (:current-file-id state)]
         (rx/merge
          (rx/of (update-versions-state {:editing nil})
-                (ptk/event ::ev/event {::ev/name "rename-version"
-                                       :file-id file-id}))
+                (ev/event {::ev/name "rename-version"
+                           :file-id file-id}))
          (->> (rp/cmd! :update-file-snapshot {:id id :label label})
               (rx/map fetch-versions)))))))
 
@@ -173,7 +173,7 @@
                (rx/mapcat (fn [_]
                             (rx/of (update-versions-state {:editing id})
                                    (fetch-versions)
-                                   (ptk/event ::ev/event {::ev/name "pin-version"}))))))))))
+                                   (ev/event {::ev/name "pin-version"}))))))))))
 
 (defn lock-version
   [id]
diff --git a/frontend/src/app/main/router.cljs b/frontend/src/app/main/router.cljs
index 405c8b6664..0f3575f61d 100644
--- a/frontend/src/app/main/router.cljs
+++ b/frontend/src/app/main/router.cljs
@@ -76,8 +76,7 @@
       (when send-event-info?
         (let [route  (dm/get-in match [:data :name])
               params (get match :query-params)]
-          (rx/of (ptk/event
-                  ::ev/event
+          (rx/of (ev/event
                   (assoc params
                          ::ev/name "navigate"
                          :route (name route)))))))
diff --git a/frontend/src/app/main/ui/dashboard.cljs b/frontend/src/app/main/ui/dashboard.cljs
index 04c376def4..25a6bad909 100644
--- a/frontend/src/app/main/ui/dashboard.cljs
+++ b/frontend/src/app/main/ui/dashboard.cljs
@@ -216,7 +216,7 @@
               (fn [plugin]
                 (if plugin
                   (do
-                    (st/emit! (ptk/event ::ev/event {::ev/name "install-plugin" :name (:name plugin) :url plugin-url}))
+                    (st/emit! (ev/event {::ev/name "install-plugin" :name (:name plugin) :url plugin-url}))
                     (open-permissions-dialog plugin))
                   (st/emit! (notif/error (tr "dashboard.plugins.parse-error")))))
               (fn [_]
@@ -245,12 +245,12 @@
                                          (dd/fetch-recent-files team-id)
                                          (dd/fetch-projects team-id)
                                          (dd/clear-selected-files)
-                                         (ptk/event ::ev/event {::ev/name "install-template-from-link-finished"
-                                                                :name template-name
-                                                                :url template-url}))]
+                                         (ev/event {::ev/name "install-template-from-link-finished"
+                                                    :name template-name
+                                                    :url template-url}))]
             (if valid-url?
               (st/emit!
-               (ptk/event ::ev/event {::ev/name "install-template-from-link" :name template-name :url template-url})
+               (ev/event {::ev/name "install-template-from-link" :name template-name :url template-url})
                (modal/show
                 {:type :import
                  :project-id project-id
diff --git a/frontend/src/app/main/ui/dashboard/comments.cljs b/frontend/src/app/main/ui/dashboard/comments.cljs
index e432a642c8..77cb907e15 100644
--- a/frontend/src/app/main/ui/dashboard/comments.cljs
+++ b/frontend/src/app/main/ui/dashboard/comments.cljs
@@ -81,8 +81,8 @@
      (mf/deps show?)
      (fn []
        (when show?
-         (st/emit! (ptk/event ::ev/event {::ev/name "open-comment-notifications"
-                                          ::ev/origin "dashboard"})))))
+         (st/emit! (ev/event {::ev/name "open-comment-notifications"
+                              ::ev/origin "dashboard"})))))
 
     [:div {:class (stl/css :dashboard-comments-section)}
      [:& dropdown {:show show? :on-close on-hide-comments :dropdown-id "dashboard-comments"}
diff --git a/frontend/src/app/main/ui/dashboard/import.cljs b/frontend/src/app/main/ui/dashboard/import.cljs
index 1510af2455..819d46cb45 100644
--- a/frontend/src/app/main/ui/dashboard/import.cljs
+++ b/frontend/src/app/main/ui/dashboard/import.cljs
@@ -171,14 +171,14 @@
          (rx/subs!
           (fn [message]
             (when (some? (:error message))
-              (st/emit! (ptk/data-event ::ev/event {::ev/name "import-files-error"
-                                                    :error (:error message)})))
+              (st/emit! (ev/event {::ev/name "import-files-error"
+                                   :error (:error message)})))
             (swap! state update-with-analyze-result message))))))
 
 (defn- import-files
   [state project-id entries]
-  (st/emit! (ptk/data-event ::ev/event {::ev/name "import-files"
-                                        :num-files (count entries)}))
+  (st/emit! (ev/event {::ev/name "import-files"
+                       :num-files (count entries)}))
 
   (let [features (get @st/state :features)]
     (->> (mw/ask-many!
diff --git a/frontend/src/app/main/ui/dashboard/placeholder.cljs b/frontend/src/app/main/ui/dashboard/placeholder.cljs
index bb32d71b5c..aa8f196475 100644
--- a/frontend/src/app/main/ui/dashboard/placeholder.cljs
+++ b/frontend/src/app/main/ui/dashboard/placeholder.cljs
@@ -27,9 +27,9 @@
         on-add-library
         (mf/use-fn
          (fn [_]
-           (st/emit! (ptk/event ::ev/event {::ev/name "explore-libraries-click"
-                                            ::ev/origin "dashboard"
-                                            :section "empty-placeholder-projects"}))
+           (st/emit! (ev/event {::ev/name "explore-libraries-click"
+                                ::ev/origin "dashboard"
+                                :section "empty-placeholder-projects"}))
            (dom/open-new-window "https://penpot.app/penpothub/libraries-templates")))
 
         on-import
diff --git a/frontend/src/app/main/ui/dashboard/projects.cljs b/frontend/src/app/main/ui/dashboard/projects.cljs
index 04ca802352..d2a8543ac1 100644
--- a/frontend/src/app/main/ui/dashboard/projects.cljs
+++ b/frontend/src/app/main/ui/dashboard/projects.cljs
@@ -344,8 +344,8 @@
         (mf/use-fn
          (fn []
            (reset! show-team-hero* false)
-           (st/emit! (ptk/data-event ::ev/event {::ev/name "dont-show-team-up-hero"
-                                                 ::ev/origin "dashboard"}))))]
+           (st/emit! (ev/event {::ev/name "dont-show-team-up-hero"
+                                ::ev/origin "dashboard"}))))]
 
     (mf/with-effect [show-team-hero?]
       (swap! storage/global assoc ::show-team-hero show-team-hero?))
diff --git a/frontend/src/app/main/ui/dashboard/sidebar.cljs b/frontend/src/app/main/ui/dashboard/sidebar.cljs
index 420cb162ac..b1f5d6ee40 100644
--- a/frontend/src/app/main/ui/dashboard/sidebar.cljs
+++ b/frontend/src/app/main/ui/dashboard/sidebar.cljs
@@ -869,8 +869,8 @@
                                (dom/get-data "url"))
                  eventname (-> (dom/get-current-target event)
                                (dom/get-data "eventname"))]
-             (st/emit! (ptk/event ::ev/event {::ev/name eventname
-                                              ::ev/origin "menu:in-app"}))
+             (st/emit! (ev/event {::ev/name eventname
+                                  ::ev/origin "menu:in-app"}))
              (dom/open-new-window url))))
 
         handle-feedback-click
@@ -914,8 +914,8 @@
                                (dom/get-data "url"))
                  eventname (-> (dom/get-current-target event)
                                (dom/get-data "eventname"))]
-             (st/emit! (ptk/event ::ev/event {::ev/name eventname
-                                              ::ev/origin "menu:in-app"}))
+             (st/emit! (ev/event {::ev/name eventname
+                                  ::ev/origin "menu:in-app"}))
              (dom/open-new-window url))))]
 
     [:> dropdown-menu* {:show true
@@ -942,7 +942,7 @@
         show-release-notes
         (mf/use-fn
          (fn [event]
-           (st/emit! (ptk/event ::ev/event {::ev/name "show-release-notes" :version (:main version)}))
+           (st/emit! (ev/event {::ev/name "show-release-notes" :version (:main version)}))
            (if (and (kbd/alt? event) (kbd/mod? event))
              (st/emit! (modal/show {:type :onboarding}))
              (st/emit! (modal/show {:type :release-notes :version (:main version)})))))
@@ -954,8 +954,8 @@
                                (dom/get-data "url"))
                  eventname (-> (dom/get-current-target event)
                                (dom/get-data "eventname"))]
-             (st/emit! (ptk/event ::ev/event {::ev/name eventname
-                                              ::ev/origin "menu:in-app"}))
+             (st/emit! (ev/event {::ev/name eventname
+                                  ::ev/origin "menu:in-app"}))
              (dom/open-new-window url))))]
 
     [:> dropdown-menu* {:show true
@@ -1052,7 +1052,7 @@
         on-power-up-click
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "explore-pricing-click" ::ev/origin "dashboard" :section "sidebar"}))
+           (st/emit! (ev/event {::ev/name "explore-pricing-click" ::ev/origin "dashboard" :section "sidebar"}))
            (dom/open-new-window "https://penpot.app/pricing")))]
 
     [:*
diff --git a/frontend/src/app/main/ui/dashboard/subscription.cljs b/frontend/src/app/main/ui/dashboard/subscription.cljs
index 1d90cf9e6d..29bc0b4ca9 100644
--- a/frontend/src/app/main/ui/dashboard/subscription.cljs
+++ b/frontend/src/app/main/ui/dashboard/subscription.cljs
@@ -124,9 +124,9 @@
         go-to-manage-subscription
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "open-subscription-management"
-                                            ::ev/origin "dashboard"
-                                            :section "team-settings"}))
+           (st/emit! (ev/event {::ev/name "open-subscription-management"
+                                ::ev/origin "dashboard"
+                                :section "team-settings"}))
            (let [href (-> (rt/get-current-href)
                           (rt/encode-url))
                  href (str "payments/subscriptions/show?returnUrl=" href)]
diff --git a/frontend/src/app/main/ui/dashboard/templates.cljs b/frontend/src/app/main/ui/dashboard/templates.cljs
index d5f84c2862..3d49ca1831 100644
--- a/frontend/src/app/main/ui/dashboard/templates.cljs
+++ b/frontend/src/app/main/ui/dashboard/templates.cljs
@@ -40,10 +40,10 @@
   (letfn [(on-finish []
             (st/emit!
              (dd/fetch-recent-files team-id)
-             (ptk/event ::ev/event {::ev/name "import-template-finish"
-                                    ::ev/origin "dashboard"
-                                    :template (:name template)
-                                    :section section})
+             (ev/event {::ev/name "import-template-finish"
+                        ::ev/origin "dashboard"
+                        :template (:name template)
+                        :section section})
 
              (when-not (some? project-id)
                (dcm/go-to-dashboard-recent
@@ -51,10 +51,10 @@
                 :project-id default-project-id))))]
 
     (st/emit!
-     (ptk/event ::ev/event {::ev/name "import-template-launch"
-                            ::ev/origin "dashboard"
-                            :template (:name template)
-                            :section section})
+     (ev/event {::ev/name "import-template-launch"
+                ::ev/origin "dashboard"
+                :template (:name template)
+                :section section})
 
      (modal/show
       {:type :import
@@ -145,9 +145,9 @@
         (mf/use-fn
          (mf/deps section)
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "explore-libraries-click"
-                                            ::ev/origin "dashboard"
-                                            :section section}))))
+           (st/emit! (ev/event {::ev/name "explore-libraries-click"
+                                ::ev/origin "dashboard"
+                                :section section}))))
 
         on-key-down
         (mf/use-fn
diff --git a/frontend/src/app/main/ui/inspect/code.cljs b/frontend/src/app/main/ui/inspect/code.cljs
index 661bee9075..871a261ada 100644
--- a/frontend/src/app/main/ui/inspect/code.cljs
+++ b/frontend/src/app/main/ui/inspect/code.cljs
@@ -158,10 +158,10 @@
            (let [origin (if (= :workspace from)
                           "workspace"
                           "viewer")]
-             (st/emit! (ptk/event ::ev/event
-                                  {::ev/name "copy-inspect-code"
-                                   ::ev/origin origin
-                                   :type markup-type})))))
+             (st/emit! (ev/event
+                        {::ev/name "copy-inspect-code"
+                         ::ev/origin origin
+                         :type markup-type})))))
 
         on-style-copied
         (mf/use-fn
@@ -170,10 +170,10 @@
            (let [origin (if (= :workspace from)
                           "workspace"
                           "viewer")]
-             (st/emit! (ptk/event ::ev/event
-                                  {::ev/name "copy-inspect-style"
-                                   ::ev/origin origin
-                                   :type style-type})))))
+             (st/emit! (ev/event
+                        {::ev/name "copy-inspect-style"
+                         ::ev/origin origin
+                         :type style-type})))))
 
         {on-markup-pointer-down :on-pointer-down
          on-markup-lost-pointer-capture :on-lost-pointer-capture
@@ -206,10 +206,10 @@
            (let [origin (if (= :workspace from)
                           "workspace"
                           "viewer")]
-             (st/emit! (ptk/event ::ev/event
-                                  {::ev/name "copy-inspect-code"
-                                   ::ev/origin origin
-                                   :type "all"})))))
+             (st/emit! (ev/event
+                        {::ev/name "copy-inspect-code"
+                         ::ev/origin origin
+                         :type "all"})))))
 
         ;;handle-open-review
         ;;(mf/use-fn
diff --git a/frontend/src/app/main/ui/inspect/right_sidebar.cljs b/frontend/src/app/main/ui/inspect/right_sidebar.cljs
index 5e205b502a..4f04e58bbf 100644
--- a/frontend/src/app/main/ui/inspect/right_sidebar.cljs
+++ b/frontend/src/app/main/ui/inspect/right_sidebar.cljs
@@ -75,7 +75,7 @@
            (when on-change-section
              (on-change-section (keyword new-section))
              (st/emit!
-              (ptk/event ::ev/event {::ev/name "change-inspect-tab" :tab new-section})))))
+              (ev/event {::ev/name "change-inspect-tab" :tab new-section})))))
 
         handle-expand
         (mf/use-fn
@@ -122,7 +122,7 @@
      (mf/deps shapes handle-change-tab)
      (fn []
        (if (seq shapes)
-         (st/emit! (ptk/event ::ev/event {::ev/name "inspect-mode-click-element"}))
+         (st/emit! (ev/event {::ev/name "inspect-mode-click-element"}))
          (handle-change-tab (if (contains? cf/flags :inspect-styles) :styles :info)))))
 
     [:aside {:class (stl/css-case :settings-bar-right true
diff --git a/frontend/src/app/main/ui/onboarding/questions.cljs b/frontend/src/app/main/ui/onboarding/questions.cljs
index d529456cc1..3a821bfe7c 100644
--- a/frontend/src/app/main/ui/onboarding/questions.cljs
+++ b/frontend/src/app/main/ui/onboarding/questions.cljs
@@ -33,7 +33,7 @@
                             (assoc :label label)
                             (assoc :step step)
                             (assoc ::ev/name "onboarding-step"))]
-             (st/emit! (ptk/data-event ::ev/event params))
+             (st/emit! (ev/event params))
              (on-next form event))))]
 
     [:& fm/form {:form form
diff --git a/frontend/src/app/main/ui/onboarding/team_choice.cljs b/frontend/src/app/main/ui/onboarding/team_choice.cljs
index 0163de6c3d..089ce28dda 100644
--- a/frontend/src/app/main/ui/onboarding/team_choice.cljs
+++ b/frontend/src/app/main/ui/onboarding/team_choice.cljs
@@ -121,13 +121,13 @@
                  params {:name name}]
              (st/emit! (-> (dtm/create-team (with-meta params mdata))
                            (with-meta {::ev/origin :onboarding-without-invitations}))
-                       (ptk/data-event ::ev/event
-                                       {::ev/name "onboarding-step"
-                                        :label "team:create-team-and-invite-later"
-                                        :team-name name
-                                        :step 8})
-                       (ptk/data-event ::ev/event
-                                       {::ev/name "onboarding-finish"})))))
+                       (ev/event
+                        {::ev/name "onboarding-step"
+                         :label "team:create-team-and-invite-later"
+                         :team-name name
+                         :step 8})
+                       (ev/event
+                        {::ev/name "onboarding-finish"})))))
 
         on-invite-now
         (mf/use-fn
@@ -137,15 +137,15 @@
 
              (st/emit! (-> (dtm/create-team-with-invitations (with-meta params mdata))
                            (with-meta {::ev/origin :onboarding-with-invitations}))
-                       (ptk/data-event ::ev/event
-                                       {::ev/name "onboarding-step"
-                                        :label "team:create-team-and-invite"
-                                        :invites (count emails)
-                                        :team-name name
-                                        :role (:role params)
-                                        :step 8})
-                       (ptk/data-event ::ev/event
-                                       {::ev/name "onboarding-finish"})))))
+                       (ev/event
+                        {::ev/name "onboarding-step"
+                         :label "team:create-team-and-invite"
+                         :invites (count emails)
+                         :team-name name
+                         :role (:role params)
+                         :step 8})
+                       (ev/event
+                        {::ev/name "onboarding-finish"})))))
 
         on-submit*
         (mf/use-fn
@@ -160,12 +160,12 @@
         (mf/use-fn
          (fn []
            (st/emit! (du/update-profile-props {:onboarding-viewed true})
-                     (ptk/data-event ::ev/event
-                                     {::ev/name "onboarding-step"
-                                      :label "team:skip-team-creation"
-                                      :step 7})
-                     (ptk/data-event ::ev/event
-                                     {::ev/name "onboarding-finish"}))))]
+                     (ev/event
+                      {::ev/name "onboarding-step"
+                       :label "team:skip-team-creation"
+                       :step 7})
+                     (ev/event
+                      {::ev/name "onboarding-finish"}))))]
     [:*
      [:div {:class (stl/css :modal-right)}
       [:div {:class (stl/css :first-block)}
diff --git a/frontend/src/app/main/ui/settings/sidebar.cljs b/frontend/src/app/main/ui/settings/sidebar.cljs
index 49ffcb6d19..2794c311f6 100644
--- a/frontend/src/app/main/ui/settings/sidebar.cljs
+++ b/frontend/src/app/main/ui/settings/sidebar.cljs
@@ -52,7 +52,7 @@
 (defn- show-release-notes
   [event]
   (let [version (:main cf/version)]
-    (st/emit! (ptk/event ::ev/event {::ev/name "show-release-notes" :version version}))
+    (st/emit! (ev/event {::ev/name "show-release-notes" :version version}))
 
     (if (and (kbd/alt? event) (kbd/mod? event))
       (st/emit! (modal/show {:type :onboarding}))
diff --git a/frontend/src/app/main/ui/settings/subscription.cljs b/frontend/src/app/main/ui/settings/subscription.cljs
index 8b1d0422b6..c83e243ccd 100644
--- a/frontend/src/app/main/ui/settings/subscription.cljs
+++ b/frontend/src/app/main/ui/settings/subscription.cljs
@@ -132,16 +132,16 @@
                                       add-payment-details? "&quantity="
                                       min-members "&returnUrl=" return-url)]
                (reset! form nil)
-               (st/emit! (ptk/event ::ev/event {::ev/name "create-trial-subscription"
-                                                :type "unlimited"
-                                                :quantity min-members})
+               (st/emit! (ev/event {::ev/name "create-trial-subscription"
+                                    :type "unlimited"
+                                    :quantity min-members})
                          (rt/nav-raw :href href))))))
 
         subscribe-to-enterprise
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "create-trial-subscription"
-                                            :type "enterprise"}))
+           (st/emit! (ev/event {::ev/name "create-trial-subscription"
+                                :type "enterprise"}))
            (let [return-url (-> (rt/get-current-href) (rt/encode-url))
                  href (dm/str "payments/subscriptions/create?type=enterprise&returnUrl=" return-url)]
              (st/emit! (rt/nav-raw :href href)))))
@@ -161,7 +161,7 @@
         handle-close-dialog
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "close-subscription-modal"}))
+           (st/emit! (ev/event {::ev/name "close-subscription-modal"}))
            (modal/hide!)))
 
         show-editors-list*
@@ -323,7 +323,7 @@
   (let [profile              (mf/deref refs/profile)
         handle-close-dialog  (mf/use-fn
                               (fn []
-                                (st/emit! (ptk/event ::ev/event {::ev/name "subscription-success"}))
+                                (st/emit! (ev/event {::ev/name "subscription-success"}))
                                 (modal/hide!)))]
 
     [:div {:class (stl/css :modal-overlay)}
@@ -434,8 +434,8 @@
           ^boolean show-trial-subscription-modal?
 
           (st/emit!
-           (ptk/event ::ev/event {::ev/name "open-subscription-modal"
-                                  ::ev/origin "settings:from-pricing-page"})
+           (ev/event {::ev/name "open-subscription-modal"
+                      ::ev/origin "settings:from-pricing-page"})
            (modal/show :management-dialog
                        {:subscription-type (if (= params-subscription "subscription-to-penpot-unlimited")
                                              "unlimited"
diff --git a/frontend/src/app/main/ui/viewer/share_link.cljs b/frontend/src/app/main/ui/viewer/share_link.cljs
index 646405676c..f6e38314be 100644
--- a/frontend/src/app/main/ui/viewer/share_link.cljs
+++ b/frontend/src/app/main/ui/viewer/share_link.cljs
@@ -126,10 +126,10 @@
           (let [params (prepare-params options)
                 params (assoc params :file-id (:id file))]
             (st/emit! (dc/create-share-link params)
-                      (ptk/event ::ev/event {::ev/name "create-share-link"
-                                             ::ev/origin "viewer"
-                                             :can-comment (:who-comment params)
-                                             :can-inspect-code (:who-inspect params)}))))
+                      (ev/event {::ev/name "create-share-link"
+                                 ::ev/origin "viewer"
+                                 :can-comment (:who-comment params)
+                                 :can-inspect-code (:who-inspect params)}))))
 
         copy-link
         (fn [_]
@@ -138,8 +138,8 @@
                                :type :toast
                                :content (tr "common.share-link.link-copied-success")
                                :timeout 1000})
-                    (ptk/event ::ev/event {::ev/name "copy-share-link"
-                                           ::ev/origin "viewer"})))
+                    (ev/event {::ev/name "copy-share-link"
+                               ::ev/origin "viewer"})))
 
         try-delete-link
         (fn [_]
diff --git a/frontend/src/app/main/ui/workspace/color_palette.cljs b/frontend/src/app/main/ui/workspace/color_palette.cljs
index 7a8dae308c..d66ae177d9 100644
--- a/frontend/src/app/main/ui/workspace/color_palette.cljs
+++ b/frontend/src/app/main/ui/workspace/color_palette.cljs
@@ -37,10 +37,10 @@
            (st/emit! (mdc/add-recent-color color)
                      (mdc/apply-color-from-palette color (kbd/alt? event))
                      (when (not= selected :recent)
-                       (ptk/data-event ::ev/event
-                                       {::ev/name "use-library-color"
-                                        ::ev/origin "color-palette"
-                                        :external-library (not= selected :file)})))))
+                       (ev/event
+                        {::ev/name "use-library-color"
+                         ::ev/origin "color-palette"
+                         :external-library (not= selected :file)})))))
         title
         (uc/get-color-name color)]
 
diff --git a/frontend/src/app/main/ui/workspace/colorpicker.cljs b/frontend/src/app/main/ui/workspace/colorpicker.cljs
index 3e930e9f81..b7b711e877 100644
--- a/frontend/src/app/main/ui/workspace/colorpicker.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpicker.cljs
@@ -174,9 +174,9 @@
 
              (st/emit!
               (dc/update-colorpicker-color {:image image} true)
-              (ptk/data-event ::ev/event {::ev/name "toggle-image-aspect-ratio"
-                                          ::ev/origin "workspace:colorpicker"
-                                          :checked keep-aspect-ratio?})))))
+              (ev/event {::ev/name "toggle-image-aspect-ratio"
+                         ::ev/origin "workspace:colorpicker"
+                         :checked keep-aspect-ratio?})))))
 
         on-change-tab
         (mf/use-fn #(reset! active-color-tab* %))
diff --git a/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs b/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs
index e565a05754..871ab07c53 100644
--- a/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs
+++ b/frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs
@@ -87,8 +87,7 @@
          (mf/deps state selected on-select-color)
          (fn [event]
            (when-not (= :recent selected)
-             (st/emit! (ptk/event
-                        ::ev/event
+             (st/emit! (ev/event
                         {::ev/name "use-library-color"
                          ::ev/origin "colorpicker"
                          :external-library (not= :file selected)})))
diff --git a/frontend/src/app/main/ui/workspace/context_menu.cljs b/frontend/src/app/main/ui/workspace/context_menu.cljs
index b2a69eca34..88c3ad2245 100644
--- a/frontend/src/app/main/ui/workspace/context_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/context_menu.cljs
@@ -676,7 +676,7 @@
                                :on-accept delete-fn}))
         do-duplicate #(st/emit!
                        (dw/duplicate-page id)
-                       (ptk/event ::ev/event {::ev/name "duplicate-page"}))
+                       (ev/event {::ev/name "duplicate-page"}))
         do-rename #(st/emit! (dw/start-rename-page-item id))]
 
     [:*
diff --git a/frontend/src/app/main/ui/workspace/main_menu.cljs b/frontend/src/app/main/ui/workspace/main_menu.cljs
index 28e6f6722c..f8490bac28 100644
--- a/frontend/src/app/main/ui/workspace/main_menu.cljs
+++ b/frontend/src/app/main/ui/workspace/main_menu.cljs
@@ -62,43 +62,43 @@
   (let [nav-to-helpc-center
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "explore-help-center-click"
-                                            ::ev/origin "workspace-menu:in-app"}))
+           (st/emit! (ev/event {::ev/name "explore-help-center-click"
+                                ::ev/origin "workspace-menu:in-app"}))
            (dom/open-new-window "https://help.penpot.app")))
 
         nav-to-community
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "explore-community-click"
-                                            ::ev/origin "workspace-menu:in-app"}))
+           (st/emit! (ev/event {::ev/name "explore-community-click"
+                                ::ev/origin "workspace-menu:in-app"}))
            (dom/open-new-window "https://community.penpot.app")))
 
         nav-to-youtube
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "explore-tutorials-click"
-                                            ::ev/origin "workspace-menu:in-app"}))
+           (st/emit! (ev/event {::ev/name "explore-tutorials-click"
+                                ::ev/origin "workspace-menu:in-app"}))
            (dom/open-new-window "https://www.youtube.com/c/Penpot")))
 
         nav-to-templates
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "explore-libraries-click"
-                                            ::ev/origin "workspace"}))
+           (st/emit! (ev/event {::ev/name "explore-libraries-click"
+                                ::ev/origin "workspace"}))
            (dom/open-new-window "https://penpot.app/libraries-templates")))
 
         nav-to-github
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "explore-github-repository-click"
-                                            ::ev/origin "workspace-menu:in-app"}))
+           (st/emit! (ev/event {::ev/name "explore-github-repository-click"
+                                ::ev/origin "workspace-menu:in-app"}))
            (dom/open-new-window "https://github.com/penpot/penpot")))
 
         nav-to-terms
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "explore-terms-service-click"
-                                            ::ev/origin "workspace-menu:in-app"}))
+           (st/emit! (ev/event {::ev/name "explore-terms-service-click"
+                                ::ev/origin "workspace-menu:in-app"}))
            (dom/open-new-window "https://penpot.app/terms")))
 
         nav-to-feedback
@@ -125,8 +125,8 @@
         (mf/use-fn
          (fn [event]
            (let [version (:main cf/version)]
-             (st/emit! (ptk/event ::ev/event {::ev/name "show-release-notes"
-                                              :version version}))
+             (st/emit! (ev/event {::ev/name "show-release-notes"
+                                  :version version}))
              (println version)
              (if (and (kbd/alt? event) (kbd/mod? event))
                (st/emit! (modal/show {:type :onboarding}))
@@ -712,10 +712,10 @@
                 (fn [event]
                   (if can-open?
                     (do
-                      (st/emit! (ptk/event ::ev/event {::ev/name "start-plugin"
-                                                       ::ev/origin "workspace:menu"
-                                                       :name name
-                                                       :host host}))
+                      (st/emit! (ev/event {::ev/name "start-plugin"
+                                           ::ev/origin "workspace:menu"
+                                           :name name
+                                           :host host}))
                       (dp/open-plugin! manifest user-can-edit?))
                     (dom/stop-propagation event))))
                on-key-down
@@ -724,10 +724,10 @@
                 (fn [event]
                   (when can-open?
                     (when (kbd/enter? event)
-                      (st/emit! (ptk/event ::ev/event {::ev/name "start-plugin"
-                                                       ::ev/origin "workspace:menu"
-                                                       :name name
-                                                       :host host}))
+                      (st/emit! (ev/event {::ev/name "start-plugin"
+                                           ::ev/origin "workspace:menu"
+                                           :name name
+                                           :host host}))
                       (dp/open-plugin! manifest user-can-edit?)))))]
 
            [:> dropdown-menu-item* {:key         (dm/str "plugins-menu-" idx)
@@ -765,8 +765,8 @@
         on-nav-to-integrations
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "manage-mpc-option"
-                                            ::ev/origin "workspace-menu"}))
+           (st/emit! (ev/event {::ev/name "manage-mpc-option"
+                                ::ev/origin "workspace-menu"}))
            (dom/open-new-window "/#/settings/integrations")))
 
         on-nav-to-integrations-key-down
@@ -780,11 +780,11 @@
          (fn []
            (if mcp-connected?
              (st/emit! (mcp/user-disconnect-mcp)
-                       (ptk/event ::ev/event {::ev/name "disconnect-mcp-plugin"
-                                              ::ev/origin "workspace-menu"}))
+                       (ev/event {::ev/name "disconnect-mcp-plugin"
+                                  ::ev/origin "workspace-menu"}))
              (st/emit! (mcp/connect-mcp)
-                       (ptk/event ::ev/event {::ev/name "connect-mcp-plugin"
-                                              ::ev/origin "workspace-menu"})))))
+                       (ev/event {::ev/name "connect-mcp-plugin"
+                                  ::ev/origin "workspace-menu"})))))
 
         on-toggle-mcp-plugin-key-down
         (mf/use-fn
@@ -866,8 +866,8 @@
         on-power-up-click
         (mf/use-fn
          (fn []
-           (st/emit! (ptk/event ::ev/event {::ev/name "explore-pricing-click"
-                                            ::ev/origin "workspace-menu"}))
+           (st/emit! (ev/event {::ev/name "explore-pricing-click"
+                                ::ev/origin "workspace-menu"}))
            (dom/open-new-window "https://penpot.app/pricing")))
 
         toggle-flag
@@ -896,8 +896,8 @@
            (reset! show-menu* false)
            (reset! selected-sub-menu* nil)
            (st/emit!
-            (ptk/event ::ev/event {::ev/name "open-plugins-manager"
-                                   ::ev/origin "workspace:menu"})
+            (ev/event {::ev/name "open-plugins-manager"
+                       ::ev/origin "workspace:menu"})
             (modal/show :plugin-management {}))))
 
         subscription           (:subscription (:props profile))
diff --git a/frontend/src/app/main/ui/workspace/plugins.cljs b/frontend/src/app/main/ui/workspace/plugins.cljs
index ca315963ea..e44f5effb2 100644
--- a/frontend/src/app/main/ui/workspace/plugins.cljs
+++ b/frontend/src/app/main/ui/workspace/plugins.cljs
@@ -128,7 +128,7 @@
                    (reset! fetching-manifest? false)
                    (if plugin
                      (do
-                       (st/emit! (ptk/event ::ev/event {::ev/name "install-plugin" :name (:name plugin) :url plugin-url}))
+                       (st/emit! (ev/event {::ev/name "install-plugin" :name (:name plugin) :url plugin-url}))
                        (modal/show!
                         :plugin-permissions
                         {:plugin plugin
@@ -148,10 +148,10 @@
         handle-open-plugin
         (mf/use-fn
          (fn [manifest]
-           (st/emit! (ptk/event ::ev/event {::ev/name "start-plugin"
-                                            ::ev/origin "workspace:plugins"
-                                            :name (:name manifest)
-                                            :host (:host manifest)}))
+           (st/emit! (ev/event {::ev/name "start-plugin"
+                                ::ev/origin "workspace:plugins"
+                                :name (:name manifest)
+                                :host (:host manifest)}))
            (dp/open-plugin! manifest user-can-edit?)
            (modal/hide!)))
 
@@ -161,9 +161,9 @@
          (fn [plugin-index]
            (let [plugins-list (preg/plugins-list)
                  plugin (nth plugins-list plugin-index)]
-             (st/emit! (ptk/event ::ev/event {::ev/name "remove-plugin"
-                                              :name (:name plugin)
-                                              :host (:host plugin)}))
+             (st/emit! (ev/event {::ev/name "remove-plugin"
+                                  :name (:name plugin)
+                                  :host (:host plugin)}))
              (dp/close-plugin! plugin)
              (preg/remove-plugin! plugin)
              (reset! plugins-state* (preg/plugins-list)))))]
@@ -195,7 +195,7 @@
        (when-not (empty? plugins-state)
          [:> i18n/tr-html*
           {:class (stl/css :discover)
-           :on-click #(st/emit! (ptk/event ::ev/event {::ev/name "open-plugins-list"}))
+           :on-click #(st/emit! (ev/event {::ev/name "open-plugins-list"}))
            :content (tr "workspace.plugins.discover" cfg/plugins-list-uri)}])
 
        [:hr]
@@ -207,7 +207,7 @@
           [:a {:class (stl/css :plugins-link)
                :href cfg/plugins-list-uri
                :target "_blank"
-               :on-click #(st/emit! (ptk/event ::ev/event {::ev/name "open-plugins-list"}))}
+               :on-click #(st/emit! (ev/event {::ev/name "open-plugins-list"}))}
            (tr "workspace.plugins.plugin-list-link") deprecated-icon/external-link]]
 
          [:*
@@ -298,9 +298,9 @@
         (mf/use-fn
          (fn [event]
            (dom/prevent-default event)
-           (st/emit! (ptk/event ::ev/event {::ev/name "allow-plugin-permissions"
-                                            :host host
-                                            :permissions (->> permissions (str/join ", "))})
+           (st/emit! (ev/event {::ev/name "allow-plugin-permissions"
+                                :host host
+                                :permissions (->> permissions (str/join ", "))})
                      (modal/hide))
            (when on-accept (on-accept))))
 
@@ -308,9 +308,9 @@
         (mf/use-fn
          (fn [event]
            (dom/prevent-default event)
-           (st/emit! (ptk/event ::ev/event {::ev/name "reject-plugin-permissions"
-                                            :host host
-                                            :permissions (->> permissions (str/join ", "))})
+           (st/emit! (ev/event {::ev/name "reject-plugin-permissions"
+                                :host host
+                                :permissions (->> permissions (str/join ", "))})
                      (modal/hide))
            (when on-close (on-close))))]
 
@@ -353,9 +353,9 @@
         (mf/use-fn
          (fn [event]
            (dom/prevent-default event)
-           (st/emit! (ptk/event ::ev/event {::ev/name "allow-plugin-permissions"
-                                            :host host
-                                            :permissions (->> permissions (str/join ", "))})
+           (st/emit! (ev/event {::ev/name "allow-plugin-permissions"
+                                :host host
+                                :permissions (->> permissions (str/join ", "))})
                      (modal/hide))
            (when on-accept (on-accept))))
 
@@ -363,9 +363,9 @@
         (mf/use-fn
          (fn [event]
            (dom/prevent-default event)
-           (st/emit! (ptk/event ::ev/event {::ev/name "reject-plugin-permissions"
-                                            :host host
-                                            :permissions (->> permissions (str/join ", "))})
+           (st/emit! (ev/event {::ev/name "reject-plugin-permissions"
+                                :host host
+                                :permissions (->> permissions (str/join ", "))})
                      (modal/hide))
            (when on-close (on-close))))]
 
@@ -406,7 +406,7 @@
         (mf/use-fn
          (fn [event]
            (dom/prevent-default event)
-           (st/emit! (ptk/event ::ev/event {::ev/name "try-out-accept"})
+           (st/emit! (ev/event {::ev/name "try-out-accept"})
                      (modal/hide))
            (when on-accept (on-accept))))
 
@@ -414,7 +414,7 @@
         (mf/use-fn
          (fn [event]
            (dom/prevent-default event)
-           (st/emit! (ptk/event ::ev/event {::ev/name "try-out-cancel"})
+           (st/emit! (ev/event {::ev/name "try-out-cancel"})
                      (modal/hide))
            (when on-close (on-close))))]
 
diff --git a/frontend/src/app/main/ui/workspace/sidebar.cljs b/frontend/src/app/main/ui/workspace/sidebar.cljs
index ac219faa2f..3d74dc60f1 100644
--- a/frontend/src/app/main/ui/workspace/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar.cljs
@@ -146,7 +146,7 @@
          (fn [id]
            (st/emit! (dcm/go-to-workspace :layout (keyword id)))
            (when (= id "tokens")
-             (st/emit! (ptk/event ::ev/event {::ev/name "open-tokens-tab"})))))
+             (st/emit! (ev/event {::ev/name "open-tokens-tab"})))))
 
         tabs
         (mf/with-memo [mode-inspect? design-tokens?]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/colors.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/colors.cljs
index 8eb686483e..df55df90d9 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets/colors.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/colors.cljs
@@ -180,10 +180,10 @@
          (mf/deps color on-asset-click read-only? file-id)
          (fn [event]
            (when-not read-only?
-             (st/emit! (ptk/data-event ::ev/event
-                                       {::ev/name "use-library-color"
-                                        ::ev/origin "sidebar"
-                                        :external-library (not local?)}))
+             (st/emit! (ev/event
+                        {::ev/name "use-library-color"
+                         ::ev/origin "sidebar"
+                         :external-library (not local?)}))
 
              (when-not (on-asset-click event (:id color))
                (st/emit! (dc/apply-color-from-assets file-id color (kbd/alt? event)))))))]
@@ -403,8 +403,8 @@
                  y-position (:top bounds)]
 
              (st/emit! (dw/set-assets-section-open file-id :colors true)
-                       (ptk/event ::ev/event {::ev/name "add-asset-to-library"
-                                              :asset-type "color"})
+                       (ev/event {::ev/name "add-asset-to-library"
+                                  :asset-type "color"})
                        (modal/show :colorpicker
                                    {:x x-position
                                     :y y-position
diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs
index 077742d71d..79f5355b3a 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs
@@ -373,8 +373,8 @@
            (let [params {:file-id file-id
                          :blobs (seq blobs)}]
              (st/emit! (dwm/upload-media-components params)
-                       (ptk/event ::ev/event {::ev/name "add-asset-to-library"
-                                              :asset-type "components"})))))
+                       (ev/event {::ev/name "add-asset-to-library"
+                                  :asset-type "components"})))))
 
         on-duplicate
         (mf/use-fn
diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/file_library.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/file_library.cljs
index 2fc62e001d..e6392ea854 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets/file_library.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/file_library.cljs
@@ -94,7 +94,7 @@
         (mf/use-fn
          (fn [ev]
            (dom/stop-propagation ev)
-           (st/emit! (ptk/data-event ::ev/event {::ev/name "navigate-to-library-file"}))))]
+           (st/emit! (ev/event {::ev/name "navigate-to-library-file"}))))]
 
     [:div {:class (stl/css-case
                    :library-title true
diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/typographies.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/typographies.cljs
index 8ad40c2f4e..4299ee7df4 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets/typographies.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/typographies.cljs
@@ -97,10 +97,10 @@
          (mf/deps typography on-asset-click read-only? local?)
          (fn [event]
            (when-not read-only?
-             (st/emit! (ptk/data-event ::ev/event
-                                       {::ev/name "use-library-typography"
-                                        ::ev/origin "sidebar"
-                                        :external-library (not local?)}))
+             (st/emit! (ev/event
+                        {::ev/name "use-library-typography"
+                         ::ev/origin "sidebar"
+                         :external-library (not local?)}))
              (when-not (on-asset-click event (:id typography))
                (st/emit! (dwt/apply-typography typography file-id))))))]
 
diff --git a/frontend/src/app/main/ui/workspace/text_palette.cljs b/frontend/src/app/main/ui/workspace/text_palette.cljs
index 5325102a05..9c911e4d7e 100644
--- a/frontend/src/app/main/ui/workspace/text_palette.cljs
+++ b/frontend/src/app/main/ui/workspace/text_palette.cljs
@@ -38,8 +38,7 @@
                          :typography-ref-id (:id typography)}
                         (dissoc typography :id :name))]
 
-             (st/emit! (ptk/event
-                        ::ev/event
+             (st/emit! (ev/event
                         {::ev/name "use-library-typography"
                          ::ev/origin "text-palette"
                          :external-library (not= file-id current-file-id)}))
diff --git a/frontend/src/app/main/ui/workspace/tokens/export/modal.cljs b/frontend/src/app/main/ui/workspace/tokens/export/modal.cljs
index 0db9bc5fcb..bef63de514 100644
--- a/frontend/src/app/main/ui/workspace/tokens/export/modal.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/export/modal.cljs
@@ -61,7 +61,7 @@
          (mf/deps tokens-json)
          (fn []
            (when tokens-json
-             (st/emit! (ptk/data-event ::ev/event {::ev/name "export-tokens" :type "single"}))
+             (st/emit! (ev/event {::ev/name "export-tokens" :type "single"}))
              (->> (wapi/create-blob (or tokens-json "{}") "application/json")
                   (dom/trigger-download "tokens.json")))))]
     [:> export-tab* {:is-disabled is-disabled
@@ -88,7 +88,7 @@
         (mf/use-fn
          (mf/deps files)
          (fn []
-           (st/emit! (ptk/data-event ::ev/event {::ev/name "export-tokens" :type "multiple"}))
+           (st/emit! (ev/event {::ev/name "export-tokens" :type "multiple"}))
            (download-tokens-zip! files)))]
     [:> export-tab* {:on-export on-export
                      :is-disabled is-disabled}
diff --git a/frontend/src/app/main/ui/workspace/tokens/import/modal.cljs b/frontend/src/app/main/ui/workspace/tokens/import/modal.cljs
index 8e47009bbb..92947bc104 100644
--- a/frontend/src/app/main/ui/workspace/tokens/import/modal.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/import/modal.cljs
@@ -35,7 +35,7 @@
   (rx/sub!
    tokens-lib-stream
    (fn [lib]
-     (st/emit! (ptk/data-event ::ev/event {::ev/name "import-tokens" :type type})
+     (st/emit! (ev/event {::ev/name "import-tokens" :type type})
                (dwtl/import-tokens-lib lib))
      (modal/hide!))
    (fn [err]
diff --git a/frontend/src/app/main/ui/workspace/tokens/sets/helpers.cljs b/frontend/src/app/main/ui/workspace/tokens/sets/helpers.cljs
index e7b9bf98c6..069b780ded 100644
--- a/frontend/src/app/main/ui/workspace/tokens/sets/helpers.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/sets/helpers.cljs
@@ -37,7 +37,7 @@
   [tokens-lib parent-set name]
   (let [name   (ctob/make-child-name parent-set name)
         errors (sm/validation-errors name (cfo/make-token-set-name-schema tokens-lib nil))]
-    (st/emit! (ptk/data-event ::ev/event {::ev/name "create-token-set" :name name})
+    (st/emit! (ev/event {::ev/name "create-token-set" :name name})
               (dwtl/clear-token-set-creation))
     (if (empty? errors)
       (let [token-set (ctob/make-token-set :name name)]
diff --git a/frontend/src/app/main/ui/workspace/tokens/themes/create_modal.cljs b/frontend/src/app/main/ui/workspace/tokens/themes/create_modal.cljs
index a9fa7e5998..40e3dc1815 100644
--- a/frontend/src/app/main/ui/workspace/tokens/themes/create_modal.cljs
+++ b/frontend/src/app/main/ui/workspace/tokens/themes/create_modal.cljs
@@ -412,7 +412,7 @@
         on-save
         (mf/use-fn
          (fn [theme]
-           (st/emit! (ptk/event ::ev/event {::ev/name "create-tokens-theme"})
+           (st/emit! (ev/event {::ev/name "create-tokens-theme"})
                      (dwtl/create-token-theme theme))))
         has-prev-view (has-prev-view (:prev-type state))]
 
diff --git a/frontend/src/app/main/ui/workspace/top_toolbar.cljs b/frontend/src/app/main/ui/workspace/top_toolbar.cljs
index 54a6bca3e0..645b2cbedc 100644
--- a/frontend/src/app/main/ui/workspace/top_toolbar.cljs
+++ b/frontend/src/app/main/ui/workspace/top_toolbar.cljs
@@ -209,8 +209,8 @@
               :aria-label (tr "workspace.toolbar.plugins" (sc/get-tooltip :plugins))
               :class (stl/css :main-toolbar-options-button)
               :on-click #(st/emit!
-                          (ptk/data-event ::ev/event {::ev/name "open-plugins-manager"
-                                                      ::ev/origin "workspace:toolbar"})
+                          (ev/event {::ev/name "open-plugins-manager"
+                                     ::ev/origin "workspace:toolbar"})
                           (modal/show :plugin-management {}))
               :data-tool "plugins"
               :data-testid "plugins-btn"}