From d16208c233a922fda8fa4e07ecd8e4508d85c89c Mon Sep 17 00:00:00 2001
From: rllynotfox <92391169+RllyNotODKM@users.noreply.github.com>
Date: Wed, 10 Nov 2021 09:45:20 +0300
Subject: [PATCH] aded timestamp all files are updated because why not

h haha
---
 .gitignore                                    |   4 -
 package.json                                  |   3 +-
 public/index.html                             |  14 +
 src/App.vue                                   |  21 +-
 src/autosave.js                               |  58 ----
 src/blocks/database/clear_all_data.js         |  21 ++
 src/blocks/database/db_length.js              |  20 ++
 src/blocks/database/index.js                  |   3 +
 .../discord/channels/channel_category.js      |  40 +++
 src/blocks/discord/channels/chnl_exists.js    |  42 +++
 src/blocks/discord/channels/index.js          |   3 +
 src/blocks/discord/channels/send_channel.js   |  42 ++-
 src/blocks/discord/channels/start_typing.js   |  46 ++++
 .../discord/direct/direct_author_raw.js       |  69 +++++
 src/blocks/discord/direct/direct_bot.js       |  33 +++
 src/blocks/discord/direct/direct_content.js   |  33 +++
 src/blocks/discord/direct/direct_id.js        |  33 +++
 src/blocks/discord/direct/direct_react.js     |  49 ++++
 src/blocks/discord/direct/direct_remove.js    |  34 +++
 src/blocks/discord/direct/direct_reply.js     |  72 +++++
 src/blocks/discord/direct/index.js            |   8 +
 src/blocks/discord/direct/on_direct.js        |  29 ++
 .../discord/edited-event/edited_author.js     |  33 +++
 .../discord/edited-event/edited_author_raw.js |  62 +++++
 .../discord/edited-event/edited_channel.js    |  33 +++
 .../edited-event/edited_channel_raw.js        |  55 ++++
 .../discord/edited-event/edited_delete.js     |  34 +++
 .../discord/edited-event/edited_guild_raw.js  |  55 ++++
 src/blocks/discord/edited-event/edited_id.js  |  33 +++
 .../discord/edited-event/edited_reaction.js   |  49 ++++
 .../discord/edited-event/edited_reply.js      |  72 +++++
 .../discord/edited-event/edited_server.js     |  33 +++
 src/blocks/discord/edited-event/index.js      |  15 +
 .../discord/edited-event/new_content.js       |  33 +++
 .../new_edited_mentioned_member.js            |  33 +++
 .../discord/edited-event/old_content.js       |  33 +++
 .../old_edited_mentioned_member.js            |  33 +++
 src/blocks/discord/edited-event/on_edited.js  |  29 ++
 src/blocks/discord/embed/create_new_embed.js  |  31 +++
 src/blocks/discord/events/av-url.js           |  44 +++
 src/blocks/discord/events/deaf-type.js        |  22 ++
 src/blocks/discord/events/discrim-update.js   |  44 +++
 src/blocks/discord/events/index.js            |  21 ++
 .../discord/events/j_or_l-channel-raw.js      |  54 ++++
 src/blocks/discord/events/j_or_l-channel.js   |  24 ++
 src/blocks/discord/events/member.js           |  24 ++
 src/blocks/discord/events/mute-type.js        |  22 ++
 src/blocks/discord/events/new_channel-raw.js  |  51 ++++
 src/blocks/discord/events/old_channel-raw.js  |  52 ++++
 src/blocks/discord/events/old_mute-type.js    |  22 ++
 .../discord/events/stream_channel-raw.js      |  51 ++++
 src/blocks/discord/events/streaming_chnl.js   |  23 ++
 src/blocks/discord/events/switch_chnl.js      |  44 +++
 src/blocks/discord/events/user-updates.js     |  60 ++++
 src/blocks/discord/events/user.js             |  24 ++
 src/blocks/discord/events/username-update.js  |  44 +++
 src/blocks/discord/events/vc-1.js             |  53 ++++
 src/blocks/discord/events/vc-2.js             |  53 ++++
 src/blocks/discord/events/vc-3.js             |  52 ++++
 src/blocks/discord/events/vc-4.js             |  53 ++++
 src/blocks/discord/events/vc-5.js             |  29 ++
 src/blocks/discord/invite/index.js            |  12 +
 src/blocks/discord/invite/inv_guild.js        |  23 ++
 src/blocks/discord/invite/inv_max.js          |  45 +++
 src/blocks/discord/invite/invite_author.js    |  22 ++
 src/blocks/discord/invite/invite_channel.js   |  23 ++
 .../discord/invite/invite_channel_raw.js      |  54 ++++
 src/blocks/discord/invite/invite_code.js      |  23 ++
 src/blocks/discord/invite/invite_create.js    |  29 ++
 src/blocks/discord/invite/invite_date.js      |  45 +++
 src/blocks/discord/invite/invite_delete.js    |  29 ++
 src/blocks/discord/invite/invite_url.js       |  23 ++
 src/blocks/discord/invite/invite_uses.js      |  23 ++
 .../discord/join-event/joining_guild.js       |   2 +-
 .../discord/join-event/joining_guild_raw.js   |   4 +-
 .../discord/join-event/joining_member.js      |   2 +-
 .../discord/join-event/joining_member_raw.js  |   6 +-
 .../discord/join-event/on_member_join.js      |   2 +-
 src/blocks/discord/members/index.js           |   2 +
 .../discord/members/member_has_permission.js  |   2 +-
 .../discord/members/member_is_streaming.js    |  40 +++
 src/blocks/discord/members/member_status.js   |  40 +++
 src/blocks/discord/members/send_message.js    |  24 +-
 src/blocks/discord/message-event/index.js     |   6 +-
 .../discord/message-event/message_embed.js    |   8 +-
 .../message-event/message_start_thread.js     |  94 +++++++
 .../message-event/message_timestamp.js        |  33 +++
 .../discord/message-event/on_message.js       |   2 +-
 .../discord/message-event/reference_reply.js  |  68 +++++
 src/blocks/discord/message-event/reply.js     |  40 ++-
 .../discord/message-event/started_thread.js   |  33 +++
 src/blocks/discord/roles/get_role.js          |   6 +-
 src/blocks/discord/roles/has_role.js          |  55 ++++
 src/blocks/discord/roles/index.js             |   2 +
 src/blocks/discord/roles/role_exists.js       |  41 +++
 src/blocks/discord/slash/index.js             |   7 +
 src/blocks/discord/slash/on_slash.js          |  29 ++
 src/blocks/discord/slash/slash_author.js      |  33 +++
 src/blocks/discord/slash/slash_channel.js     |  33 +++
 src/blocks/discord/slash/slash_name.js        |  33 +++
 src/blocks/discord/slash/slash_reply.js       |  64 +++++
 src/blocks/discord/slash/slash_server.js      |  33 +++
 src/blocks/discord/slash/slash_value.js       |  97 +++++++
 .../discord/thread-event/channel_thread.js    |  40 +++
 .../discord/thread-event/created-thread.js    |  33 +++
 .../discord/thread-event/deleted_thread.js    |  33 +++
 src/blocks/discord/thread-event/index.js      |  26 ++
 .../discord/thread-event/message_thread.js    |  33 +++
 .../thread-event/message_thread_guild.js      |  33 +++
 .../discord/thread-event/on_new_thread.js     |  29 ++
 .../discord/thread-event/on_thread_archive.js |  29 ++
 .../discord/thread-event/on_thread_message.js |  29 ++
 .../discord/thread-event/on_thread_remove.js  |  29 ++
 .../thread-event/on_thread_unarchive.js       |  29 ++
 .../discord/thread-event/send_thread.js       |  58 ++++
 .../discord/thread-event/start_thread.js      |  90 ++++++
 .../discord/thread-event/started_thread.js    |  33 +++
 .../discord/thread-event/thread_archive.js    |  64 +++++
 .../discord/thread-event/thread_guild_raw.js  |  55 ++++
 .../thread-event/thread_message_author.js     |  33 +++
 .../thread-event/thread_message_author_raw.js |  62 +++++
 .../thread-event/thread_message_content.js    |  33 +++
 .../thread-event/thread_message_delete.js     |  34 +++
 .../discord/thread-event/thread_message_id.js |  33 +++
 .../discord/thread-event/thread_name.js       |  40 +++
 .../discord/thread-event/thread_react.js      |  49 ++++
 .../discord/thread-event/thread_reply.js      |  72 +++++
 .../discord/thread-event/thread_server.js     |  40 +++
 .../discord/thread-event/thread_thread_raw.js |  55 ++++
 .../discord/thread-event/unarchived_thread.js |  34 +++
 src/blocks/discord/typing-event/index.js      |   6 +
 .../discord/typing-event/typing_author.js     |  22 ++
 .../discord/typing-event/typing_channel.js    |  23 ++
 .../typing-event/typing_channel_raw.js        |  54 ++++
 .../discord/typing-event/typing_guild.js      |  23 ++
 .../discord/typing-event/typing_on_start.js   |  29 ++
 .../discord/typing-event/typing_timestamp.js  |  45 +++
 src/blocks/other/cpu_model.js                 |  22 ++
 src/blocks/other/cpu_usage.js                 |  34 +++
 src/blocks/other/eval.js                      |  30 ++
 src/blocks/other/eval_output.js               |  29 ++
 src/blocks/other/get_cpu_usage.js             |  33 +++
 src/blocks/other/index.js                     |   6 +
 src/blocks/other/log.js                       |  29 ++
 src/blocks/request/get_value.js               |  41 +++
 src/blocks/request/get_value_of_object.js     |  47 ++++
 src/blocks/request/index.js                   |   4 +
 src/blocks/request/request_then.js            |  48 ++++
 src/blocks/request/requested_object.js        |  33 +++
 src/blocks/time/date_get_value.js             |  85 ++++++
 src/blocks/time/date_now.js                   |  21 ++
 src/blocks/time/date_to_discord.js            |  73 +++++
 src/blocks/time/date_to_string.js             |  69 +++++
 src/blocks/time/index.js                      |   4 +
 src/components/BlocklyComponent.vue           |   5 +
 src/components/NavigationBar/FileMenu.vue     |   6 +-
 .../NavigationBar/NavigationBar.vue           |  12 +-
 src/examples/command-parsing.js               | 203 +++++++-------
 src/examples/ping-pong.js                     |  92 ++++---
 src/locales/en-US.json                        | 154 ++++++++++-
 src/locales/en.js                             |   7 +-
 src/main.js                                   |  52 +---
 src/prompt.js                                 |   1 +
 src/theme.js                                  | 101 +++++++
 src/toolbox.js                                | 256 +++++++++++++++++-
 vue.config.js                                 |   4 +-
 yarn.lock                                     |  14 -
 167 files changed, 5889 insertions(+), 357 deletions(-)
 delete mode 100644 src/autosave.js
 create mode 100644 src/blocks/database/clear_all_data.js
 create mode 100644 src/blocks/database/db_length.js
 create mode 100644 src/blocks/discord/channels/channel_category.js
 create mode 100644 src/blocks/discord/channels/chnl_exists.js
 create mode 100644 src/blocks/discord/channels/start_typing.js
 create mode 100644 src/blocks/discord/direct/direct_author_raw.js
 create mode 100644 src/blocks/discord/direct/direct_bot.js
 create mode 100644 src/blocks/discord/direct/direct_content.js
 create mode 100644 src/blocks/discord/direct/direct_id.js
 create mode 100644 src/blocks/discord/direct/direct_react.js
 create mode 100644 src/blocks/discord/direct/direct_remove.js
 create mode 100644 src/blocks/discord/direct/direct_reply.js
 create mode 100644 src/blocks/discord/direct/index.js
 create mode 100644 src/blocks/discord/direct/on_direct.js
 create mode 100644 src/blocks/discord/edited-event/edited_author.js
 create mode 100644 src/blocks/discord/edited-event/edited_author_raw.js
 create mode 100644 src/blocks/discord/edited-event/edited_channel.js
 create mode 100644 src/blocks/discord/edited-event/edited_channel_raw.js
 create mode 100644 src/blocks/discord/edited-event/edited_delete.js
 create mode 100644 src/blocks/discord/edited-event/edited_guild_raw.js
 create mode 100644 src/blocks/discord/edited-event/edited_id.js
 create mode 100644 src/blocks/discord/edited-event/edited_reaction.js
 create mode 100644 src/blocks/discord/edited-event/edited_reply.js
 create mode 100644 src/blocks/discord/edited-event/edited_server.js
 create mode 100644 src/blocks/discord/edited-event/index.js
 create mode 100644 src/blocks/discord/edited-event/new_content.js
 create mode 100644 src/blocks/discord/edited-event/new_edited_mentioned_member.js
 create mode 100644 src/blocks/discord/edited-event/old_content.js
 create mode 100644 src/blocks/discord/edited-event/old_edited_mentioned_member.js
 create mode 100644 src/blocks/discord/edited-event/on_edited.js
 create mode 100644 src/blocks/discord/embed/create_new_embed.js
 create mode 100644 src/blocks/discord/events/av-url.js
 create mode 100644 src/blocks/discord/events/deaf-type.js
 create mode 100644 src/blocks/discord/events/discrim-update.js
 create mode 100644 src/blocks/discord/events/index.js
 create mode 100644 src/blocks/discord/events/j_or_l-channel-raw.js
 create mode 100644 src/blocks/discord/events/j_or_l-channel.js
 create mode 100644 src/blocks/discord/events/member.js
 create mode 100644 src/blocks/discord/events/mute-type.js
 create mode 100644 src/blocks/discord/events/new_channel-raw.js
 create mode 100644 src/blocks/discord/events/old_channel-raw.js
 create mode 100644 src/blocks/discord/events/old_mute-type.js
 create mode 100644 src/blocks/discord/events/stream_channel-raw.js
 create mode 100644 src/blocks/discord/events/streaming_chnl.js
 create mode 100644 src/blocks/discord/events/switch_chnl.js
 create mode 100644 src/blocks/discord/events/user-updates.js
 create mode 100644 src/blocks/discord/events/user.js
 create mode 100644 src/blocks/discord/events/username-update.js
 create mode 100644 src/blocks/discord/events/vc-1.js
 create mode 100644 src/blocks/discord/events/vc-2.js
 create mode 100644 src/blocks/discord/events/vc-3.js
 create mode 100644 src/blocks/discord/events/vc-4.js
 create mode 100644 src/blocks/discord/events/vc-5.js
 create mode 100644 src/blocks/discord/invite/index.js
 create mode 100644 src/blocks/discord/invite/inv_guild.js
 create mode 100644 src/blocks/discord/invite/inv_max.js
 create mode 100644 src/blocks/discord/invite/invite_author.js
 create mode 100644 src/blocks/discord/invite/invite_channel.js
 create mode 100644 src/blocks/discord/invite/invite_channel_raw.js
 create mode 100644 src/blocks/discord/invite/invite_code.js
 create mode 100644 src/blocks/discord/invite/invite_create.js
 create mode 100644 src/blocks/discord/invite/invite_date.js
 create mode 100644 src/blocks/discord/invite/invite_delete.js
 create mode 100644 src/blocks/discord/invite/invite_url.js
 create mode 100644 src/blocks/discord/invite/invite_uses.js
 create mode 100644 src/blocks/discord/members/member_is_streaming.js
 create mode 100644 src/blocks/discord/members/member_status.js
 create mode 100644 src/blocks/discord/message-event/message_start_thread.js
 create mode 100644 src/blocks/discord/message-event/message_timestamp.js
 create mode 100644 src/blocks/discord/message-event/reference_reply.js
 create mode 100644 src/blocks/discord/message-event/started_thread.js
 create mode 100644 src/blocks/discord/roles/has_role.js
 create mode 100644 src/blocks/discord/roles/role_exists.js
 create mode 100644 src/blocks/discord/slash/index.js
 create mode 100644 src/blocks/discord/slash/on_slash.js
 create mode 100644 src/blocks/discord/slash/slash_author.js
 create mode 100644 src/blocks/discord/slash/slash_channel.js
 create mode 100644 src/blocks/discord/slash/slash_name.js
 create mode 100644 src/blocks/discord/slash/slash_reply.js
 create mode 100644 src/blocks/discord/slash/slash_server.js
 create mode 100644 src/blocks/discord/slash/slash_value.js
 create mode 100644 src/blocks/discord/thread-event/channel_thread.js
 create mode 100644 src/blocks/discord/thread-event/created-thread.js
 create mode 100644 src/blocks/discord/thread-event/deleted_thread.js
 create mode 100644 src/blocks/discord/thread-event/index.js
 create mode 100644 src/blocks/discord/thread-event/message_thread.js
 create mode 100644 src/blocks/discord/thread-event/message_thread_guild.js
 create mode 100644 src/blocks/discord/thread-event/on_new_thread.js
 create mode 100644 src/blocks/discord/thread-event/on_thread_archive.js
 create mode 100644 src/blocks/discord/thread-event/on_thread_message.js
 create mode 100644 src/blocks/discord/thread-event/on_thread_remove.js
 create mode 100644 src/blocks/discord/thread-event/on_thread_unarchive.js
 create mode 100644 src/blocks/discord/thread-event/send_thread.js
 create mode 100644 src/blocks/discord/thread-event/start_thread.js
 create mode 100644 src/blocks/discord/thread-event/started_thread.js
 create mode 100644 src/blocks/discord/thread-event/thread_archive.js
 create mode 100644 src/blocks/discord/thread-event/thread_guild_raw.js
 create mode 100644 src/blocks/discord/thread-event/thread_message_author.js
 create mode 100644 src/blocks/discord/thread-event/thread_message_author_raw.js
 create mode 100644 src/blocks/discord/thread-event/thread_message_content.js
 create mode 100644 src/blocks/discord/thread-event/thread_message_delete.js
 create mode 100644 src/blocks/discord/thread-event/thread_message_id.js
 create mode 100644 src/blocks/discord/thread-event/thread_name.js
 create mode 100644 src/blocks/discord/thread-event/thread_react.js
 create mode 100644 src/blocks/discord/thread-event/thread_reply.js
 create mode 100644 src/blocks/discord/thread-event/thread_server.js
 create mode 100644 src/blocks/discord/thread-event/thread_thread_raw.js
 create mode 100644 src/blocks/discord/thread-event/unarchived_thread.js
 create mode 100644 src/blocks/discord/typing-event/index.js
 create mode 100644 src/blocks/discord/typing-event/typing_author.js
 create mode 100644 src/blocks/discord/typing-event/typing_channel.js
 create mode 100644 src/blocks/discord/typing-event/typing_channel_raw.js
 create mode 100644 src/blocks/discord/typing-event/typing_guild.js
 create mode 100644 src/blocks/discord/typing-event/typing_on_start.js
 create mode 100644 src/blocks/discord/typing-event/typing_timestamp.js
 create mode 100644 src/blocks/other/cpu_model.js
 create mode 100644 src/blocks/other/cpu_usage.js
 create mode 100644 src/blocks/other/eval.js
 create mode 100644 src/blocks/other/eval_output.js
 create mode 100644 src/blocks/other/get_cpu_usage.js
 create mode 100644 src/blocks/other/log.js
 create mode 100644 src/blocks/request/get_value.js
 create mode 100644 src/blocks/request/get_value_of_object.js
 create mode 100644 src/blocks/request/index.js
 create mode 100644 src/blocks/request/request_then.js
 create mode 100644 src/blocks/request/requested_object.js
 create mode 100644 src/blocks/time/date_get_value.js
 create mode 100644 src/blocks/time/date_now.js
 create mode 100644 src/blocks/time/date_to_discord.js
 create mode 100644 src/blocks/time/date_to_string.js
 create mode 100644 src/blocks/time/index.js
 create mode 100644 src/theme.js

diff --git a/.gitignore b/.gitignore
index fe6ac4308..3c3629e64 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1 @@
-# Node
 node_modules
-
-# Compiled files
-dist/
diff --git a/package.json b/package.json
index 9cc6cc1ce..d8cf65058 100644
--- a/package.json
+++ b/package.json
@@ -11,8 +11,8 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@blockly/theme-modern": "^2.1.10",
     "@fortawesome/fontawesome-svg-core": "^1.2.34",
+    "@blockly/theme-modern": "^2.1.10",
     "@fortawesome/free-solid-svg-icons": "^5.15.2",
     "@fortawesome/vue-fontawesome": "^2.0.2",
     "blockly": "^4.20201217.0",
@@ -21,7 +21,6 @@
     "easy-json-database-browser": "^2.1.0",
     "js-beautify": "^1.13.5",
     "jszip": "^3.6.0",
-    "localforage": "^1.10.0",
     "sweetalert2": "^10.15.5",
     "vue": "^2.6.12",
     "vue-i18n": "^8.24.0",
diff --git a/public/index.html b/public/index.html
index e514d46bd..7c0ec36ac 100755
--- a/public/index.html
+++ b/public/index.html
@@ -12,6 +12,20 @@
         <meta name="theme-color" content="#f6bc34" />
         <meta name="google-site-verification" content="cpALYx5PHSXOgLtp-1pxqyELC6zIekO0RDQnWmFvhXI" />
         <style>
+                    .blocklyTreeSeparator {
+                        border-bottom: solid #555555 1px;
+                        height: 0;
+                        margin: 5px 0;
+                    }
+                    .bt {
+                        border-bottom: solid #555555 1px;
+                        height: 0;
+                        margin: 5px 0;
+                    }
+
+                    .blocklyToolboxDiv {
+                        width: 150px;
+                    }
             ::-webkit-scrollbar {
                 width: 1px;
                 height: 1px;
diff --git a/src/App.vue b/src/App.vue
index bb11abca0..001d3b075 100755
--- a/src/App.vue
+++ b/src/App.vue
@@ -20,7 +20,14 @@ import "./blocks/discord/base/";
 import "./blocks/discord/message-event/";
 import "./blocks/discord/join-event/";
 import "./blocks/discord/leave-event/";
+import "./blocks/discord/invite";
 import "./blocks/discord/reaction-event/";
+import "./blocks/discord/edited-event/";
+import "./blocks/discord/typing-event";
+import "./blocks/discord/thread-event";
+import "./blocks/discord/events";
+import "./blocks/discord/direct";
+import "./blocks/discord/slash";
 
 import "./blocks/discord/channels/";
 import "./blocks/discord/servers/";
@@ -31,9 +38,11 @@ import "./blocks/database/";
 import "./blocks/text/";
 import "./blocks/loops/";
 import "./blocks/other/";
+import "./blocks/request";
+import "./blocks/time";
 import "./prompt";
 
-import Theme from '@blockly/theme-modern';
+import Theme from './theme';
 
 export default {
     name: "app",
@@ -76,6 +85,14 @@ export default {
                     maxScale: 3,
                     minScale: 0.3,
                     scaleSpeed: 1.2
+                },
+                move: {
+                    scrollbars: {
+                        horizontal:true,
+                        vertical:true
+                    },
+                    drag:true,
+                    wheel:true
                 }
             },
             vueTourOptions: {
@@ -126,7 +143,7 @@ export default {
 #blocklySpace {
     position: absolute;
     width: 100%;
-    height: 94%;
+    height: calc(100% - 66px);
 }
 
 .boldtext {
diff --git a/src/autosave.js b/src/autosave.js
deleted file mode 100644
index d4be2bce2..000000000
--- a/src/autosave.js
+++ /dev/null
@@ -1,58 +0,0 @@
-import Blockly from "blockly";
-import localforage from "localforage";
-import Swal from "sweetalert2";
-
-const DISABLED_EVENTS = [
-  Blockly.Events.BUBBLE_OPEN,
-  Blockly.Events.BUMP_EVENTS,
-  Blockly.Events.CLICK,
-  Blockly.Events.BLOCK_DRAG,
-  Blockly.Events.FINISHED_LOADING,
-  Blockly.Events.SELECTED,
-  Blockly.Events.THEME_CHANGE,
-  Blockly.Events.TOOLBOX_ITEM_SELECT,
-  Blockly.Events.TRASHCAN_OPEN,
-  Blockly.Events.UI,
-  Blockly.Events.VIEWPORT_CHANGE,
-];
-
-export default async function register(self) {
-  const workspace = self.$store.state.workspace;
-  const keys = await localforage.keys();
-
-  if (keys?.length) {
-    Swal.fire({
-      title: self.$t("autosave.title"),
-      html: `
-        ${self.$t("autosave.text")}<br><br>
-        <select class="custom-select" id="restore-select">
-            ${keys.map((key) => `<option><b>${key}</b></option>`)}
-        </select>
-      `,
-      showCancelButton: true,
-      cancelButtonText: self.$t("autosave.cancel"),
-      confirmButtonText: self.$t("autosave.restore"),
-      preConfirm: async () => {
-        const select = document.getElementById("restore-select");
-        const xml = await localforage.getItem(select.value);
-        Blockly.Xml.domToWorkspace(Blockly.Xml.textToDom(xml), workspace);
-      },
-    })
-  }
-
-  workspace.addChangeListener((event) => {
-    if (DISABLED_EVENTS.includes(event.type)) return;
-    handle(workspace);
-  });
-}
-
-async function handle(workspace) {
-  const content = Blockly.Xml.domToPrettyText(
-    Blockly.Xml.workspaceToDom(workspace)
-  );
-  const fileName = `${encodeURIComponent(
-    document.querySelector("#docName").textContent
-  ).replace(/%20/g, " ")}`;
-
-  await localforage.setItem(fileName, content);
-}
diff --git a/src/blocks/database/clear_all_data.js b/src/blocks/database/clear_all_data.js
new file mode 100644
index 000000000..cb09e85db
--- /dev/null
+++ b/src/blocks/database/clear_all_data.js
@@ -0,0 +1,21 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_clear_all_data";
+
+const blockData = {
+    "message0": "%{BKY_CLEAR_ALL_DATA}",
+    "colour": "#5ba58b",
+    "helpUrl": "",
+    "previousStatement": null,
+    "nextStatement": null
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    return [ 's4d.database.clear()', Blockly.JavaScript.ORDER_ATOMIC ];
+};
diff --git a/src/blocks/database/db_length.js b/src/blocks/database/db_length.js
new file mode 100644
index 000000000..94aff4e13
--- /dev/null
+++ b/src/blocks/database/db_length.js
@@ -0,0 +1,20 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_db_length";
+
+const blockData = {
+    "message0": "%{BKY_DATABASE_LENGTH}",
+    "colour": "#5ba58b",
+    "helpUrl": "",
+    "output": "Number"
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    return [ 's4d.database.all().length', Blockly.JavaScript.ORDER_ATOMIC ];
+};
diff --git a/src/blocks/database/index.js b/src/blocks/database/index.js
index a377497ca..f63198a71 100644
--- a/src/blocks/database/index.js
+++ b/src/blocks/database/index.js
@@ -4,3 +4,6 @@ import "./get_data";
 import "./has_data";
 import "./set_data";
 import "./subtract_data";
+import "./clear_all_data";
+import "./db_length";
+
diff --git a/src/blocks/discord/channels/channel_category.js b/src/blocks/discord/channels/channel_category.js
new file mode 100644
index 000000000..18361e5c8
--- /dev/null
+++ b/src/blocks/discord/channels/channel_category.js
@@ -0,0 +1,40 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_channel_category";
+
+const blockData = {
+    "message0": "%{BKY_CHANNEL_CATEGORY}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CHANNEL",
+            "check": "Channel"
+        }
+    ],
+    "colour": "#50a6c9",
+    "output": "Category",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const channel = Blockly.JavaScript.valueToCode(block, "CHANNEL", Blockly.JavaScript.ORDER_ATOMIC);
+    return [ `${channel}.parent`, Blockly.JavaScript.ORDER_NONE ];
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_VALID_CHANNEL",
+        types: [
+            "CHANNEL"
+        ]
+    }
+]);
\ No newline at end of file
diff --git a/src/blocks/discord/channels/chnl_exists.js b/src/blocks/discord/channels/chnl_exists.js
new file mode 100644
index 000000000..ee71945e1
--- /dev/null
+++ b/src/blocks/discord/channels/chnl_exists.js
@@ -0,0 +1,42 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_chnl_exist";
+
+const blockData = {
+    "message0": "channel %1 exist?",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CHANNEL",
+            "check": "Channel"
+        }
+    ],
+    "colour": "#50a6c9",
+    "output": "Boolean",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const chnl = Blockly.JavaScript.valueToCode(block, "CHANNEL", Blockly.JavaScript.ORDER_ATOMIC);
+    const code = [`typeof ${chnl} !== undefined`, Blockly.JavaScript.ORDER_NONE ];
+    return code;
+    
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_VALID_CHANNEL",
+        types: [
+            "CHANNEL"
+        ]
+    }
+]);
\ No newline at end of file
diff --git a/src/blocks/discord/channels/index.js b/src/blocks/discord/channels/index.js
index 154ca2f09..b22140d4b 100644
--- a/src/blocks/discord/channels/index.js
+++ b/src/blocks/discord/channels/index.js
@@ -3,3 +3,6 @@ import "./get_channel";
 import "./send_channel";
 import "./send_wait_reply";
 import "./send_wait_reply_value";
+import "./start_typing";
+import "./channel_category";
+import "./chnl_exists";
\ No newline at end of file
diff --git a/src/blocks/discord/channels/send_channel.js b/src/blocks/discord/channels/send_channel.js
index c7a66b4fa..901977b98 100644
--- a/src/blocks/discord/channels/send_channel.js
+++ b/src/blocks/discord/channels/send_channel.js
@@ -9,15 +9,21 @@ const blockData = {
         {
             "type": "input_value",
             "name": "CONTENT",
-            "check": [ "MessageEmbed", "String", "Number" ]
+            "check": ["Number", "String"]
+        },
+        {
+            "type": "input_value",
+            "name": "EMBED",
+            "check": "MessageEmbed"
         },
         {
             "type": "input_value",
             "name": "CHANNEL",
             "check": "Channel"
-        },
+        }
     ],
     "colour": "#4C97FF",
+    "inputsInline": false,
     "previousStatement": null,
     "nextStatement": null,
     "tooltip": "",
@@ -31,38 +37,22 @@ Blockly.Blocks[blockName] = {
 };
 
 Blockly.JavaScript[blockName] = function(block){
-    const channel = Blockly.JavaScript.valueToCode(block, "CHANNEL", Blockly.JavaScript.ORDER_ATOMIC);
     const content = Blockly.JavaScript.valueToCode(block, "CONTENT", Blockly.JavaScript.ORDER_ATOMIC);
-    if(block.getInput("CONTENT").connection.targetConnection){
-        const contentType = block.getInput("CONTENT").connection.targetConnection.getSourceBlock().outputConnection.check_ ?
-        block.getInput("CONTENT").connection.targetConnection.getSourceBlock().outputConnection.check_[0] :
-        null;
-        if((contentType === "MessageEmbed") || (!contentType && typeof contentType === "object")){
-            const code = `${channel}.send(${content});\n`;
-            return code;
-        } else {
-            const code = `${channel}.send(String(${content}));\n`;
-            return code;
-        }
+    const embed = Blockly.JavaScript.valueToCode(block, "EMBED", Blockly.JavaScript.ORDER_ATOMIC) || null;
+    const channel = Blockly.JavaScript.valueToCode(block, "CHANNEL", Blockly.JavaScript.ORDER_ATOMIC) || "false";
+    if(content.length > 2){
+        return(`${channel}.send({embeds: ${embed}, content: ${content}});\n`)
     } else {
-        const code = `${channel}.send(String(${content}));\n`;
-        return code;
+        return(`${channel}.send({embeds: ${embed}});\n`)
     }
-};
+}
 
 registerRestrictions(blockName, [
     {
         type: "notempty",
-        message: "RES_SEND_CHANNEL_CONTENT",
-        types: [
-            "CONTENT"
-        ]
-    },
-    {
-        type: "notempty",
-        message: "RES_SEND_CHANNEL_CHANNEL",
+        message: "RES_MISSING_CONTENT",
         types: [
-            "CHANNEL"
+          "CONTENT"
         ]
     }
 ]);
diff --git a/src/blocks/discord/channels/start_typing.js b/src/blocks/discord/channels/start_typing.js
new file mode 100644
index 000000000..3aade3dae
--- /dev/null
+++ b/src/blocks/discord/channels/start_typing.js
@@ -0,0 +1,46 @@
+
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_start_typing";
+
+const blockData = {
+    "message0": "%{BKY_START_TYPING}",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_value",
+            "name": "CHANNEL",
+            "check": "Channel"
+        }
+    ],
+    "colour": "#4C97FF",
+    "tooltip": "Will type in channel for 3 seconds",
+    "helpUrl": "",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const channel = Blockly.JavaScript.valueToCode(block, "CHANNEL", Blockly.JavaScript.ORDER_ATOMIC);
+    return `${channel}.sendTyping();\n`;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_VALID_MEMBER",
+        types: [
+            "CHANNEL"
+        ]
+    }
+]);
\ No newline at end of file
diff --git a/src/blocks/discord/direct/direct_author_raw.js b/src/blocks/discord/direct/direct_author_raw.js
new file mode 100644
index 000000000..29ac3625b
--- /dev/null
+++ b/src/blocks/discord/direct/direct_author_raw.js
@@ -0,0 +1,69 @@
+import * as Blockly from "blockly";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_direct_author_raw";
+
+const blockData = {
+    "message0": "%{BKY_DIRECT_AUTHOR_RAW}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_USERNAME}",
+                    "USERNAME"
+                ],
+                [
+                    "%{BKY_DISCRIMINATOR}",
+                    "DISCRIMINATOR"
+                ],
+                [
+                    "id",
+                    "ID"
+                ],
+                [
+                    "%{BKY_TAG}",
+                    "TAG"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["s4dmessage.author.id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "USERNAME"){
+        const code = ["s4dmessage.author.username", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "DISCRIMINATOR"){
+        const code = ["s4dmessage.author.discriminator", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }else if(searchType === "TAG"){
+        const code = ["s4dmessage.author.tag", Blockly.JavaScript.ORDER_NONE];
+        return code
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_direct"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/direct/direct_bot.js b/src/blocks/discord/direct/direct_bot.js
new file mode 100644
index 000000000..7e8401e0e
--- /dev/null
+++ b/src/blocks/discord/direct/direct_bot.js
@@ -0,0 +1,33 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_direct_bot";
+
+const blockData = {
+    "message0": "%{BKY_DIRECT_BOT}",
+    "colour": "#5B80A5",
+    "tooltip": "",
+    "output": "Boolean",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dmessage.author.bot", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_DIRECT",
+        types: [
+            "s4d_on_direct"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/direct/direct_content.js b/src/blocks/discord/direct/direct_content.js
new file mode 100644
index 000000000..579c95943
--- /dev/null
+++ b/src/blocks/discord/direct/direct_content.js
@@ -0,0 +1,33 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_direct_content";
+
+const blockData = {
+    "message0": "%{BKY_DIRECT_CONTENT}",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "output": "String",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dmessage.content", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_DIRECT",
+        types: [
+            "s4d_on_direct"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/direct/direct_id.js b/src/blocks/discord/direct/direct_id.js
new file mode 100644
index 000000000..a0e48a89d
--- /dev/null
+++ b/src/blocks/discord/direct/direct_id.js
@@ -0,0 +1,33 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_direct_id";
+
+const blockData = {
+    "message0": "%{BKY_DIRECT_ID}",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "output": "String",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dmessage.id", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_DIRECT",
+        types: [
+            "s4d_on_direct"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/direct/direct_react.js b/src/blocks/discord/direct/direct_react.js
new file mode 100644
index 000000000..5a15f648f
--- /dev/null
+++ b/src/blocks/discord/direct/direct_react.js
@@ -0,0 +1,49 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_direct_reaction";
+
+const blockData = {
+    "message0": "%{BKY_DIRECT_REACTION}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "REACTION",
+            "check": "String"
+        }
+    ],
+    "previousStatement": null,
+    "nextStatement": null,
+    "colour": "#4C97FF",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const reaction = Blockly.JavaScript.valueToCode(block, "REACTION", Blockly.JavaScript.ORDER_ATOMIC);
+    const code = `s4dmessage.react(${reaction});`;
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_ADD_REACTION_MISSING_REACTION",
+        types: [
+            "REACTION"
+        ]
+    },
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_direct"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/direct/direct_remove.js b/src/blocks/discord/direct/direct_remove.js
new file mode 100644
index 000000000..48435f820
--- /dev/null
+++ b/src/blocks/discord/direct/direct_remove.js
@@ -0,0 +1,34 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_direct_delete";
+
+const blockData = {
+    "message0": "%{BKY_DELETE_DIRECT}",
+    "colour": "#4C97FF",
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(){
+    const code = `s4dmessage.delete();\n`;
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_direct"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/direct/direct_reply.js b/src/blocks/discord/direct/direct_reply.js
new file mode 100644
index 000000000..5ec486ce4
--- /dev/null
+++ b/src/blocks/discord/direct/direct_reply.js
@@ -0,0 +1,72 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_direct_reply";
+
+const blockData = {
+    "message0": "%{BKY_DIRECT_REPLY}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CONTENT",
+            "check": ["Number", "String"]
+        },
+        {
+            "type": "input_value",
+            "name": "EMBED",
+            "check": "MessageEmbed"
+        },
+        {
+            "type": "input_value",
+            "name": "MENTION",
+            "check": "Boolean"
+        }
+    ],
+    "colour": "#4C97FF",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const content = Blockly.JavaScript.valueToCode(block, "CONTENT", Blockly.JavaScript.ORDER_ATOMIC);
+    const embed = Blockly.JavaScript.valueToCode(block, "EMBED", Blockly.JavaScript.ORDER_ATOMIC) || null;
+    const mention = Blockly.JavaScript.valueToCode(block, "MENTION", Blockly.JavaScript.ORDER_ATOMIC) || "false";
+    if(mention === "true") {
+        if(content.length > 2){
+            return(`s4dmessage.reply({embeds: ${embed}, content: ${content}});\n`)
+        } else {
+            return(`s4dmessage.reply({embeds: ${embed}});\n`)
+        }
+    }else {
+        if(content.length > 2){
+            return(`s4dmessage.channel.send({embeds: ${embed}, content: ${content}});\n`)
+        } else {
+            return(`s4dmessage.channel.send({embeds: ${embed}});\n`)
+        }
+    }}
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_CONTENT",
+        types: [
+          "CONTENT"
+        ]
+    },
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_DIRECT",
+        types: [
+            "s4d_on_direct"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/direct/index.js b/src/blocks/discord/direct/index.js
new file mode 100644
index 000000000..5dfbbd13c
--- /dev/null
+++ b/src/blocks/discord/direct/index.js
@@ -0,0 +1,8 @@
+import "./on_direct";
+import "./direct_reply";
+import "./direct_content";
+import "./direct_id";
+import "./direct_author_raw";
+import "./direct_bot";
+import "./direct_remove";
+import "./direct_react";
diff --git a/src/blocks/discord/direct/on_direct.js b/src/blocks/discord/direct/on_direct.js
new file mode 100644
index 000000000..366db48e4
--- /dev/null
+++ b/src/blocks/discord/direct/on_direct.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_direct";
+
+const blockData = {
+    "message0": "%{BKY_ON_DIRECT} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('messageCreate', async (s4dmessage) => {\nif(s4dmessage.channel.type === "DM"){\n${statements}\n}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/edited-event/edited_author.js b/src/blocks/discord/edited-event/edited_author.js
new file mode 100644
index 000000000..0c57ca326
--- /dev/null
+++ b/src/blocks/discord/edited-event/edited_author.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_author";
+
+const blockData = {
+    "message0": "%{BKY_EDITED_AUTHOR}",
+    "colour": "#187795",
+    "output": "Member",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["newMessage.member", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/edited_author_raw.js b/src/blocks/discord/edited-event/edited_author_raw.js
new file mode 100644
index 000000000..4fdbf3988
--- /dev/null
+++ b/src/blocks/discord/edited-event/edited_author_raw.js
@@ -0,0 +1,62 @@
+import * as Blockly from "blockly";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_author_raw";
+
+const blockData = {
+    "message0": "%{BKY_EDITED_AUTHOR_RAW}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_USERNAME}",
+                    "USERNAME"
+                ],
+                [
+                    "%{BKY_NICKNAME}",
+                    "NICKNAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["newMessage.author.id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "USERNAME"){
+        const code = ["newMessage.author.username", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NICKNAME"){
+        const code = ["(newMessage.member || await newMessage.guild.members.fetch(newMessage.author.id)).nickname", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/edited_channel.js b/src/blocks/discord/edited-event/edited_channel.js
new file mode 100644
index 000000000..77f64fbb3
--- /dev/null
+++ b/src/blocks/discord/edited-event/edited_channel.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_channel";
+
+const blockData = {
+    "message0": "%{BKY_EDITED_MESSAGE_CHANNEL}",
+    "colour": "#a55b80",
+    "output": "Channel",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["newMessage.channel", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/edited_channel_raw.js b/src/blocks/discord/edited-event/edited_channel_raw.js
new file mode 100644
index 000000000..22a6ca6ff
--- /dev/null
+++ b/src/blocks/discord/edited-event/edited_channel_raw.js
@@ -0,0 +1,55 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_channel_raw";
+
+const blockData = {
+    "message0": "%{BKY_EDITED_CHANNEL_RAW}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_NAME}",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["(newMessage.channel || {}).id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NAME"){
+        const code = ["(newMessage.channel || {}).name", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/edited_delete.js b/src/blocks/discord/edited-event/edited_delete.js
new file mode 100644
index 000000000..ffe750231
--- /dev/null
+++ b/src/blocks/discord/edited-event/edited_delete.js
@@ -0,0 +1,34 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_delete";
+
+const blockData = {
+    "message0": "%{BKY_DELETE_EDITED_MESSAGE}",
+    "colour": "#4C97FF",
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(){
+    const code = `newMessage.delete();\n`;
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/edited_guild_raw.js b/src/blocks/discord/edited-event/edited_guild_raw.js
new file mode 100644
index 000000000..e6beafdcf
--- /dev/null
+++ b/src/blocks/discord/edited-event/edited_guild_raw.js
@@ -0,0 +1,55 @@
+import * as Blockly from "blockly";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_guild_raw";
+
+const blockData = {
+    "message0": "%{BKY_EDITED_GUILD_RAW}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_NAME}",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["(newMessage.guild || {}).id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NAME"){
+        const code = ["(newMessage.guild || {}).name", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/edited_id.js b/src/blocks/discord/edited-event/edited_id.js
new file mode 100644
index 000000000..ab775c886
--- /dev/null
+++ b/src/blocks/discord/edited-event/edited_id.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_id";
+
+const blockData = {
+    "message0": "%{BKY_EDITED_ID}",
+    "colour": "#5BA58C",
+    "output": "String",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["newMessage.id", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/edited_reaction.js b/src/blocks/discord/edited-event/edited_reaction.js
new file mode 100644
index 000000000..0b7381e0c
--- /dev/null
+++ b/src/blocks/discord/edited-event/edited_reaction.js
@@ -0,0 +1,49 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_add_edited_reaction";
+
+const blockData = {
+    "message0": "%{BKY_ADD_REACTION}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "REACTION",
+            "check": "String"
+        }
+    ],
+    "previousStatement": null,
+    "nextStatement": null,
+    "colour": "#4C97FF",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const reaction = Blockly.JavaScript.valueToCode(block, "REACTION", Blockly.JavaScript.ORDER_ATOMIC);
+    const code = `newMessage.react(${reaction});`;
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_ADD_REACTION_MISSING_REACTION",
+        types: [
+            "REACTION"
+        ]
+    },
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/edited_reply.js b/src/blocks/discord/edited-event/edited_reply.js
new file mode 100644
index 000000000..dd4c01a61
--- /dev/null
+++ b/src/blocks/discord/edited-event/edited_reply.js
@@ -0,0 +1,72 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_reply";
+
+const blockData = {
+    "message0": "%{BKY_EDITED_REPLY}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CONTENT",
+            "check": ["Number", "String"]
+        },
+        {
+            "type": "input_value",
+            "name": "EMBED",
+            "check": "MessageEmbed"
+        },
+        {
+            "type": "input_value",
+            "name": "MENTION",
+            "check": "Boolean"
+        }
+    ],
+    "colour": "#4C97FF",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const content = Blockly.JavaScript.valueToCode(block, "CONTENT", Blockly.JavaScript.ORDER_ATOMIC);
+    const embed = Blockly.JavaScript.valueToCode(block, "EMBED", Blockly.JavaScript.ORDER_ATOMIC) || null;
+    const mention = Blockly.JavaScript.valueToCode(block, "MENTION", Blockly.JavaScript.ORDER_ATOMIC) || "false";
+    if(mention === "true") {
+        if(content.length > 2){
+            return(`newMessage.reply({embeds: ${embed}, content: ${content}});\n`)
+        } else {
+            return(`newMessage.reply({embeds: ${embed}});\n`)
+        }
+    }else {
+        if(content.length > 2){
+            return(`newMessage.channel.send({embeds: ${embed}, content: ${content}});\n`)
+        } else {
+            return(`newMessage.channel.send({embeds: ${embed}});\n`)
+        }
+    }}
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_CONTENT",
+        types: [
+          "CONTENT"
+        ]
+    },
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/edited_server.js b/src/blocks/discord/edited-event/edited_server.js
new file mode 100644
index 000000000..7c689fa14
--- /dev/null
+++ b/src/blocks/discord/edited-event/edited_server.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_server";
+
+const blockData = {
+    "message0": "%{BKY_EDITED_GUILD}",
+    "colour": "#D85E47",
+    "output": "Server",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["newMessage.guild", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/index.js b/src/blocks/discord/edited-event/index.js
new file mode 100644
index 000000000..fe85386dc
--- /dev/null
+++ b/src/blocks/discord/edited-event/index.js
@@ -0,0 +1,15 @@
+import("./on_edited");
+import("./new_content");
+import("./old_content");
+import("./edited_author");
+import("./edited_server");
+import("./edited_id");
+import("./new_edited_mentioned_member");
+import("./edited_delete");
+import("./edited_reply");
+import("./edited_reaction");
+import("./old_edited_mentioned_member");
+import("./edited_channel");
+import("./edited_author_raw");
+import("./edited_channel_raw");
+import("./edited_guild_raw");
diff --git a/src/blocks/discord/edited-event/new_content.js b/src/blocks/discord/edited-event/new_content.js
new file mode 100644
index 000000000..3de6c7bde
--- /dev/null
+++ b/src/blocks/discord/edited-event/new_content.js
@@ -0,0 +1,33 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_new_content";
+
+const blockData = {
+    "message0": "%{BKY_NEW_CONTENT}",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "output": "String",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["newMessage.content", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/new_edited_mentioned_member.js b/src/blocks/discord/edited-event/new_edited_mentioned_member.js
new file mode 100644
index 000000000..8db301e1e
--- /dev/null
+++ b/src/blocks/discord/edited-event/new_edited_mentioned_member.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_new_mentioned_member";
+
+const blockData = {
+    "message0": "%{BKY_NEW_EDITED_MENTIONED_MEMBER}",
+    "colour": "#187795",
+    "tooltip": "",
+    "output": "Member",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = [`newMessage.mentions.members.first()`, Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/old_content.js b/src/blocks/discord/edited-event/old_content.js
new file mode 100644
index 000000000..997a1dc39
--- /dev/null
+++ b/src/blocks/discord/edited-event/old_content.js
@@ -0,0 +1,33 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_old_content";
+
+const blockData = {
+    "message0": "%{BKY_OLD_CONTENT}",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "output": "String",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["oldMessage.content", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/old_edited_mentioned_member.js b/src/blocks/discord/edited-event/old_edited_mentioned_member.js
new file mode 100644
index 000000000..a705a6690
--- /dev/null
+++ b/src/blocks/discord/edited-event/old_edited_mentioned_member.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_edited_old_mentioned_member";
+
+const blockData = {
+    "message0": "%{BKY_OLD_EDITED_MENTIONED_MEMBER}",
+    "colour": "#187795",
+    "tooltip": "",
+    "output": "Member",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = [`oldMessage.mentions.members.first()`, Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_edited"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/edited-event/on_edited.js b/src/blocks/discord/edited-event/on_edited.js
new file mode 100644
index 000000000..4499badd7
--- /dev/null
+++ b/src/blocks/discord/edited-event/on_edited.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_edited";
+
+const blockData = {
+    "message0": "%{BKY_ON_EDITED} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('messageUpdate', async(oldMessage, newMessage) => {\n${statements}\n});\n`;
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/embed/create_new_embed.js b/src/blocks/discord/embed/create_new_embed.js
new file mode 100644
index 000000000..f78c8e493
--- /dev/null
+++ b/src/blocks/discord/embed/create_new_embed.js
@@ -0,0 +1,31 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_message";
+
+const blockData = {
+    "message0": "%{BKY_CREATE_EMBED} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ],
+    "previousStatement": null,
+    "nextStatement": null,
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('messageCreate', async (s4dmessage) => {\nif(s4dmessage.channel.type === "GUILD_TEXT"){\n${statements}\n}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/events/av-url.js b/src/blocks/discord/events/av-url.js
new file mode 100644
index 000000000..00402784c
--- /dev/null
+++ b/src/blocks/discord/events/av-url.js
@@ -0,0 +1,44 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_av_url_update";
+
+const blockData = {
+    "message0": "%1 Avatar Url",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "Old",
+                    "OA"
+                ],
+                [
+                    "New",
+                    "NA"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "OA"){
+        const code = ["oldAvatarURL", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NA"){
+        const code = ["newAvatarURL", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/deaf-type.js b/src/blocks/discord/events/deaf-type.js
new file mode 100644
index 000000000..0efcb45d9
--- /dev/null
+++ b/src/blocks/discord/events/deaf-type.js
@@ -0,0 +1,22 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_deaf_type";
+
+const blockData = {
+    "message0": "Deaf Type",
+    "colour": "#187795",
+    "output": "Boolean",
+    "tooltip": "The deaf type. It can be self-deafed or server-deafed.",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ['deafType', Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/discrim-update.js b/src/blocks/discord/events/discrim-update.js
new file mode 100644
index 000000000..60148d7dd
--- /dev/null
+++ b/src/blocks/discord/events/discrim-update.js
@@ -0,0 +1,44 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_discrim_update";
+
+const blockData = {
+    "message0": "%1 Discriminator",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "Old",
+                    "OD"
+                ],
+                [
+                    "New",
+                    "ND"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "OD"){
+        const code = ["oldDiscriminator",Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "ND"){
+        const code = ["newDiscriminator",Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/index.js b/src/blocks/discord/events/index.js
new file mode 100644
index 000000000..7e0ea46e1
--- /dev/null
+++ b/src/blocks/discord/events/index.js
@@ -0,0 +1,21 @@
+import "./user-updates";
+import "./vc-1";
+import "./vc-2";
+import "./vc-3";
+import "./vc-4";
+import "./vc-5";
+import "./av-url";
+import "./user";
+import "./discrim-update";
+import "./username-update";
+import "./member";
+import "./j_or_l-channel";
+import "./j_or_l-channel-raw";
+import "./switch_chnl";
+import "./old_channel-raw";
+import "./new_channel-raw";
+import "./mute-type";
+import "./old_mute-type";
+import "./streaming_chnl";
+import "./deaf-type";
+import "./stream_channel-raw";
\ No newline at end of file
diff --git a/src/blocks/discord/events/j_or_l-channel-raw.js b/src/blocks/discord/events/j_or_l-channel-raw.js
new file mode 100644
index 000000000..d9973e6ea
--- /dev/null
+++ b/src/blocks/discord/events/j_or_l-channel-raw.js
@@ -0,0 +1,54 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_join/leave_channel_raw";
+
+const blockData = {
+    "message0": "%1 of channel",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "name",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ],
+                [
+                  "type",
+                  "TYPE"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["channel.id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NAME"){
+        const code = ["channel.name", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "TYPE"){
+        const code = ["channel.type", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
+
diff --git a/src/blocks/discord/events/j_or_l-channel.js b/src/blocks/discord/events/j_or_l-channel.js
new file mode 100644
index 000000000..1bdfa99cf
--- /dev/null
+++ b/src/blocks/discord/events/j_or_l-channel.js
@@ -0,0 +1,24 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_join/leave_channel";
+
+const blockData = {
+    "message0": "channel",
+    "colour": "#a55b80",
+    "output": "Channel",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["channel", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
diff --git a/src/blocks/discord/events/member.js b/src/blocks/discord/events/member.js
new file mode 100644
index 000000000..8589e1b06
--- /dev/null
+++ b/src/blocks/discord/events/member.js
@@ -0,0 +1,24 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_update_member";
+
+const blockData = {
+    "message0": "Updated member",
+    "colour": "#187795",
+    "output": "Member",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["member", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+
diff --git a/src/blocks/discord/events/mute-type.js b/src/blocks/discord/events/mute-type.js
new file mode 100644
index 000000000..da84f7dac
--- /dev/null
+++ b/src/blocks/discord/events/mute-type.js
@@ -0,0 +1,22 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_mute_type";
+
+const blockData = {
+    "message0": "Mute Type",
+    "colour": "#187795",
+    "output": "Boolean",
+    "tooltip": "The mute type can be self-muted or server-muted.",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ['muteType', Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/new_channel-raw.js b/src/blocks/discord/events/new_channel-raw.js
new file mode 100644
index 000000000..4368b891a
--- /dev/null
+++ b/src/blocks/discord/events/new_channel-raw.js
@@ -0,0 +1,51 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_new_channel_raw";
+
+const blockData = {
+    "message0": "%1 of new channel",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "name",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ],
+                [
+                  "type",
+                  "TYPE"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["newChannel.id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NAME"){
+        const code = ["newChannel.name", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "TYPE"){
+        const code = ["newChannel.type", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
diff --git a/src/blocks/discord/events/old_channel-raw.js b/src/blocks/discord/events/old_channel-raw.js
new file mode 100644
index 000000000..3c764f9b7
--- /dev/null
+++ b/src/blocks/discord/events/old_channel-raw.js
@@ -0,0 +1,52 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_old_channel_raw";
+
+const blockData = {
+    "message0": "%1 of old channel",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "name",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ],
+                [
+                  "type",
+                  "TYPE"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["oldChannel.id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NAME"){
+        const code = ["oldChannel.name", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "TYPE"){
+        const code = ["oldChannel.type", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
diff --git a/src/blocks/discord/events/old_mute-type.js b/src/blocks/discord/events/old_mute-type.js
new file mode 100644
index 000000000..ca7079859
--- /dev/null
+++ b/src/blocks/discord/events/old_mute-type.js
@@ -0,0 +1,22 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_oldmute_type";
+
+const blockData = {
+    "message0": "Old Mute Type",
+    "colour": "#187795",
+    "output": "Boolean",
+    "tooltip": "The mute type can be self-muted or server-muted.",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ['oldMuteType', Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/stream_channel-raw.js b/src/blocks/discord/events/stream_channel-raw.js
new file mode 100644
index 000000000..08deb613d
--- /dev/null
+++ b/src/blocks/discord/events/stream_channel-raw.js
@@ -0,0 +1,51 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_stream_channel_raw";
+
+const blockData = {
+    "message0": "%1 of streaming channel",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "name",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ],
+                [
+                  "bitrate",
+                  "BIT"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["voiceChannel.id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NAME"){
+        const code = ["voiceChannel.name", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "BIT"){
+        const code = ["voiceChannel.bitrate", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/streaming_chnl.js b/src/blocks/discord/events/streaming_chnl.js
new file mode 100644
index 000000000..a6727a99e
--- /dev/null
+++ b/src/blocks/discord/events/streaming_chnl.js
@@ -0,0 +1,23 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_streaming_channel";
+
+const blockData = {
+    "message0": "streaming channel",
+    "colour": "#a55b80",
+    "output": "Channel",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["voiceChannel", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/switch_chnl.js b/src/blocks/discord/events/switch_chnl.js
new file mode 100644
index 000000000..6f432e053
--- /dev/null
+++ b/src/blocks/discord/events/switch_chnl.js
@@ -0,0 +1,44 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_switch_chnl";
+
+const blockData = {
+    "message0": "%1 channel",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "Old",
+                    "OLD"
+                ],
+                [
+                    "New",
+                    "NEW"
+                ]
+            ]
+        }
+    ],
+    "output": "Channel",
+    "colour": "#a55b80",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "OLD"){
+        const code = ["oldChannel", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else {
+        const code = ["newChannel", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/user-updates.js b/src/blocks/discord/events/user-updates.js
new file mode 100644
index 000000000..f8101909c
--- /dev/null
+++ b/src/blocks/discord/events/user-updates.js
@@ -0,0 +1,60 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_useru";
+
+const blockData = {
+    "message0": "When a user's %3 updates %1 %2",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        },
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "username",
+                    "NAME"
+                ],
+
+                                [
+                    "discriminator",
+                    "DISCRIM"
+                ],
+              ["avatar",
+              "AV"]
+            ]
+        }
+    ],
+    "colour": "#F5AB1A",
+    "tooltip": "User updates",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+  if(searchType === "NAME"){
+        const code = `s4d.client.on("userUsernameUpdate", 
+    async (user, oldUsername, newUsername) => {${statements}});\n`;
+        return code;
+            } else if(searchType === "DISCRIM"){
+        const code = `s4d.client.on("userDiscriminatorUpdate", async (user, oldDiscriminator, newDiscriminator) => {${statements}});\n`;
+        return code;
+    } else if(searchType === "AV"){
+        const code = `s4d.client.on("userAvatarUpdate", 
+    async (user, oldAvatarURL, newAvatarURL) => {${statements}});\n`;
+        return code;
+    }
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/user.js b/src/blocks/discord/events/user.js
new file mode 100644
index 000000000..37e90c6ad
--- /dev/null
+++ b/src/blocks/discord/events/user.js
@@ -0,0 +1,24 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_update_user";
+
+const blockData = {
+    "message0": "Updated user",
+    "colour": "#187795",
+    "output": "Member",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["user", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
diff --git a/src/blocks/discord/events/username-update.js b/src/blocks/discord/events/username-update.js
new file mode 100644
index 000000000..dbe721392
--- /dev/null
+++ b/src/blocks/discord/events/username-update.js
@@ -0,0 +1,44 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_username_update";
+
+const blockData = {
+    "message0": "%1 Username",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "Old",
+                    "ON"
+                ],
+                [
+                    "New",
+                    "NN"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ON"){
+        const code = ["oldUsername",Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NN"){
+        const code = ["newUsername",Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/vc-1.js b/src/blocks/discord/events/vc-1.js
new file mode 100644
index 000000000..bcc3d9de5
--- /dev/null
+++ b/src/blocks/discord/events/vc-1.js
@@ -0,0 +1,53 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_vc";
+
+const blockData = {
+    "message0": "When a user %3 a vc %1 %2",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        },
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "joins",
+                    "JOIN"
+                ],
+                [
+                    "leaves",
+                    "LEAVE"
+                ]
+            ]
+        }
+    ],
+    "colour": "#F5AB1A",
+    "tooltip": "Voice Channel updates",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "JOIN"){
+        const code = `s4d.client.on("voiceChannelJoin", 
+async (member, channel) => {${statements}});\n`;
+        return code;
+    } else if(searchType === "LEAVE"){
+        const code = `s4d.client.on("voiceChannelLeave",  async (member, channel) => {${statements}});\n`;
+        return code;
+            }
+};
\ No newline at end of file
diff --git a/src/blocks/discord/events/vc-2.js b/src/blocks/discord/events/vc-2.js
new file mode 100644
index 000000000..6b804707d
--- /dev/null
+++ b/src/blocks/discord/events/vc-2.js
@@ -0,0 +1,53 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_vc_um";
+
+const blockData = {
+    "message0": "When a user is %3 in a vc %1 %2",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        },
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "mute",
+                    "MUTE"
+                ],
+                [
+                    "unmute",
+                    "UNMUTE"
+                ]
+            ]
+        }
+    ],
+    "colour": "#F5AB1A",
+    "tooltip": "Voice Channel updates",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "MUTE"){
+        const code = `s4d.client.on("voiceChannelMute", 
+async (member, muteType) => {${statements}});\n`;
+        return code;
+    } else if(searchType === "UNMUTE"){
+        const code = `s4d.client.on("voiceChannelUnmute", async (member, oldMuteType) => {${statements}});\n`;
+        return code;
+    }
+ };
\ No newline at end of file
diff --git a/src/blocks/discord/events/vc-3.js b/src/blocks/discord/events/vc-3.js
new file mode 100644
index 000000000..294d082aa
--- /dev/null
+++ b/src/blocks/discord/events/vc-3.js
@@ -0,0 +1,52 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_vc_ud";
+
+const blockData = {
+    "message0": "When a user is %3 %1 %2",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        },
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "deaf",
+                    "DEAF"
+                ],
+                [
+                    "undeaf",
+                    "UNDEAF"
+                ]
+            ]
+        }
+    ],
+    "colour": "#F5AB1A",
+    "tooltip": "Voice Channel updates",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "DEAF"){
+        const code = `s4d.client.on("voiceChannelDeaf", async (member, deafType) => {${statements}});\n`;
+        return code;
+    } else if(searchType === "UNDEAF"){
+        const code = `s4d.client.on("voiceChannelUndeaf", (member, deafType) => {${statements}});\n`;
+        return code;
+    }
+ };
\ No newline at end of file
diff --git a/src/blocks/discord/events/vc-4.js b/src/blocks/discord/events/vc-4.js
new file mode 100644
index 000000000..63a2e006d
--- /dev/null
+++ b/src/blocks/discord/events/vc-4.js
@@ -0,0 +1,53 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_vc_sss";
+
+const blockData = {
+    "message0": "When a user %3 streaming in a vc %1 %2",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        },
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "starts",
+                    "START"
+                ],
+                [
+                    "stops",
+                    "STOP"
+                ]
+            ]
+        }
+    ],
+    "colour": "#F5AB1A",
+    "tooltip": "Voice Channel updates",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "START"){
+        const code = `s4d.client.on("voiceStreamingStart", 
+async (member, voiceChannel) => {${statements}});\n`;
+        return code;
+    } else if(searchType === "STOP"){
+        const code = `s4d.client.on("voiceStreamingStop", async (member, voiceChannel) => {${statements}});\n`;
+        return code;
+    }
+ };
\ No newline at end of file
diff --git a/src/blocks/discord/events/vc-5.js b/src/blocks/discord/events/vc-5.js
new file mode 100644
index 000000000..66d69bddf
--- /dev/null
+++ b/src/blocks/discord/events/vc-5.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_vc_switch";
+
+const blockData = {
+    "message0": "When a member switches to another voice channel %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on("voiceChannelSwitch", async (member, oldChannel, newChannel) => {\n${statements}\n});\n `;
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/invite/index.js b/src/blocks/discord/invite/index.js
new file mode 100644
index 000000000..7a0bde59c
--- /dev/null
+++ b/src/blocks/discord/invite/index.js
@@ -0,0 +1,12 @@
+import "./invite_create";
+import "./invite_delete";
+import "./invite_channel";
+import "./invite_code";
+import "./invite_channel_raw"; 
+import "./invite_date";
+import "./invite_author";
+import "./invite_channel";
+import "./inv_max";
+import "./invite_uses";
+import "./invite_url";
+import "./inv_guild";
\ No newline at end of file
diff --git a/src/blocks/discord/invite/inv_guild.js b/src/blocks/discord/invite/inv_guild.js
new file mode 100644
index 000000000..f162589f2
--- /dev/null
+++ b/src/blocks/discord/invite/inv_guild.js
@@ -0,0 +1,23 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_inv_guild";
+
+const blockData = {
+    "message0": "%{BKY_INVITE_SERVER}",
+    "colour": "#D85E47",
+    "output": "Server",
+    "tooltip": "In invite create/delete",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["(invite.guild)", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/invite/inv_max.js b/src/blocks/discord/invite/inv_max.js
new file mode 100644
index 000000000..91ee6b57d
--- /dev/null
+++ b/src/blocks/discord/invite/inv_max.js
@@ -0,0 +1,45 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_inv_max";
+
+const blockData = {
+    "message0": "%{BKY_INVITE_MAX}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_INVITE_MAX_AGE}",
+                    "MA"
+                ],
+                [
+                    "%{BKY_INVITE_MAX_USES}",
+                    "MU"
+                ]
+            ]
+        }
+    ],
+    "output": "Date",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "MA"){
+        const code = ["invite.maxAge", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else {
+        const code = ["invite.maxUses", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
diff --git a/src/blocks/discord/invite/invite_author.js b/src/blocks/discord/invite/invite_author.js
new file mode 100644
index 000000000..f9be860d9
--- /dev/null
+++ b/src/blocks/discord/invite/invite_author.js
@@ -0,0 +1,22 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_inviter";
+
+const blockData = {
+    "message0": "%{BKY_INVITE_AUTHOR}",
+    "colour": "#187795",
+    "output": "Member",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["invite.inviter", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};  
diff --git a/src/blocks/discord/invite/invite_channel.js b/src/blocks/discord/invite/invite_channel.js
new file mode 100644
index 000000000..186957900
--- /dev/null
+++ b/src/blocks/discord/invite/invite_channel.js
@@ -0,0 +1,23 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_inv_channel";
+
+const blockData = {
+    "message0": "%{BKY_INVITE_CHANNEL}",
+    "colour": "#a55b80",
+    "output": "Channel",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["invite.channel", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/invite/invite_channel_raw.js b/src/blocks/discord/invite/invite_channel_raw.js
new file mode 100644
index 000000000..88c52fe12
--- /dev/null
+++ b/src/blocks/discord/invite/invite_channel_raw.js
@@ -0,0 +1,54 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_inv_channel_raw";
+
+const blockData = {
+    "message0": "%1 of invite channel",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "name",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ],
+                [
+                    "type",
+                    "TYPE"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["(invite.channel.id)", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NAME"){
+        const code = ["(invite.channel.name)", Blockly.JavaScript.ORDER_NONE];
+        return code;
+            } else if(searchType === "TYPE"){
+        const code = ["(invite.channel.type)", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
+
diff --git a/src/blocks/discord/invite/invite_code.js b/src/blocks/discord/invite/invite_code.js
new file mode 100644
index 000000000..3897d2fe2
--- /dev/null
+++ b/src/blocks/discord/invite/invite_code.js
@@ -0,0 +1,23 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_invite_code";
+
+const blockData = {
+    "message0": "%{BKY_INVITE_CODE}",
+    "colour": "#5BA58C",
+    "output": "String",
+    "tooltip": "In invite create/delete",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["invite.code", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/invite/invite_create.js b/src/blocks/discord/invite/invite_create.js
new file mode 100644
index 000000000..201544b74
--- /dev/null
+++ b/src/blocks/discord/invite/invite_create.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_create_invite";
+
+const blockData = {
+    "message0": "%{BKY_ON_INVITE_CREATE} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('inviteCreate', async (invite) => {\n${statements}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/invite/invite_date.js b/src/blocks/discord/invite/invite_date.js
new file mode 100644
index 000000000..0768923de
--- /dev/null
+++ b/src/blocks/discord/invite/invite_date.js
@@ -0,0 +1,45 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_inv_date";
+
+const blockData = {
+    "message0": "%{BKY_INVITE_MAX}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_CREATE_DATE}",
+                    "CD"
+                ],
+                [
+                    "%{BKY_EXPIRE_DATE}",
+                    "ED"
+                ]
+            ]
+        }
+    ],
+    "output": "Date",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "CD"){
+        const code = ["invite.createdAt", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "ED"){
+        const code = ["invite.expiresAt", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
diff --git a/src/blocks/discord/invite/invite_delete.js b/src/blocks/discord/invite/invite_delete.js
new file mode 100644
index 000000000..26a0f7dca
--- /dev/null
+++ b/src/blocks/discord/invite/invite_delete.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_invite_delete";
+
+const blockData = {
+    "message0": "%{BKY_ON_INVITE_DELETE} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('inviteDelete', async (invite) => {\n${statements}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/invite/invite_url.js b/src/blocks/discord/invite/invite_url.js
new file mode 100644
index 000000000..6bbe616b0
--- /dev/null
+++ b/src/blocks/discord/invite/invite_url.js
@@ -0,0 +1,23 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_inv_url";
+
+const blockData = {
+    "message0": "%{BKY_INVITE_URL}",
+    "colour": "#5BA58C",
+    "output": "String",
+    "tooltip": "In invite create/delete",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["invite.url", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/invite/invite_uses.js b/src/blocks/discord/invite/invite_uses.js
new file mode 100644
index 000000000..2c1919b85
--- /dev/null
+++ b/src/blocks/discord/invite/invite_uses.js
@@ -0,0 +1,23 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_inv_uses";
+
+const blockData = {
+    "message0": "%{BKY_INVITE_USES}",
+    "colour": "#5BA58C",
+    "output": "Number",
+    "tooltip": "In invite create/delete",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["invite.uses", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/join-event/joining_guild.js b/src/blocks/discord/join-event/joining_guild.js
index 7b0ef11aa..a8120859b 100644
--- a/src/blocks/discord/join-event/joining_guild.js
+++ b/src/blocks/discord/join-event/joining_guild.js
@@ -18,7 +18,7 @@ Blockly.Blocks[blockName] = {
 };
 
 Blockly.JavaScript[blockName] = function() {
-    const code = ["s4d.joiningMember.guild", Blockly.JavaScript.ORDER_NONE];
+    const code = ["s4dJoiningMember.guild", Blockly.JavaScript.ORDER_NONE];
     return code;
 };
 
diff --git a/src/blocks/discord/join-event/joining_guild_raw.js b/src/blocks/discord/join-event/joining_guild_raw.js
index 2ce41dd63..87fba5472 100644
--- a/src/blocks/discord/join-event/joining_guild_raw.js
+++ b/src/blocks/discord/join-event/joining_guild_raw.js
@@ -36,10 +36,10 @@ Blockly.Blocks[blockName] = {
 Blockly.JavaScript[blockName] = function(block) {
     const searchType = block.getFieldValue("SEARCH_TYPE");
     if(searchType === "ID"){
-        const code = ["s4d.joiningMember.guild.id", Blockly.JavaScript.ORDER_NONE];
+        const code = ["s4dJoiningMember.guild.id", Blockly.JavaScript.ORDER_NONE];
         return code;
     } else if(searchType === "NAME"){
-        const code = ["s4d.joiningMember.guild.name", Blockly.JavaScript.ORDER_NONE];
+        const code = ["s4dJoiningMember.guild.name", Blockly.JavaScript.ORDER_NONE];
         return code;
     }
 };
diff --git a/src/blocks/discord/join-event/joining_member.js b/src/blocks/discord/join-event/joining_member.js
index a9a98d35b..a46c1ab94 100644
--- a/src/blocks/discord/join-event/joining_member.js
+++ b/src/blocks/discord/join-event/joining_member.js
@@ -18,7 +18,7 @@ Blockly.Blocks[blockName] = {
 };
 
 Blockly.JavaScript[blockName] = function() {
-    const code = ["s4d.joiningMember", Blockly.JavaScript.ORDER_NONE];
+    const code = ["s4dJoiningMember", Blockly.JavaScript.ORDER_NONE];
     return code;
 };
 
diff --git a/src/blocks/discord/join-event/joining_member_raw.js b/src/blocks/discord/join-event/joining_member_raw.js
index 2b8e59ca1..7a8b19644 100644
--- a/src/blocks/discord/join-event/joining_member_raw.js
+++ b/src/blocks/discord/join-event/joining_member_raw.js
@@ -40,13 +40,13 @@ Blockly.Blocks[blockName] = {
 Blockly.JavaScript[blockName] = function(block) {
     const searchType = block.getFieldValue("SEARCH_TYPE");
     if(searchType === "ID"){
-        const code = ["s4d.joiningMember.id", Blockly.JavaScript.ORDER_NONE];
+        const code = ["s4dJoiningMember.id", Blockly.JavaScript.ORDER_NONE];
         return code;
     } else if(searchType === "USERNAME"){
-        const code = ["s4d.joiningMember.user.username", Blockly.JavaScript.ORDER_NONE];
+        const code = ["s4dJoiningMember.user.username", Blockly.JavaScript.ORDER_NONE];
         return code;
     } else if(searchType === "NICKNAME"){
-        const code = ["s4d.joiningMember.nickname", Blockly.JavaScript.ORDER_NONE];
+        const code = ["s4dJoiningMember.nickname", Blockly.JavaScript.ORDER_NONE];
         return code;
     }
 };
diff --git a/src/blocks/discord/join-event/on_member_join.js b/src/blocks/discord/join-event/on_member_join.js
index f85a64e0f..30a7996c4 100644
--- a/src/blocks/discord/join-event/on_member_join.js
+++ b/src/blocks/discord/join-event/on_member_join.js
@@ -24,6 +24,6 @@ Blockly.Blocks[blockName] = {
 
 Blockly.JavaScript[blockName] = function(block) {
     const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
-    const code = `s4d.client.on('guildMemberAdd', async (param1) => {\ns4d.joiningMember = param1;\n${statements}s4d.joiningMember = null\n});\n`;
+    const code = `s4d.client.on('guildMemberAdd', async (s4dJoiningMember) => {\n${statements}\n});\n`;
     return code;
 };
diff --git a/src/blocks/discord/members/index.js b/src/blocks/discord/members/index.js
index b92edb6ee..7e149ef29 100644
--- a/src/blocks/discord/members/index.js
+++ b/src/blocks/discord/members/index.js
@@ -9,3 +9,5 @@ import "./member_tag";
 import "./member_username";
 import "./send_message";
 import "./set_member_nickname";
+import "./member_status";
+import "./member_is_streaming";
diff --git a/src/blocks/discord/members/member_has_permission.js b/src/blocks/discord/members/member_has_permission.js
index b26c651f5..6dc7a134c 100644
--- a/src/blocks/discord/members/member_has_permission.js
+++ b/src/blocks/discord/members/member_has_permission.js
@@ -157,7 +157,7 @@ Blockly.Blocks[blockName] = {
 Blockly.JavaScript[blockName] = function(block) {
     const member = Blockly.JavaScript.valueToCode(block, "MEMBER", Blockly.JavaScript.ORDER_ATOMIC);
     const permission = block.getFieldValue("PERMISSION");
-    const code = [ `${member}.hasPermission('${permission}')`, Blockly.JavaScript.ORDER_FUNCTION_CALL ];
+    const code = [ `${member}.permissions.has('${permission}')`, Blockly.JavaScript.ORDER_FUNCTION_CALL ];
     return code;
 };
 
diff --git a/src/blocks/discord/members/member_is_streaming.js b/src/blocks/discord/members/member_is_streaming.js
new file mode 100644
index 000000000..2e64699fe
--- /dev/null
+++ b/src/blocks/discord/members/member_is_streaming.js
@@ -0,0 +1,40 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_member_streaming";
+
+const blockData = {
+    "message0": "%{BKY_MEMBER_IS_STREAMING}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "MEMBER",
+            "check": "Member"
+        }
+    ],
+    "colour": "#5B80A5",
+    "output": "Boolean",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const member = Blockly.JavaScript.valueToCode(block, "MEMBER", Blockly.JavaScript.ORDER_ATOMIC);
+    return [ `${member}.presence ? ${member}.presence.activities[0] ? ${member}.presence.activities[0].type === "STREAMING" : false : false`, Blockly.JavaScript.ORDER_NONE ];
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_VALID_MEMBER",
+        types: [
+            "MEMBER"
+        ]
+    }
+]);
\ No newline at end of file
diff --git a/src/blocks/discord/members/member_status.js b/src/blocks/discord/members/member_status.js
new file mode 100644
index 000000000..90df6925e
--- /dev/null
+++ b/src/blocks/discord/members/member_status.js
@@ -0,0 +1,40 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_member_status";
+
+const blockData = {
+    "message0": "%{BKY_MEMBER_STATUS}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "MEMBER",
+            "check": "Member"
+        }
+    ],
+    "colour": "#50a6c9",
+    "output": "String",
+    "tooltip": "Get status of member. (May return online, offline, idle, dnd)",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const member = Blockly.JavaScript.valueToCode(block, "MEMBER", Blockly.JavaScript.ORDER_ATOMIC);
+    return [ `${member}.presence ? ${member}.presence.status : 'offline'`, Blockly.JavaScript.ORDER_NONE ];
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_VALID_MEMBER",
+        types: [
+            "MEMBER"
+        ]
+    }
+]);
\ No newline at end of file
diff --git a/src/blocks/discord/members/send_message.js b/src/blocks/discord/members/send_message.js
index fff553005..5b36ed0e3 100644
--- a/src/blocks/discord/members/send_message.js
+++ b/src/blocks/discord/members/send_message.js
@@ -9,7 +9,12 @@ const blockData = {
         {
             "type": "input_value",
             "name": "CONTENT",
-            "check": [ "MessageEmbed", "String", "Number" ]
+            "check": ["Number", "String"]
+        },
+        {
+            "type": "input_value",
+            "name": "EMBED",
+            "check": "MessageEmbed"
         },
         {
             "type": "input_value",
@@ -32,21 +37,12 @@ Blockly.Blocks[blockName] = {
 
 Blockly.JavaScript[blockName] = function(block) {
     const member = Blockly.JavaScript.valueToCode(block, "MEMBER", Blockly.JavaScript.ORDER_ATOMIC);
+    const embed = Blockly.JavaScript.valueToCode(block, "EMBED", Blockly.JavaScript.ORDER_ATOMIC) || null;
     const content = Blockly.JavaScript.valueToCode(block, "CONTENT", Blockly.JavaScript.ORDER_ATOMIC);
-    if(block.getInput("CONTENT").connection.targetConnection){
-        const contentType = block.getInput("CONTENT").connection.targetConnection.getSourceBlock().outputConnection.check_ ?
-        block.getInput("CONTENT").connection.targetConnection.getSourceBlock().outputConnection.check_[0] :
-        null;
-        if((contentType === "MessageEmbed") || (!contentType && typeof contentType === "object")){
-            const code = `${member}.send(${content});\n`;
-            return code;
-        } else {
-            const code = `${member}.send(String(${content}));\n`;
-            return code;
-        }
+    if(content.length > 2){
+        return(`${member}.send({embeds: ${embed}, content: ${content}});\n`)
     } else {
-        const code = `${member}.send(String(${content}));\n`;
-        return code;
+        return(`${member}.send({embeds: ${embed}});\n`)
     }
 };
 
diff --git a/src/blocks/discord/message-event/index.js b/src/blocks/discord/message-event/index.js
index cd3c22954..3166645a9 100644
--- a/src/blocks/discord/message-event/index.js
+++ b/src/blocks/discord/message-event/index.js
@@ -12,4 +12,8 @@ import "./message_guild";
 import "./message_guild_raw";
 import "./on_message";
 import "./reply";
-import "./purge";
\ No newline at end of file
+import "./purge";
+import "./reference_reply";
+import "./message_start_thread";
+import "./started_thread";
+import "./message_timestamp"
\ No newline at end of file
diff --git a/src/blocks/discord/message-event/message_embed.js b/src/blocks/discord/message-event/message_embed.js
index 4306f9f13..216fe364b 100644
--- a/src/blocks/discord/message-event/message_embed.js
+++ b/src/blocks/discord/message-event/message_embed.js
@@ -91,17 +91,13 @@ Blockly.Extensions.registerMutator("s4d_message_embed_mutator", BORDER_MUTATOR_M
 
 Blockly.JavaScript["s4d_message_embed"] = function(block){
     return [ `
-        {
-            embed: {
+            [{
                 title: ${Blockly.JavaScript.valueToCode(block, "TITLE", Blockly.JavaScript.ORDER_ATOMIC) || null},
                 color: ${Blockly.JavaScript.valueToCode(block, "COLOR", Blockly.JavaScript.ORDER_ATOMIC) || null},
                 image: { url: ${Blockly.JavaScript.valueToCode(block, "IMAGE", Blockly.JavaScript.ORDER_ATOMIC) || null} }, 
-
                 description: ${Blockly.JavaScript.valueToCode(block, "MESSAGE", Blockly.JavaScript.ORDER_ATOMIC) || null},
                 footer: { text: ${Blockly.JavaScript.valueToCode(block, "FOOTER", Blockly.JavaScript.ORDER_ATOMIC) || null} },
                 thumbnail: { url: ${Blockly.JavaScript.valueToCode(block, "THUMBNAIL", Blockly.JavaScript.ORDER_ATOMIC) || null} }
-
-            }
-        }
+            }]
     `, Blockly.JavaScript.ORDER_ATOMIC ];
 };
\ No newline at end of file
diff --git a/src/blocks/discord/message-event/message_start_thread.js b/src/blocks/discord/message-event/message_start_thread.js
new file mode 100644
index 000000000..9cba4111a
--- /dev/null
+++ b/src/blocks/discord/message-event/message_start_thread.js
@@ -0,0 +1,94 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_message_start_thread";
+
+const blockData = {
+    "message0": "%{BKY_MESSAGE_CREATE_THREAD}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "NAME",
+            "check": "String"
+        },
+        {
+            "type": "field_dropdown",
+            "name": "ARCHIVE",
+            "options": [
+                [
+                    "%{BKY_THREAD_HOUR}",
+                    "60"
+                ],
+                [
+                    "%{BKY_THREAD_DAY}",
+                    "1440"
+                ],
+                [
+                    "%{BKY_THREAD_3DAY}",
+                    "4320"
+                ],
+                [
+                    "%{BKY_THREAD_WEEK}",
+                    "10080"
+                ],
+            ]
+        },
+        {
+            "type": "input_statement",
+            "name": "CODE"
+        },
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "NOTENOUGH"
+        },
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_dummy"
+        }
+    ],
+    "colour": "#4C97FF",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const name = Blockly.JavaScript.valueToCode(block, "NAME", Blockly.JavaScript.ORDER_ATOMIC);
+    const archiveAfter = block.getFieldValue("ARCHIVE");
+    const code = Blockly.JavaScript.statementToCode(block, "CODE");
+    const catchd = Blockly.JavaScript.statementToCode(block, "NOTENOUGH");
+    return(`s4dmessage.startThread({name: ${name}, autoArchiveDuration: ${archiveAfter}})\n.then(s4dCreatedThread => {\n${code}\n})\n.catch(s4dThreadErr => {if (String(s4dThreadErr) === 'DiscordAPIError: Guild premium subscription level too low'){\n${catchd}\n}});\n`)
+}
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_CHANNEL",
+        types: [
+          "CHANNEL"
+        ]
+    },
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/message-event/message_timestamp.js b/src/blocks/discord/message-event/message_timestamp.js
new file mode 100644
index 000000000..da3fbda5a
--- /dev/null
+++ b/src/blocks/discord/message-event/message_timestamp.js
@@ -0,0 +1,33 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_message_timestamp";
+
+const blockData = {
+    "message0": "%{BKY_MESSAGE_TIMESTAMP}",
+    "colour": "#6f92bf",
+    "tooltip": "",
+    "output": "Number",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dmessage.createdTimestamp", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/message-event/on_message.js b/src/blocks/discord/message-event/on_message.js
index ecf392802..00cbb1b45 100644
--- a/src/blocks/discord/message-event/on_message.js
+++ b/src/blocks/discord/message-event/on_message.js
@@ -24,6 +24,6 @@ Blockly.Blocks[blockName] = {
 
 Blockly.JavaScript[blockName] = function(block) {
     const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
-    const code = `s4d.client.on('messageCreate', async (s4dmessage) => {\n${statements}\n});\n`;
+    const code = `s4d.client.on('messageCreate', async (s4dmessage) => {\nif(s4dmessage.channel.type === "GUILD_TEXT"){\n${statements}\n}\n});\n`;
     return code;
 };
diff --git a/src/blocks/discord/message-event/reference_reply.js b/src/blocks/discord/message-event/reference_reply.js
new file mode 100644
index 000000000..7eb4abe41
--- /dev/null
+++ b/src/blocks/discord/message-event/reference_reply.js
@@ -0,0 +1,68 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_reference_reply";
+
+const blockData = {
+    "message0": "%{BKY_REPLY_REFERENCE}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CONTENT",
+            "check": ["Number", "String"]
+        },
+        {
+            "type": "input_value",
+            "name": "EMBED",
+            "check": "MessageEmbed"
+        },
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "CODE"
+        }
+    ],
+    "colour": "#4C97FF",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const content = Blockly.JavaScript.valueToCode(block, "CONTENT", Blockly.JavaScript.ORDER_ATOMIC);
+    const embed = Blockly.JavaScript.valueToCode(block, "EMBED", Blockly.JavaScript.ORDER_ATOMIC) || null;
+    const code = Blockly.JavaScript.statementToCode(block, "CODE");
+    if(content.length > 2){
+            return(`try {s4dmessage.channel.messages.cache.get(s4dmessage.reference.messageId).reply({embeds: ${embed}, content: String(${content})})}\ncatch {\n${code}\n}\n`)
+    } else {
+            return(`try {s4dmessage.channel.messages.cache.get(s4dmessage.reference.messageId).reply({embeds: ${embed}})} catch {\n${code}\n}\n;\n`)
+    }
+}
+    
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_CONTENT",
+        types: [
+          "CONTENT"
+        ]
+    },
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/message-event/reply.js b/src/blocks/discord/message-event/reply.js
index 647ddb69f..0b0f5cfe0 100644
--- a/src/blocks/discord/message-event/reply.js
+++ b/src/blocks/discord/message-event/reply.js
@@ -9,10 +9,21 @@ const blockData = {
         {
             "type": "input_value",
             "name": "CONTENT",
-            "check": [ "Number", "String", "MessageEmbed" ]
+            "check": ["Number", "String"]
         },
+        {
+            "type": "input_value",
+            "name": "EMBED",
+            "check": "MessageEmbed"
+        },
+        {
+            "type": "input_value",
+            "name": "MENTION",
+            "check": "Boolean"
+        }
     ],
     "colour": "#4C97FF",
+    "inputsInline": false,
     "previousStatement": null,
     "nextStatement": null,
     "tooltip": "",
@@ -27,22 +38,21 @@ Blockly.Blocks[blockName] = {
 
 Blockly.JavaScript[blockName] = function(block){
     const content = Blockly.JavaScript.valueToCode(block, "CONTENT", Blockly.JavaScript.ORDER_ATOMIC);
-    if(block.getInput("CONTENT").connection.targetConnection){
-        const contentType = block.getInput("CONTENT").connection.targetConnection.getSourceBlock().outputConnection.check_ ?
-        block.getInput("CONTENT").connection.targetConnection.getSourceBlock().outputConnection.check_[0] :
-        null;
-        if((contentType === "MessageEmbed") || (!contentType && typeof contentType === "object")){
-            const code = `s4dmessage.channel.send(${content});\n`;
-            return code;
+    const embed = Blockly.JavaScript.valueToCode(block, "EMBED", Blockly.JavaScript.ORDER_ATOMIC) || null;
+    const mention = Blockly.JavaScript.valueToCode(block, "MENTION", Blockly.JavaScript.ORDER_ATOMIC) || "false";
+    if(mention === "true") {
+        if(content.length > 2){
+            return(`s4dmessage.reply({embeds: ${embed}, content: String(${content})});\n`)
         } else {
-            const code = `s4dmessage.channel.send(String(${content}));\n`;
-            return code;
+            return(`s4dmessage.reply({embeds: ${embed}});\n`)
         }
-    } else {
-        const code = `s4dmessage.channel.send(String(${content}));\n`;
-        return code;
-    }
-};
+    }else {
+        if(content.length > 2){
+            return(`s4dmessage.channel.send({embeds: ${embed}, content: String(${content})});\n`)
+        } else {
+            return(`s4dmessage.channel.send({embeds: ${embed}});\n`)
+        }
+    }}
 
 registerRestrictions(blockName, [
     {
diff --git a/src/blocks/discord/message-event/started_thread.js b/src/blocks/discord/message-event/started_thread.js
new file mode 100644
index 000000000..8a0f0e43b
--- /dev/null
+++ b/src/blocks/discord/message-event/started_thread.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_started_message_thread";
+
+const blockData = {
+    "message0": "%{BKY_CREATED_THREAD}",
+    "colour": "#AA97D8",
+    "output": "Thread",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dCreatedThread", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "hasparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_START",
+        types: [
+            "s4d_message_start_thread"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/roles/get_role.js b/src/blocks/discord/roles/get_role.js
index 3f578820b..b41f0ae45 100644
--- a/src/blocks/discord/roles/get_role.js
+++ b/src/blocks/discord/roles/get_role.js
@@ -118,13 +118,13 @@ Blockly.JavaScript[blockName] = function(block){
         if(server){
             return [ `${server}.roles.cache.find((role) => role.name === ${value})`, Blockly.JavaScript.ORDER_NONE ];
         } else {
-            return [ `Array.prototype.concat.apply([], s4d.client.guilds.cache.array().map((g) => g.roles.cache.array())).find((role) => role.name === ${value})`, Blockly.JavaScript.ORDER_NONE ];
+            return [ `s4d.client.guilds.cache.find((g) => g.roles.cache.find((role) => role.name === ${value}) !== undefined).roles.cache.find((role) => role.name === ${value})`, Blockly.JavaScript.ORDER_NONE ];
         }
     } else {
         if(server){
-            return [ `${server}.roles.get(${value})`, Blockly.JavaScript.ORDER_NONE ];
+            return [ `${server}.roles.cache.get(${value})`, Blockly.JavaScript.ORDER_NONE ];
         } else {
-            return [ `Array.prototype.concat.apply([], s4d.client.guilds.cache.array().map((g) => g.roles.cache.array())).get(${value})`, Blockly.JavaScript.ORDER_NONE ];
+            return [ `s4d.client.guilds.cache.find((g) => g.roles.cache.get(${value}) !== undefined).roles.cache.get(${value})`, Blockly.JavaScript.ORDER_NONE ];
         }
     }
 };
diff --git a/src/blocks/discord/roles/has_role.js b/src/blocks/discord/roles/has_role.js
new file mode 100644
index 000000000..094ace56c
--- /dev/null
+++ b/src/blocks/discord/roles/has_role.js
@@ -0,0 +1,55 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_has_role";
+
+const blockData = {
+    "message0": "%{BKY_HAS_ROLE}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "ROLE",
+            "check":  "Role" 
+        },
+        {
+            "type": "input_value",
+            "name": "MEMBER",
+            "check": "Member"
+        }
+    ],
+    "output": "Boolean",
+    "colour": "#4C97FF",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const role = Blockly.JavaScript.valueToCode(block, "ROLE", Blockly.JavaScript.ORDER_ATOMIC);
+    const member = Blockly.JavaScript.valueToCode(block, "MEMBER", Blockly.JavaScript.ORDER_ATOMIC);
+    const code = [`${member}._roles.includes(${role}.id)`, Blockly.JavaScript.ORDER_NONE ];
+    return code;
+    
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_HAS_ROLE_MISSING_ROLE",
+        types: [
+            "ROLE"
+        ]
+    },
+    {
+        type: "notempty",
+        message: "RES_HAS_ROLE_MISSING_MEMBER",
+        types: [
+            "MEMBER"
+        ]
+    }
+]);
\ No newline at end of file
diff --git a/src/blocks/discord/roles/index.js b/src/blocks/discord/roles/index.js
index 0c6736b7b..e36ecf55d 100644
--- a/src/blocks/discord/roles/index.js
+++ b/src/blocks/discord/roles/index.js
@@ -1,3 +1,5 @@
 import "./add_role";
 import "./get_role";
 import "./remove_role";
+import "./has_role";
+import "./role_exists";
diff --git a/src/blocks/discord/roles/role_exists.js b/src/blocks/discord/roles/role_exists.js
new file mode 100644
index 000000000..c9c30af6f
--- /dev/null
+++ b/src/blocks/discord/roles/role_exists.js
@@ -0,0 +1,41 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_role_exist";
+
+const blockData = {
+    "message0": "%{BKY_ROLE_EXIST}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "ROLE",
+            "check":  "Role" 
+        },
+    ],
+    "output": "Boolean",
+    "colour": "#4C97FF",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const role = Blockly.JavaScript.valueToCode(block, "ROLE", Blockly.JavaScript.ORDER_ATOMIC);
+    const code = [`typeof ${role} !== undefined`, Blockly.JavaScript.ORDER_NONE ];
+    return code;
+    
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_HAS_ROLE_MISSING_ROLE",
+        types: [
+            "ROLE"
+        ]
+    }]);
\ No newline at end of file
diff --git a/src/blocks/discord/slash/index.js b/src/blocks/discord/slash/index.js
new file mode 100644
index 000000000..ad9b4e872
--- /dev/null
+++ b/src/blocks/discord/slash/index.js
@@ -0,0 +1,7 @@
+import "./on_slash";
+import "./slash_value";
+import "./slash_name";
+import "./slash_author";
+import "./slash_channel";
+import "./slash_server";
+import "./slash_reply";
diff --git a/src/blocks/discord/slash/on_slash.js b/src/blocks/discord/slash/on_slash.js
new file mode 100644
index 000000000..ef30af1bb
--- /dev/null
+++ b/src/blocks/discord/slash/on_slash.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_slash";
+
+const blockData = {
+    "message0": "%{BKY_ON_SLASH} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('interactionCreate', async (s4dInteraction) => {\n${statements}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/slash/slash_author.js b/src/blocks/discord/slash/slash_author.js
new file mode 100644
index 000000000..f5561e0f2
--- /dev/null
+++ b/src/blocks/discord/slash/slash_author.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_slash_author";
+
+const blockData = {
+    "message0": "%{BKY_SLASH_AUTHOR}",
+    "colour": "#187795",
+    "output": "Member",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dInteraction.member", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_SLASH",
+        types: [
+            "s4d_on_slash"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/slash/slash_channel.js b/src/blocks/discord/slash/slash_channel.js
new file mode 100644
index 000000000..614e6a03e
--- /dev/null
+++ b/src/blocks/discord/slash/slash_channel.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_slash_channel";
+
+const blockData = {
+    "message0": "%{BKY_SLASH_CHANNEL}",
+    "colour": "#a55b80",
+    "output": "Channel",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dInteraction.channel", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_SLASH",
+        types: [
+            "s4d_on_slash"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/slash/slash_name.js b/src/blocks/discord/slash/slash_name.js
new file mode 100644
index 000000000..5886547f0
--- /dev/null
+++ b/src/blocks/discord/slash/slash_name.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_slash_name";
+
+const blockData = {
+    "message0": "%{BKY_SLASH_NAME}",
+    "colour": "#5BA58C",
+    "output": "String",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dInteraction.commandName", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_SLASH",
+        types: [
+            "s4d_on_slash"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/slash/slash_reply.js b/src/blocks/discord/slash/slash_reply.js
new file mode 100644
index 000000000..33b0e961b
--- /dev/null
+++ b/src/blocks/discord/slash/slash_reply.js
@@ -0,0 +1,64 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_slash_reply";
+
+const blockData = {
+    "message0": "%{BKY_SLASH_REPLY}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CONTENT",
+            "check": ["Number", "String"]
+        },
+        {
+            "type": "input_value",
+            "name": "EMBED",
+            "check": "MessageEmbed"
+        },
+        {
+            "type": "input_value",
+            "name": "EPHEMERAL",
+            "check": "Boolean"
+        }
+    ],
+    "colour": "#4C97FF",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const content = Blockly.JavaScript.valueToCode(block, "CONTENT", Blockly.JavaScript.ORDER_ATOMIC);
+    const embed = Blockly.JavaScript.valueToCode(block, "EMBED", Blockly.JavaScript.ORDER_ATOMIC) || null;
+    const ephemeral = Blockly.JavaScript.valueToCode(block, "EPHEMERAL", Blockly.JavaScript.ORDER_ATOMIC) || "false";
+    if(content.length > 2){
+        return(`s4dInteraction.reply({embeds: ${embed}, content: ${content}, ephemeral: ${ephemeral}});\n`)
+    } else {
+        return(`s4dInteraction.reply({embeds: ${embed}, ephemeral: ${ephemeral}});\n`)
+    }
+}
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_CONTENT",
+        types: [
+          "CONTENT"
+        ]
+    },
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_slash"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/slash/slash_server.js b/src/blocks/discord/slash/slash_server.js
new file mode 100644
index 000000000..92e2d9264
--- /dev/null
+++ b/src/blocks/discord/slash/slash_server.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_slash_server";
+
+const blockData = {
+    "message0": "%{BKY_SLASH_SERVER}",
+    "colour": "#D85E47",
+    "output": "Server",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dInteraction.guild", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_SLASH",
+        types: [
+            "s4d_on_slash"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/slash/slash_value.js b/src/blocks/discord/slash/slash_value.js
new file mode 100644
index 000000000..56eef4234
--- /dev/null
+++ b/src/blocks/discord/slash/slash_value.js
@@ -0,0 +1,97 @@
+import * as Blockly from "blockly";
+import { registerRestrictions } from "../../../restrictions";
+
+
+const blockName = "s4d_slash_value";
+
+const blockData = {
+    "message0": "%{BKY_SLASH_VALUE}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH",
+            "options": [
+                [
+                    "string",
+                    "String"
+                ],
+                [
+                    "integer",
+                    "Integer"
+                ],
+                [
+                    "boolean",
+                    "Boolean"
+                ],
+                [
+                    "user",
+                    "User"
+                ],
+                [
+                    "member",
+                    "Member"
+                ],
+                [
+                    "channel",
+                    "Channel"
+                ],
+                [
+                    "role",
+                    "Role"
+                ],
+                [
+                    "subcommand",
+                    "Subcommand"
+                ],
+                [
+                    "subcommand group",
+                    "SubcommandGroup"
+                ]
+
+            ]
+        },
+        {
+            "type": "input_value",
+            "name": "NAME",
+            "check": "String",
+        },
+    ],
+    "colour": "#4C97FF",
+    "output": ["String", "Member", "Channel", "Role"],
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+
+Blockly.JavaScript[blockName] = function(block) {
+    const string = Blockly.JavaScript.valueToCode(block, "NAME", Blockly.JavaScript.ORDER_ATOMIC);
+    const searchType = block.getFieldValue("SEARCH");
+    
+        const code = [`s4dInteraction.options.get${searchType}(${string})`, Blockly.JavaScript.ORDER_NONE];
+        return code;
+    
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_SLASH",
+        types: [
+            "s4d_on_slash"
+        ]
+    },
+    {
+        type: "notempty",
+        message: "RES_MISSING_SLASH_NAME",
+        types: [
+          "NAME"
+        ]
+    }
+    
+]);
diff --git a/src/blocks/discord/thread-event/channel_thread.js b/src/blocks/discord/thread-event/channel_thread.js
new file mode 100644
index 000000000..2546756f4
--- /dev/null
+++ b/src/blocks/discord/thread-event/channel_thread.js
@@ -0,0 +1,40 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_channel";
+
+const blockData = {
+    "message0": "%{BKY_CHANNEL_OF_THREAD}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CHANNEL",
+            "check": "Thread"
+        }
+    ],
+    "colour": "#50a6c9",
+    "output": "Channel",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const channel = Blockly.JavaScript.valueToCode(block, "CHANNEL", Blockly.JavaScript.ORDER_ATOMIC);
+    return [ `${channel}.parent`, Blockly.JavaScript.ORDER_NONE ];
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_VALID_CHANNEL",
+        types: [
+            "CHANNEL"
+        ]
+    }
+]);
\ No newline at end of file
diff --git a/src/blocks/discord/thread-event/created-thread.js b/src/blocks/discord/thread-event/created-thread.js
new file mode 100644
index 000000000..816a2f95e
--- /dev/null
+++ b/src/blocks/discord/thread-event/created-thread.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_created_thread_on";
+
+const blockData = {
+    "message0": "%{BKY_CREATED_THREAD_ON}",
+    "colour": "#AA97D8",
+    "output": "Thread",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dThread", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_START",
+        types: [
+            "s4d_on_thread_create"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/deleted_thread.js b/src/blocks/discord/thread-event/deleted_thread.js
new file mode 100644
index 000000000..6680d0780
--- /dev/null
+++ b/src/blocks/discord/thread-event/deleted_thread.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_deleted_thread";
+
+const blockData = {
+    "message0": "%{BKY_DELETED_THREAD}",
+    "colour": "#AA97D8",
+    "output": "Thread",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dThreadDeleted", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_DELETE",
+        types: [
+            "s4d_on_thread_delete"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/index.js b/src/blocks/discord/thread-event/index.js
new file mode 100644
index 000000000..384a2183c
--- /dev/null
+++ b/src/blocks/discord/thread-event/index.js
@@ -0,0 +1,26 @@
+import "./on_new_thread";
+import "./on_thread_archive";
+import "./on_thread_unarchive";
+import "./on_thread_remove";
+import "./on_thread_message";
+import "./message_thread";
+import "./start_thread";
+import "./channel_thread";
+import "./thread_message_content";
+import "./thread_message_id";
+import "./thread_message_author";
+import "./message_thread_guild";
+import "./thread_message_author_raw";
+import "./thread_thread_raw";
+import "./thread_guild_raw";
+import "./thread_reply";
+import "./thread_react";
+import "./thread_message_delete";
+import "./unarchived_thread";
+import "./thread_archive";
+import "./started_thread";
+import "./send_thread";
+import "./created-thread";
+import "./deleted_thread";
+import "./thread_name";
+import "./thread_server";
diff --git a/src/blocks/discord/thread-event/message_thread.js b/src/blocks/discord/thread-event/message_thread.js
new file mode 100644
index 000000000..08a17d8e6
--- /dev/null
+++ b/src/blocks/discord/thread-event/message_thread.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_message_thread";
+
+const blockData = {
+    "message0": "%{BKY_MESSAGE_THREAD}",
+    "colour": "#AA97D8",
+    "output": "Thread",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dThread.channel", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_MESSAGE",
+        types: [
+            "s4d_on_thread_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/message_thread_guild.js b/src/blocks/discord/thread-event/message_thread_guild.js
new file mode 100644
index 000000000..1021b6b03
--- /dev/null
+++ b/src/blocks/discord/thread-event/message_thread_guild.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_server_thread";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_MESSAGE_GUILD}",
+    "colour": "#D85E47",
+    "output": "Server",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dThread.guild", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_MESSAGE",
+        types: [
+            "s4d_on_thread_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/on_new_thread.js b/src/blocks/discord/thread-event/on_new_thread.js
new file mode 100644
index 000000000..2cce6b2bc
--- /dev/null
+++ b/src/blocks/discord/thread-event/on_new_thread.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_thread_create";
+
+const blockData = {
+    "message0": "%{BKY_ON_THREAD_CREATE} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('threadCreate', async (s4dThread) => {\n${statements}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/thread-event/on_thread_archive.js b/src/blocks/discord/thread-event/on_thread_archive.js
new file mode 100644
index 000000000..f5ba63002
--- /dev/null
+++ b/src/blocks/discord/thread-event/on_thread_archive.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_thread_archive";
+
+const blockData = {
+    "message0": "%{BKY_ON_THREAD_ARCHIVE} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('threadUpdate', async (s4dOldThread, s4dNewThread) => {\nif (!s4dOldThread.archived && s4dNewThread.archived) {\n${statements}\n}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/thread-event/on_thread_message.js b/src/blocks/discord/thread-event/on_thread_message.js
new file mode 100644
index 000000000..8c380e4d3
--- /dev/null
+++ b/src/blocks/discord/thread-event/on_thread_message.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_thread_message";
+
+const blockData = {
+    "message0": "%{BKY_ON_THREAD_MESSAGE} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('messageCreate', async (s4dThread) => {\nif(s4dThread.channel.type === "GUILD_PUBLIC_THREAD" || s4dThread.channel.type === "GUILD_PUBLIC_THREAD" ){\n${statements}\n}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/thread-event/on_thread_remove.js b/src/blocks/discord/thread-event/on_thread_remove.js
new file mode 100644
index 000000000..02c3a45f1
--- /dev/null
+++ b/src/blocks/discord/thread-event/on_thread_remove.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_thread_delete";
+
+const blockData = {
+    "message0": "%{BKY_ON_THREAD_DELETE} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('threadDelete', async (s4dThreadDeleted) => {\n${statements}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/thread-event/on_thread_unarchive.js b/src/blocks/discord/thread-event/on_thread_unarchive.js
new file mode 100644
index 000000000..17b32c653
--- /dev/null
+++ b/src/blocks/discord/thread-event/on_thread_unarchive.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_thread_unarchive";
+
+const blockData = {
+    "message0": "%{BKY_ON_THREAD_UNARCHIVE} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('threadUpdate', async (s4dOldThread, s4dNewThread) => {\nif (s4dOldThread.archived && !s4dNewThread.archived) {\n${statements}\n}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/thread-event/send_thread.js b/src/blocks/discord/thread-event/send_thread.js
new file mode 100644
index 000000000..cd87158fc
--- /dev/null
+++ b/src/blocks/discord/thread-event/send_thread.js
@@ -0,0 +1,58 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_send_thread";
+
+const blockData = {
+    "message0": "%{BKY_SEND_THREAD}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CONTENT",
+            "check": ["Number", "String"]
+        },
+        {
+            "type": "input_value",
+            "name": "EMBED",
+            "check": "MessageEmbed"
+        },
+        {
+            "type": "input_value",
+            "name": "CHANNEL",
+            "check": "Thread"
+        }
+    ],
+    "colour": "#4C97FF",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const content = Blockly.JavaScript.valueToCode(block, "CONTENT", Blockly.JavaScript.ORDER_ATOMIC);
+    const embed = Blockly.JavaScript.valueToCode(block, "EMBED", Blockly.JavaScript.ORDER_ATOMIC) || null;
+    const channel = Blockly.JavaScript.valueToCode(block, "CHANNEL", Blockly.JavaScript.ORDER_ATOMIC) || "false";
+    if(content.length > 2){
+        return(`${channel}.send({embeds: ${embed}, content: ${content}});\n`)
+    } else {
+        return(`${channel}.send({embeds: ${embed}});\n`)
+    }
+}
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_CONTENT",
+        types: [
+          "CONTENT"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/start_thread.js b/src/blocks/discord/thread-event/start_thread.js
new file mode 100644
index 000000000..380eb0b33
--- /dev/null
+++ b/src/blocks/discord/thread-event/start_thread.js
@@ -0,0 +1,90 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_start_thread";
+
+const blockData = {
+    "message0": "%{BKY_CREATE_THREAD}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CHANNEL",
+            "check": "Channel"
+        },
+        {
+            "type": "input_value",
+            "name": "NAME",
+            "check": "String"
+        },
+        {
+            "type": "field_dropdown",
+            "name": "ARCHIVE",
+            "options": [
+                [
+                    "%{BKY_THREAD_HOUR}",
+                    "60"
+                ],
+                [
+                    "%{BKY_THREAD_DAY}",
+                    "1440"
+                ],
+                [
+                    "%{BKY_THREAD_3DAY}",
+                    "4320"
+                ],
+                [
+                    "%{BKY_THREAD_WEEK}",
+                    "10080"
+                ],
+            ]
+        },
+        {
+            "type": "input_statement",
+            "name": "CODE"
+        },
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "NOTENOUGH"
+        },
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_dummy"
+        }
+    ],
+    "colour": "#4C97FF",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const channel = Blockly.JavaScript.valueToCode(block, "CHANNEL", Blockly.JavaScript.ORDER_ATOMIC);
+    const name = Blockly.JavaScript.valueToCode(block, "NAME", Blockly.JavaScript.ORDER_ATOMIC);
+    const archiveAfter = block.getFieldValue("ARCHIVE");
+    const code = Blockly.JavaScript.statementToCode(block, "CODE");
+    const catchd = Blockly.JavaScript.statementToCode(block, "NOTENOUGH");
+    return(`${channel}.threads.create({name: ${name}, autoArchiveDuration: ${archiveAfter}})\n.then(s4dCreatedThread => {\n${code}\n})\n.catch(s4dThreadErr => {if (String(s4dThreadErr) === 'DiscordAPIError: Guild premium subscription level too low'){\n${catchd}\n}});\n`)
+}
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_CHANNEL",
+        types: [
+          "CHANNEL"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/started_thread.js b/src/blocks/discord/thread-event/started_thread.js
new file mode 100644
index 000000000..962c7e5b7
--- /dev/null
+++ b/src/blocks/discord/thread-event/started_thread.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_started_thread";
+
+const blockData = {
+    "message0": "%{BKY_CREATED_THREAD}",
+    "colour": "#AA97D8",
+    "output": "Thread",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dCreatedThread", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "hasparent",
+        message: "RES_MUST_BE_IN_THREAD_START",
+        types: [
+            "s4d_start_thread"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_archive.js b/src/blocks/discord/thread-event/thread_archive.js
new file mode 100644
index 000000000..3a2320882
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_archive.js
@@ -0,0 +1,64 @@
+import * as Blockly from "blockly";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_archive";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_ARCHIVE}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "TYPE",
+            "options": [
+                [
+                    "archive",
+                    "true"
+                ],
+                [
+                    "unarchive",
+                    "false"
+                ],
+                [
+                    "delete",
+                    "delete"
+                ]
+            ]
+        },
+        {
+            "type": "input_value",
+            "name": "THREAD",
+            "check": "Thread"
+        }
+    ],
+    "previousStatement": null,
+    "nextStatement": null,
+    "colour": "#AA97D8",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const type = block.getFieldValue("TYPE");
+    const thread = Blockly.JavaScript.valueToCode(block, "THREAD", Blockly.JavaScript.ORDER_ATOMIC);
+    if(type === "true" || type === "false"){
+        return(`${thread}.setArchived(${type});\n`);
+    }else{
+        return(`${thread}.delete()`)
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_THREAD",
+        types: [
+          "THREAD"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_guild_raw.js b/src/blocks/discord/thread-event/thread_guild_raw.js
new file mode 100644
index 000000000..214b6def8
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_guild_raw.js
@@ -0,0 +1,55 @@
+import * as Blockly from "blockly";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_guild_raw";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_GUILD_RAW}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_NAME}",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["(s4dThread.guild || {}).id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NAME"){
+        const code = ["(s4dThread.guild || {}).name", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_MESSAGE",
+        types: [
+            "s4d_on_thread_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_message_author.js b/src/blocks/discord/thread-event/thread_message_author.js
new file mode 100644
index 000000000..8ea1ff7b5
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_message_author.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_message_author";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_MESSAGE_AUTHOR}",
+    "colour": "#187795",
+    "output": "Member",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dThread.member", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_MESSAGE",
+        types: [
+            "s4d_on_thread_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_message_author_raw.js b/src/blocks/discord/thread-event/thread_message_author_raw.js
new file mode 100644
index 000000000..586b2d8c8
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_message_author_raw.js
@@ -0,0 +1,62 @@
+import * as Blockly from "blockly";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_message_author_raw";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_MESSAGE_AUTHOR_RAW}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_USERNAME}",
+                    "USERNAME"
+                ],
+                [
+                    "%{BKY_NICKNAME}",
+                    "NICKNAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["s4dThread.author.id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "USERNAME"){
+        const code = ["s4dThread.author.username", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NICKNAME"){
+        const code = ["(s4dThread.member || await s4dThread.guild.members.fetch(s4dThread.author.id)).nickname", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_MESSAGE",
+        types: [
+            "s4d_on_thread_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_message_content.js b/src/blocks/discord/thread-event/thread_message_content.js
new file mode 100644
index 000000000..b24a9201c
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_message_content.js
@@ -0,0 +1,33 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_message_content";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_MESSAGE_CONTENT}",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "output": "String",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dThread.content", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_MESSAGE",
+        types: [
+            "s4d_on_thread_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_message_delete.js b/src/blocks/discord/thread-event/thread_message_delete.js
new file mode 100644
index 000000000..5b004a688
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_message_delete.js
@@ -0,0 +1,34 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_message_delete";
+
+const blockData = {
+    "message0": "%{BKY_DELETE_THREAD_MESSAGE}",
+    "colour": "#4C97FF",
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(){
+    const code = `s4dThread.delete();\n`;
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_MESSAGE",
+        types: [
+            "s4d_on_thread_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_message_id.js b/src/blocks/discord/thread-event/thread_message_id.js
new file mode 100644
index 000000000..66d128029
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_message_id.js
@@ -0,0 +1,33 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_message_id";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_MESSAGE_ID}",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "output": "String",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dThread.id", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_MESSAGE",
+        types: [
+            "s4d_on_thread_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_name.js b/src/blocks/discord/thread-event/thread_name.js
new file mode 100644
index 000000000..6529e99cb
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_name.js
@@ -0,0 +1,40 @@
+import * as Blockly from "blockly";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_name";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_NAME}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "THREAD",
+            "check": "Thread",
+        }
+    ],
+    "colour": "#AA97D8",
+    "output": "Thread",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const thread = Blockly.JavaScript.valueToCode(block, "THREAD", Blockly.JavaScript.ORDER_ATOMIC);
+    return(`${thread}.name`)
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_THREAD",
+        types: [
+          "THREAD"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_react.js b/src/blocks/discord/thread-event/thread_react.js
new file mode 100644
index 000000000..7c66b7e3c
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_react.js
@@ -0,0 +1,49 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_reaction";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_REACTION}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "REACTION",
+            "check": "String"
+        }
+    ],
+    "previousStatement": null,
+    "nextStatement": null,
+    "colour": "#4C97FF",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const reaction = Blockly.JavaScript.valueToCode(block, "REACTION", Blockly.JavaScript.ORDER_ATOMIC);
+    const code = `s4dThread.react(${reaction});`;
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_ADD_REACTION_MISSING_REACTION",
+        types: [
+            "REACTION"
+        ]
+    },
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_MESSAGE",
+        types: [
+            "s4d_on_thread_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_reply.js b/src/blocks/discord/thread-event/thread_reply.js
new file mode 100644
index 000000000..f7f8a5e1a
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_reply.js
@@ -0,0 +1,72 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_reply";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_REPLY}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "CONTENT",
+            "check": ["Number", "String"]
+        },
+        {
+            "type": "input_value",
+            "name": "EMBED",
+            "check": "MessageEmbed"
+        },
+        {
+            "type": "input_value",
+            "name": "MENTION",
+            "check": "Boolean"
+        }
+    ],
+    "colour": "#4C97FF",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const content = Blockly.JavaScript.valueToCode(block, "CONTENT", Blockly.JavaScript.ORDER_ATOMIC);
+    const embed = Blockly.JavaScript.valueToCode(block, "EMBED", Blockly.JavaScript.ORDER_ATOMIC) || null;
+    const mention = Blockly.JavaScript.valueToCode(block, "MENTION", Blockly.JavaScript.ORDER_ATOMIC) || "false";
+    if(mention === "true") {
+        if(content.length > 2){
+            return(`s4dThread.reply({embeds: ${embed}, content: ${content}});\n`)
+        } else {
+            return(`s4dThread.reply({embeds: ${embed}});\n`)
+        }
+    }else {
+        if(content.length > 2){
+            return(`s4dThread.channel.send({embeds: ${embed}, content: ${content}});\n`)
+        } else {
+            return(`s4dThread.channel.send({embeds: ${embed}});\n`)
+        }
+    }}
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_CONTENT",
+        types: [
+          "CONTENT"
+        ]
+    },
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_THREAD_MESSAGE",
+        types: [
+            "s4d_on_thread_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_server.js b/src/blocks/discord/thread-event/thread_server.js
new file mode 100644
index 000000000..ec6f97bd4
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_server.js
@@ -0,0 +1,40 @@
+import * as Blockly from "blockly";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_server";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_SERVER}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "THREAD",
+            "check": "Thread",
+        }
+    ],
+    "colour": "#AA97D8",
+    "output": "Server",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const thread = Blockly.JavaScript.valueToCode(block, "THREAD", Blockly.JavaScript.ORDER_ATOMIC);
+    return(`${thread}.guild`)
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_THREAD",
+        types: [
+          "THREAD"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/thread_thread_raw.js b/src/blocks/discord/thread-event/thread_thread_raw.js
new file mode 100644
index 000000000..8c1aae560
--- /dev/null
+++ b/src/blocks/discord/thread-event/thread_thread_raw.js
@@ -0,0 +1,55 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_thread_raw";
+
+const blockData = {
+    "message0": "%{BKY_THREAD_RAW}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_NAME}",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["(s4dThread.channel || {}).id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NAME"){
+        const code = ["(s4dThread.channel || {}).name", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_MESSAGE",
+        types: [
+            "s4d_on_message"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/thread-event/unarchived_thread.js b/src/blocks/discord/thread-event/unarchived_thread.js
new file mode 100644
index 000000000..5c6d76fd2
--- /dev/null
+++ b/src/blocks/discord/thread-event/unarchived_thread.js
@@ -0,0 +1,34 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../../restrictions";
+
+const blockName = "s4d_unarchived_thread";
+
+const blockData = {
+    "message0": "%{BKY_UNARCHIVED_THREAD}",
+    "colour": "#AA97D8",
+    "output": "Thread",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dNewThread", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "toplevelparent",
+        message: "RES_MUST_BE_IN_ON_UNARCHIVE_THREAD",
+        types: [
+            "s4d_on_thread_unarchive",
+            "s4d_on_thread_archive"
+        ]
+    }
+]);
diff --git a/src/blocks/discord/typing-event/index.js b/src/blocks/discord/typing-event/index.js
new file mode 100644
index 000000000..4a4fcaab3
--- /dev/null
+++ b/src/blocks/discord/typing-event/index.js
@@ -0,0 +1,6 @@
+import "./typing_on_start";
+import "./typing_channel_raw";
+import "./typing_channel";
+import "./typing_guild";
+import "./typing_timestamp";
+import "./typing_author";
\ No newline at end of file
diff --git a/src/blocks/discord/typing-event/typing_author.js b/src/blocks/discord/typing-event/typing_author.js
new file mode 100644
index 000000000..abe8e756d
--- /dev/null
+++ b/src/blocks/discord/typing-event/typing_author.js
@@ -0,0 +1,22 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_typing_author";
+
+const blockData = {
+    "message0": "%{BKY_TYPING_AUTHOR}",
+    "output": "Member",
+    "colour": "#187795",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dTyping.member", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
diff --git a/src/blocks/discord/typing-event/typing_channel.js b/src/blocks/discord/typing-event/typing_channel.js
new file mode 100644
index 000000000..012d4f839
--- /dev/null
+++ b/src/blocks/discord/typing-event/typing_channel.js
@@ -0,0 +1,23 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_typing_channel";
+
+const blockData = {
+    "message0": "%{BKY_TYPING_CHANNEL}",
+    "colour": "#a55b80",
+    "output": "Channel",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dTyping.channel", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/typing-event/typing_channel_raw.js b/src/blocks/discord/typing-event/typing_channel_raw.js
new file mode 100644
index 000000000..6cbfeb513
--- /dev/null
+++ b/src/blocks/discord/typing-event/typing_channel_raw.js
@@ -0,0 +1,54 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_typing_channel_raw";
+
+const blockData = {
+    "message0": "%{BKY_TYPING_CHANNEL_RAW}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "name",
+                    "NAME"
+                ],
+                [
+                    "id",
+                    "ID"
+                ],
+                [
+                    "type",
+                    "TYPE"
+                ]
+            ]
+        }
+    ],
+    "output": "String",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "ID"){
+        const code = ["s4dTyping.channel.id", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "NAME"){
+        const code = ["s4dTyping.channel.name", Blockly.JavaScript.ORDER_NONE];
+        return code;
+            } else if(searchType === "TYPE"){
+        const code = ["s4dTyping.channel.type", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
+
diff --git a/src/blocks/discord/typing-event/typing_guild.js b/src/blocks/discord/typing-event/typing_guild.js
new file mode 100644
index 000000000..8592e7430
--- /dev/null
+++ b/src/blocks/discord/typing-event/typing_guild.js
@@ -0,0 +1,23 @@
+import Blockly from "blockly/core";
+
+
+const blockName = "s4d_typing_server";
+
+const blockData = {
+    "message0": "%{BKY_TYPING_SERVER}",
+    "colour": "#D85E47",
+    "output": "Server",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["s4dTyping.guild", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
\ No newline at end of file
diff --git a/src/blocks/discord/typing-event/typing_on_start.js b/src/blocks/discord/typing-event/typing_on_start.js
new file mode 100644
index 000000000..194eef454
--- /dev/null
+++ b/src/blocks/discord/typing-event/typing_on_start.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly";
+
+const blockName = "s4d_on_start_typing";
+
+const blockData = {
+    "message0": "%{BKY_ON_START_TYPING} %1 %2",
+    "colour": "#F5AB1A",
+    "args0": [
+        {
+            "type": "input_dummy"
+        },
+        {
+            "type": "input_statement",
+            "name": "STATEMENTS"
+        }
+    ]
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const statements = Blockly.JavaScript.statementToCode(block, "STATEMENTS");
+    const code = `s4d.client.on('typingStart', async (s4dTyping) => {\n${statements}\n});\n`;
+    return code;
+};
diff --git a/src/blocks/discord/typing-event/typing_timestamp.js b/src/blocks/discord/typing-event/typing_timestamp.js
new file mode 100644
index 000000000..fdaec3001
--- /dev/null
+++ b/src/blocks/discord/typing-event/typing_timestamp.js
@@ -0,0 +1,45 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_typing_time";
+
+const blockData = {
+    "message0": "%{BKY_TYPING_TIMESTAMP}",
+    "args0": [
+        {
+            "type": "field_dropdown",
+            "name": "SEARCH_TYPE",
+            "options": [
+                [
+                    "%{BKY_START_TYPING_TIMESTAMP}",
+                    "TT"
+                ],
+                [
+                    "%{BKY_START_TYPING_TIMESTAMP}",
+                    "TA"
+                ]
+            ]
+        }
+    ],
+    "output": "Date",
+    "colour": "#5BA58C",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const searchType = block.getFieldValue("SEARCH_TYPE");
+    if(searchType === "TA"){
+        const code = ["s4dTyping.startedAt", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    } else if(searchType === "TT"){
+        const code = ["s4dTyping.startedTimestamp", Blockly.JavaScript.ORDER_NONE];
+        return code;
+    }
+};
+
diff --git a/src/blocks/other/cpu_model.js b/src/blocks/other/cpu_model.js
new file mode 100644
index 000000000..e2f059287
--- /dev/null
+++ b/src/blocks/other/cpu_model.js
@@ -0,0 +1,22 @@
+import Blockly from "blockly/core";
+
+const blockName = "s4d_cpu_model";
+
+const blockData = {
+    "message0": "%{BKY_CPU_MODEL}",
+    "colour": "#D14081",
+    "output": "String",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["os.cpus()[0].model", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
diff --git a/src/blocks/other/cpu_usage.js b/src/blocks/other/cpu_usage.js
new file mode 100644
index 000000000..d906747a0
--- /dev/null
+++ b/src/blocks/other/cpu_usage.js
@@ -0,0 +1,34 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../restrictions";
+
+const blockName = "s4d_cpu_usage";
+
+const blockData = {
+    "message0": "%{BKY_CPU_USAGE}",
+    "colour": "#D14081",
+    "output": "String",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = ["(s4dStatsCpu.cpu / 10).toFixed(1)", Blockly.JavaScript.ORDER_NONE];
+    return code;
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "hasparent",
+        message: "RES_MUST_BE_IN_GET_USAGE",
+        types: [
+            "s4d_cpu_get_usage"
+        ]
+    }
+]);
+
diff --git a/src/blocks/other/eval.js b/src/blocks/other/eval.js
new file mode 100644
index 000000000..10153e08b
--- /dev/null
+++ b/src/blocks/other/eval.js
@@ -0,0 +1,30 @@
+import * as Blockly from "blockly/core";
+
+const blockName = "s4d_eval";
+
+const blockData = {
+    "message0": "eval %1",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "EVAL",
+            "check": [ "Number", "String" ]
+        }
+    ],
+    "colour": "#D14081",
+    "tooltip": "",
+    "helpUrl": "",
+    "previousStatement": null,
+    "nextStatement": null
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const code = Blockly.JavaScript.valueToCode(block, "EVAL", Blockly.JavaScript.ORDER_ATOMIC);
+    return `await eval(${code});\n`;
+}; 
\ No newline at end of file
diff --git a/src/blocks/other/eval_output.js b/src/blocks/other/eval_output.js
new file mode 100644
index 000000000..5fd8cc8c2
--- /dev/null
+++ b/src/blocks/other/eval_output.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly/core";
+
+const blockName = "s4d_eval_output";
+
+const blockData = {
+    "message0": "eval %1",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "EVAL",
+            "check": [ "Number", "String" ]
+        }
+    ],
+    "colour": "#D14081",
+    "output": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const code = Blockly.JavaScript.valueToCode(block, "EVAL", Blockly.JavaScript.ORDER_ATOMIC);
+    return `await eval(${code});\n`;
+}; 
\ No newline at end of file
diff --git a/src/blocks/other/get_cpu_usage.js b/src/blocks/other/get_cpu_usage.js
new file mode 100644
index 000000000..3dc660484
--- /dev/null
+++ b/src/blocks/other/get_cpu_usage.js
@@ -0,0 +1,33 @@
+import * as Blockly from "blockly/core";
+
+const blockName = "s4d_cpu_get_usage";
+
+const blockData = {
+    "message0": "%{BKY_GET_CPU_USAGE} %2 %1",
+    "args0": [
+        {
+            "type": "input_statement",
+            "name": "CODE"
+        },
+        {
+            "type": "input_dummy"
+        }
+    ],
+    "colour": "#D14081",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const code = Blockly.JavaScript.statementToCode(block, "CODE");
+    return(`pidusage(process.pid, async function(s4dErr, s4dStatsCpu) {\n${code}\n});`)
+}
diff --git a/src/blocks/other/index.js b/src/blocks/other/index.js
index ddda73fe2..e024c2c5a 100644
--- a/src/blocks/other/index.js
+++ b/src/blocks/other/index.js
@@ -1,3 +1,9 @@
 import "./current";
 import "./run_save_output";
 import "./wait_seconds";
+import "./eval";
+import "./log";
+import "./cpu_model";
+import "./eval_output";
+import "./cpu_usage";
+import "./get_cpu_usage";
diff --git a/src/blocks/other/log.js b/src/blocks/other/log.js
new file mode 100644
index 000000000..9c4731469
--- /dev/null
+++ b/src/blocks/other/log.js
@@ -0,0 +1,29 @@
+import * as Blockly from "blockly/core";
+
+const blockName = "s4d_log";
+
+const blockData = {
+    "message0": "%{BKY_LOG}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "TEXT"
+        }
+    ],
+    "colour": "#D14081",
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const text = Blockly.JavaScript.valueToCode(block, "TEXT", Blockly.JavaScript.ORDER_ATOMIC);
+    return `console.log(${text});\n`;
+}; 
\ No newline at end of file
diff --git a/src/blocks/request/get_value.js b/src/blocks/request/get_value.js
new file mode 100644
index 000000000..f049fac16
--- /dev/null
+++ b/src/blocks/request/get_value.js
@@ -0,0 +1,41 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../restrictions";
+
+const blockName = "s4d_request_value";
+
+const blockData = {
+    "message0": "%{BKY_REQUEST_VALUE}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "VALUE",
+            "check": "String" 
+        },
+    ],
+    "output": null,
+    "colour": "#4C97FF",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const value = Blockly.JavaScript.valueToCode(block, "VALUE", Blockly.JavaScript.ORDER_ATOMIC);
+    const code = [`s4dJsonParsed[${value}]`, Blockly.JavaScript.ORDER_NONE ];
+    return code;
+    
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "hasparent",
+        message: "RES_MUST_BE_IN_JSON_REQUEST",
+        types: [
+            "s4d_request_then"
+        ]
+    }]);
\ No newline at end of file
diff --git a/src/blocks/request/get_value_of_object.js b/src/blocks/request/get_value_of_object.js
new file mode 100644
index 000000000..4fa0f3d20
--- /dev/null
+++ b/src/blocks/request/get_value_of_object.js
@@ -0,0 +1,47 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../restrictions";
+
+const blockName = "s4d_get_object_value";
+
+const blockData = {
+    "message0": "%{BKY_OBJECT_GET_VALUE}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "OBJECT",
+            "check": "Object" 
+        },
+        {
+            "type": "input_value",
+            "name": "VALUE",
+            "check": "String" 
+        },
+    ],
+    "output": null,
+    "colour": "#4C97FF",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block) {
+    const value = Blockly.JavaScript.valueToCode(block, "VALUE", Blockly.JavaScript.ORDER_ATOMIC);
+    const object = Blockly.JavaScript.valueToCode(block, "OBJECT", Blockly.JavaScript.ORDER_ATOMIC);
+    const code = [`${object}[${value}]`, Blockly.JavaScript.ORDER_NONE ];
+    return code;
+    
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "hasparent",
+        message: "RES_INVALID_OBJECT",
+        types: [
+            "s4d_request_then"
+        ]
+    }]);
\ No newline at end of file
diff --git a/src/blocks/request/index.js b/src/blocks/request/index.js
new file mode 100644
index 000000000..2797364d1
--- /dev/null
+++ b/src/blocks/request/index.js
@@ -0,0 +1,4 @@
+import "./request_then";
+import "./get_value";
+import "./requested_object";
+import "./get_value_of_object";
diff --git a/src/blocks/request/request_then.js b/src/blocks/request/request_then.js
new file mode 100644
index 000000000..09311809c
--- /dev/null
+++ b/src/blocks/request/request_then.js
@@ -0,0 +1,48 @@
+import * as Blockly from "blockly/core";
+import { registerRestrictions } from "../../restrictions";
+
+const blockName = "s4d_request_then";
+
+const blockData = {
+    "message0": "%{BKY_REQUEST_THEN}",
+    "args0": [
+        {
+            "type": "input_value",
+            "name": "LINK",
+            "check": "String"
+        },
+        {
+            "type": "input_statement",
+            "name": "CODE"
+        }
+    ],
+    "colour": "#4C97FF",
+    "inputsInline": false,
+    "previousStatement": null,
+    "nextStatement": null,
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    const link = Blockly.JavaScript.valueToCode(block, "LINK", Blockly.JavaScript.ORDER_ATOMIC);
+    const code = Blockly.JavaScript.statementToCode(block, "CODE");
+    return(`request(${link}, function(s4dcrap, s4dcrap, s4dbody) {\nvar s4dJsonParsed = JSON.parse(s4dbody)\n${code}\n})`)
+}
+    
+
+registerRestrictions(blockName, [
+    {
+        type: "notempty",
+        message: "RES_MISSING_LINK",
+        types: [
+          "LINK"
+        ]
+    }
+]);
diff --git a/src/blocks/request/requested_object.js b/src/blocks/request/requested_object.js
new file mode 100644
index 000000000..5bcbf5917
--- /dev/null
+++ b/src/blocks/request/requested_object.js
@@ -0,0 +1,33 @@
+import Blockly from "blockly/core";
+import { registerRestrictions } from "../../restrictions";
+
+const blockName = "s4d_requested_object";
+
+const blockData = {
+    "message0": "%{BKY_REQUESTED_OBJECT}",
+    "output": null,
+    "colour": "#4C97FF",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function() {
+    const code = [`s4dJsonParsed`, Blockly.JavaScript.ORDER_NONE ];
+    return code;
+    
+};
+
+registerRestrictions(blockName, [
+    {
+        type: "hasparent",
+        message: "RES_MISSING_LINK",
+        types: [
+            "s4d_request_then"
+        ]
+    }]);
\ No newline at end of file
diff --git a/src/blocks/time/date_get_value.js b/src/blocks/time/date_get_value.js
new file mode 100644
index 000000000..e35e2b58e
--- /dev/null
+++ b/src/blocks/time/date_get_value.js
@@ -0,0 +1,85 @@
+import * as Blockly from "blockly/core";
+
+const blockName = "s4d_date_value";
+
+const blockData = {
+    // "message0": "timestamp %2 to discord time%3with style %1",
+    "message0": "get %1 of timestamp %2",
+    "args0" : [
+        {
+            "type": "field_dropdown",
+            "name": "TYPE",
+            "options": [
+                [
+                    "milliseconds",
+                    "getMilliseconds"
+                ],
+                [
+                    "seconds",
+                    "getSeconds"
+                ],
+                [
+                    "minutes",
+                    "getMinutes"
+                ],
+                [
+                    "hours",
+                    "getHours"
+                ],
+                [
+                    "day",
+                    "getDate"
+                ],
+                [
+                    "day of week",
+                    "getDay"
+                ],
+                [
+                    "month",
+                    "getMonth"
+                ],
+                [
+                    "year",
+                    "getFullYear"
+                ],
+                [
+                    "UTC hours",
+                    "getUTCHours"
+                ],
+                [
+                    "UTC day",
+                    "getUTCDate"
+                ],
+            ]
+        },
+        {
+            "type": "input_value",
+            "name": "DATE",
+            "check": "Number"
+        }
+    ],
+    "colour": "#6f92bf",
+    "tooltip": "",
+    "output": null,
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    var date = Blockly.JavaScript.valueToCode(block, "DATE", Blockly.JavaScript.ORDER_ATOMIC);
+    const type = block.getFieldValue("TYPE");
+    if(!isNaN(Number(date)) && date.length > 0){
+        date += '.'
+    }
+    if(!(type ==='getMonth')) {
+        return [`new Date(${date}).${type}()`, Blockly.JavaScript.ORDER_NONE];
+    } else{
+        return [`new Date(${date}).${type}() + 1`, Blockly.JavaScript.ORDER_NONE];
+    }
+    
+};
diff --git a/src/blocks/time/date_now.js b/src/blocks/time/date_now.js
new file mode 100644
index 000000000..6e455fb51
--- /dev/null
+++ b/src/blocks/time/date_now.js
@@ -0,0 +1,21 @@
+import * as Blockly from "blockly/core";
+
+const blockName = "s4d_date_now";
+
+const blockData = {
+    "message0": "%{BKY_CURRENT_TIMESTAMP}",
+    "output": null,
+    "colour": "#6f92bf",
+    "tooltip": "",
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(){
+    return ['Date.now()', Blockly.JavaScript.ORDER_NONE];
+};
diff --git a/src/blocks/time/date_to_discord.js b/src/blocks/time/date_to_discord.js
new file mode 100644
index 000000000..576ad5b72
--- /dev/null
+++ b/src/blocks/time/date_to_discord.js
@@ -0,0 +1,73 @@
+import * as Blockly from "blockly/core";
+
+const blockName = "s4d_date_discord_string";
+
+const blockData = {
+    // "message0": "timestamp %2 to discord time%3with style %1",
+    "message0": "%{BKY_TIMESTAMP_DISCORD}",
+    "args0" : [
+        {
+            "type": "field_dropdown",
+            "name": "TYPE",
+            "options": [
+                [
+                    "%{BKY_SHORT_TIME}",
+                    "t"
+                ],
+                [
+                    "%{BKY_LONG_TIME}",
+                    "T"
+                ],
+                [
+                    "%{BKY_SHORT_DATE}",
+                    "d"
+                ],
+                [
+                    "%{BKY_LONG_DATE}",
+                    "D"
+                ],
+                [
+                    "%{BKY_SHORT_DATE_TIME}",
+                    "f"
+                ],
+                [
+                    "%{BKY_LONG_DATE_TIME}",
+                    "F"
+                ],
+                [
+                    "%{BKY_TIMESTAMP_RELATIVE}",
+                    "R"
+                ]
+            ]
+        },
+        {
+            "type": "input_value",
+            "name": "DATE",
+            "check": "Number"
+        },
+        {
+            "type": "input_dummy"
+        }
+    ],
+    "colour": "#6f92bf",
+    "tooltip": "",
+    "output": null,
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    var date = Blockly.JavaScript.valueToCode(block, "DATE", Blockly.JavaScript.ORDER_ATOMIC);
+    console.log(date)
+    const type = block.getFieldValue("TYPE");
+    // console.log(type)
+    if(!isNaN(Number(date)) && date.length > 0){
+        date += '.'
+    }
+    return [`s4d.Discord.Formatters.time(Number(${date}.toString().substr(0, ${date}.toString().length - 3)), '${type}')`, Blockly.JavaScript.ORDER_NONE];
+};
diff --git a/src/blocks/time/date_to_string.js b/src/blocks/time/date_to_string.js
new file mode 100644
index 000000000..fa2429a26
--- /dev/null
+++ b/src/blocks/time/date_to_string.js
@@ -0,0 +1,69 @@
+import * as Blockly from "blockly/core";
+
+const blockName = "s4d_date_string";
+
+const blockData = {
+    // "message0": "timestamp %2 to discord time%3with style %1",
+    "message0": "make text from timestamp %2 with style %1",
+    "args0" : [
+        {
+            "type": "field_dropdown",
+            "name": "TYPE",
+            "options": [
+                [
+                    "full date",
+                    "toDateString"
+                ],
+                [
+                    "UTC",
+                    "toUTCString"
+                ],
+                [
+                    "ISO",
+                    "toISOString"
+                ],
+                [
+                    "short date",
+                    "toLocaleDateString"
+                ],
+                [
+                    "short time",
+                    "toLocaleTimeString"
+                ],
+                [
+                    "short date and time",
+                    "toLocaleString"
+                ],
+                [
+                    "full date, time and timezone",
+                    "toString"
+                ]
+            ]
+        },
+        {
+            "type": "input_value",
+            "name": "DATE",
+            "check": "Number"
+        }
+    ],
+    "colour": "#6f92bf",
+    "tooltip": "",
+    "inputsInline":false,
+    "output": null,
+    "helpUrl": ""
+};
+
+Blockly.Blocks[blockName] = {
+    init: function() {
+        this.jsonInit(blockData);
+    }
+};
+
+Blockly.JavaScript[blockName] = function(block){
+    var date = Blockly.JavaScript.valueToCode(block, "DATE", Blockly.JavaScript.ORDER_ATOMIC);
+    const type = block.getFieldValue("TYPE");
+    if(!isNaN(Number(date)) && date.length > 0){
+        date += '.'
+    }
+    return [`new Date(${date}).${type}()`, Blockly.JavaScript.ORDER_NONE];
+};
diff --git a/src/blocks/time/index.js b/src/blocks/time/index.js
new file mode 100644
index 000000000..43ff77f43
--- /dev/null
+++ b/src/blocks/time/index.js
@@ -0,0 +1,4 @@
+import "./date_now"
+import "./date_to_discord"
+import "./date_to_string"
+import "./date_get_value"
\ No newline at end of file
diff --git a/src/components/BlocklyComponent.vue b/src/components/BlocklyComponent.vue
index a5095ffa3..cab5f90d3 100755
--- a/src/components/BlocklyComponent.vue
+++ b/src/components/BlocklyComponent.vue
@@ -66,4 +66,9 @@ export default {
     width: 100%;
     text-align: left;
 }
+.blocklyToolboxCategory{
+    color: rgb(204, 204, 204);
+}
+
+
 </style>
diff --git a/src/components/NavigationBar/FileMenu.vue b/src/components/NavigationBar/FileMenu.vue
index ff5b4854d..15474f054 100644
--- a/src/components/NavigationBar/FileMenu.vue
+++ b/src/components/NavigationBar/FileMenu.vue
@@ -10,7 +10,6 @@
 <script>
 import Blockly from "blockly";
 import JSZip from "jszip";
-import localforage from "localforage"
 
 export default {
     name: "filemenu",
@@ -58,19 +57,16 @@ export default {
             zip.generateAsync({
                 type: "blob"
             })
-            .then(async (blob) => {
+            .then((blob) => {
                 const a = document.createElement("a");
                 a.style = "display: none";
                 document.body.appendChild(a);
-
                 const url = window.URL.createObjectURL(blob);
                 a.href = url;
                 a.download = fileName;
                 a.click();
-
                 window.URL.revokeObjectURL(url);
                 document.body.removeChild(a);
-                await localforage.removeItem(fileName.replace('.s4d', ''));
             });
         }
     }
diff --git a/src/components/NavigationBar/NavigationBar.vue b/src/components/NavigationBar/NavigationBar.vue
index f352c5ada..5f2a6e4dd 100644
--- a/src/components/NavigationBar/NavigationBar.vue
+++ b/src/components/NavigationBar/NavigationBar.vue
@@ -12,18 +12,14 @@
                 <CodeModal></CodeModal>
                 <FileMenu></FileMenu>
                 <EditMenu></EditMenu>
-                <LanguageMenu></LanguageMenu>
                 <ExamplesMenu></ExamplesMenu>
                 <b-nav-item href="https://androz2091.gitbook.io/scratch-for-discord/" target="_blank">{{ $t('help') }}</b-nav-item>
+                <b-nav-item href="https://slash-commands-gui.androz2091.fr" target="_blank">{{ $t('slash') }}</b-nav-item>
             </b-navbar-nav>
             <b-navbar-nav class="ml-auto">
-                <RunModal></RunModal>
                 <b-button style="border-right-color: #161719; border-radius: 0em; border-top-left-radius: 0.25em; border-bottom-left-radius: 0.25em">
                 <span contenteditable="true" id="docName">{{ $t("untitled") }}</span>
                 </b-button>
-                <b-button id="v-step-1" :disabled="!configurationValidated" style="border-right-color: #161719; border-radius: 0em;" v-b-modal.run-modal>
-                    <b-icon-play></b-icon-play>
-                </b-button>
                 <b-button id="v-step-2" :disabled="!configurationValidated" style="border-radius: 0em; border-top-right-radius: 0.25em; border-bottom-right-radius: 0.25em" @click="exportToCode">
                     <b-icon-download></b-icon-download>
                 </b-button>
@@ -38,8 +34,6 @@ import JSZip from "jszip";
 
 import FileMenu from "./FileMenu.vue";
 import EditMenu from "./EditMenu.vue";
-import LanguageMenu from "./LanguageMenu.vue";
-import RunModal from "./RunModal.vue";
 import ExamplesMenu from "./ExamplesMenu.vue";
 import CodeModal from "./CodeModal";
 
@@ -48,8 +42,6 @@ export default {
     components: {
         FileMenu,
         EditMenu,
-        LanguageMenu,
-        RunModal,
         ExamplesMenu,
         CodeModal
     },
@@ -98,6 +90,8 @@ export default {
                         },
                         dependencies: {
                             'discord.js': '^13.1.0',
+                            'pidusage': '2.0.21',
+                            'request': '2.88.2',
                             'easy-json-database': '^1.5.0'
                         }
                     }));
diff --git a/src/examples/command-parsing.js b/src/examples/command-parsing.js
index e72cbb73a..3950447c2 100644
--- a/src/examples/command-parsing.js
+++ b/src/examples/command-parsing.js
@@ -1,109 +1,112 @@
 export default `
-    <xml xmlns="https://developers.google.com/blockly/xml">
-        <variables>
-            <variable id="OZ0l|^XRQH?T?s;b$B%X">arguments</variable>
-            <variable id="dN-GQox{6nqmX%so5NT^">command</variable>
-        </variables>
-        <block type="s4d_login" id="{|lO_b-0fA9\`}/b6#m6T" x="62" y="12">
-            <value name="TOKEN">
-                <block type="text" id="T3=]\`vNu7E~Pv%]r^%YC">
-                <field name="TEXT">Your bot token</field>
-                </block>
-            </value>
+<xml xmlns="https://developers.google.com/blockly/xml">
+<variables>
+  <variable id="OZ0l|^XRQH?T?s;b$B%X">arguments</variable>
+  <variable id="dN-GQox{6nqmX%so5NT^">command</variable>
+</variables>
+<block type="s4d_login" id="{|lO_b-0fA9\`}/b6#m6T" x="62" y="12">
+  <value name="TOKEN">
+    <block type="text" id="T3=]\`vNu7E~Pv%]r^%YC">
+      <field name="TEXT">Your bot token</field>
+    </block>
+  </value>
+</block>
+<block type="s4d_on_message" id="+Q@qA4DZ.)H0dU~:qJFA" x="62" y="112">
+  <statement name="STATEMENTS">
+    <block type="variables_set" id="Fo+ksP#~73~o,EeQmq{u">
+      <field name="VAR" id="OZ0l|^XRQH?T?s;b$B%X">arguments</field>
+      <value name="VALUE">
+        <block type="lists_split" id="1YzV9Eu2@GGwP5RREIIR">
+          <mutation mode="SPLIT"></mutation>
+          <field name="MODE">SPLIT</field>
+          <value name="INPUT">
+            <block type="s4d_message_content" id="E#m(;pB|W+d+AtJCc{5e"></block>
+          </value>
+          <value name="DELIM">
+            <shadow type="text" id="Z.|mO+X9gt-/BR;jjMkI">
+              <field name="TEXT"> </field>
+            </shadow>
+          </value>
         </block>
-        <block type="s4d_on_message" id="+Q@qA4DZ.)H0dU~:qJFA" x="62" y="112">
-            <statement name="STATEMENTS">
-                <block type="variables_set" id="Fo+ksP#~73~o,EeQmq{u">
-                <field name="VAR" id="OZ0l|^XRQH?T?s;b$B%X">arguments</field>
-                <value name="VALUE">
-                    <block type="lists_split" id="1YzV9Eu2@GGwP5RREIIR">
-                    <mutation mode="SPLIT"></mutation>
-                    <field name="MODE">SPLIT</field>
-                    <value name="INPUT">
-                        <block type="s4d_message_content" id="E#m(;pB|W+d+AtJCc{5e"></block>
-                    </value>
-                    <value name="DELIM">
-                        <shadow type="text" id="Z.|mO+X9gt-/BR;jjMkI">
-                        <field name="TEXT"> </field>
-                        </shadow>
-                    </value>
+      </value>
+      <next>
+        <block type="variables_set" id="U^i0Ox!/+F6x[NrTqTpR">
+          <field name="VAR" id="dN-GQox{6nqmX%so5NT^">command</field>
+          <value name="VALUE">
+            <block type="lists_getIndex" id="9ul#e70.^\`!G^_~-BlK~">
+              <mutation statement="false" at="true"></mutation>
+              <field name="MODE">GET_REMOVE</field>
+              <field name="WHERE">FROM_START</field>
+              <value name="VALUE">
+                <block type="variables_get" id="z-Mavm-5KXE/Y;G)]0%i">
+                  <field name="VAR" id="OZ0l|^XRQH?T?s;b$B%X">arguments</field>
+                </block>
+              </value>
+              <value name="AT">
+                <block type="math_number" id="n6Es1J;;TYupl;g]g)Eg">
+                  <field name="NUM">1</field>
+                </block>
+              </value>
+            </block>
+          </value>
+          <next>
+            <block type="controls_if" id="3XA36VU);D_1N5vf9p(Z">
+              <value name="IF0">
+                <block type="logic_compare" id="1igBlMs)G_=BaFXSd3rc">
+                  <field name="OP">EQ</field>
+                  <value name="A">
+                    <block type="variables_get" id="764~nc#(*|4bhyY/,K{h">
+                      <field name="VAR" id="dN-GQox{6nqmX%so5NT^">command</field>
                     </block>
-                </value>
-                <next>
-                    <block type="variables_set" id="U^i0Ox!/+F6x[NrTqTpR">
-                    <field name="VAR" id="dN-GQox{6nqmX%so5NT^">command</field>
-                    <value name="VALUE">
-                        <block type="lists_getIndex" id="9ul#e70.^\`!G^_~-BlK~">
-                        <mutation statement="false" at="true"></mutation>
-                        <field name="MODE">GET_REMOVE</field>
-                        <field name="WHERE">FROM_START</field>
-                        <value name="VALUE">
-                            <block type="variables_get" id="z-Mavm-5KXE/Y;G)]0%i">
-                            <field name="VAR" id="OZ0l|^XRQH?T?s;b$B%X">arguments</field>
-                            </block>
-                        </value>
-                        <value name="AT">
-                            <block type="math_number" id="n6Es1J;;TYupl;g]g)Eg">
-                            <field name="NUM">1</field>
-                            </block>
-                        </value>
-                        </block>
-                    </value>
-                    <next>
-                        <block type="controls_if" id="3XA36VU);D_1N5vf9p(Z">
-                        <value name="IF0">
-                            <block type="logic_compare" id="1igBlMs)G_=BaFXSd3rc">
-                            <field name="OP">EQ</field>
-                            <value name="A">
-                                <block type="variables_get" id="764~nc#(*|4bhyY/,K{h">
-                                <field name="VAR" id="dN-GQox{6nqmX%so5NT^">command</field>
-                                </block>
-                            </value>
-                            <value name="B">
-                                <block type="text" id="[P2gt2r%QKJF3|~Q$E~+">
-                                <field name="TEXT">!say</field>
-                                </block>
-                            </value>
-                            </block>
-                        </value>
-                        <statement name="DO0">
-                            <block type="s4d_reply" id="-{l,tE6ZGFbL6\`Pn_@~#">
-                            <value name="CONTENT">
-                                <shadow type="text" id="aL1?|+/#9ra54-jg7_Gm">
-                                <field name="TEXT">You have written the following content after !say:</field>
-                                </shadow>
-                            </value>
-                            <next>
-                                <block type="s4d_reply" id=")aBPXtsn1JD-vhr:VEL-">
-                                <value name="CONTENT">
-                                    <shadow type="text" id="9FEK\`)XQ20Dm!SwfYg}5">
-                                    <field name="TEXT">Salut!</field>
-                                    </shadow>
-                                    <block type="lists_split" id="dXoK}l3=r:Qu|E|[I_EZ">
-                                    <mutation mode="JOIN"></mutation>
-                                    <field name="MODE">JOIN</field>
-                                    <value name="INPUT">
-                                        <block type="variables_get" id=":}|4XGnUc}sJZ_qIWFFX">
-                                        <field name="VAR" id="OZ0l|^XRQH?T?s;b$B%X">arguments</field>
-                                        </block>
-                                    </value>
-                                    <value name="DELIM">
-                                        <shadow type="text" id="R/4CiqYnjEYgTePNX7l=">
-                                        <field name="TEXT"> </field>
-                                        </shadow>
-                                    </value>
-                                    </block>
-                                </value>
-                                </block>
-                            </next>
+                  </value>
+                  <value name="B">
+                    <block type="text" id="[P2gt2r%QKJF3|~Q$E~+">
+                      <field name="TEXT">!say</field>
+                    </block>
+                  </value>
+                </block>
+              </value>
+              <statement name="DO0">
+                <block type="s4d_reply" id="-{l,tE6ZGFbL6\`Pn_@~#">
+                  <value name="CONTENT">
+                    <shadow type="text" id="aL1?|+/#9ra54-jg7_Gm">
+                      <field name="TEXT">You have written the following content after !say:</field>
+                    </shadow>
+                  </value>
+                  <value name="EMBED">
+                    <block type="s4d_message_embed" id=")qR.VmX08}{xp^T[wwhu">
+                      <mutation xmlns="http://www.w3.org/1999/xhtml" message="true"></mutation>
+                      <value name="MESSAGE">
+                        <block type="lists_split" id="dXoK}l3=r:Qu|E|[I_EZ">
+                          <mutation mode="JOIN"></mutation>
+                          <field name="MODE">JOIN</field>
+                          <value name="INPUT">
+                            <block type="variables_get" id=":}|4XGnUc}sJZ_qIWFFX">
+                              <field name="VAR" id="OZ0l|^XRQH?T?s;b$B%X">arguments</field>
                             </block>
-                        </statement>
+                          </value>
+                          <value name="DELIM">
+                            <shadow type="text" id="R/4CiqYnjEYgTePNX7l=">
+                              <field name="TEXT"> </field>
+                            </shadow>
+                          </value>
                         </block>
-                    </next>
+                      </value>
+                    </block>
+                  </value>
+                  <value name="MENTION">
+                    <block type="logic_boolean" id="W#B{=hl/W]X2-Oo#hG-O">
+                      <field name="BOOL">TRUE</field>
                     </block>
-                </next>
+                  </value>
                 </block>
-            </statement>
+              </statement>
+            </block>
+          </next>
         </block>
-    </xml>
+      </next>
+    </block>
+  </statement>
+</block>
+</xml>
 `;
\ No newline at end of file
diff --git a/src/examples/ping-pong.js b/src/examples/ping-pong.js
index 08645b360..169948547 100644
--- a/src/examples/ping-pong.js
+++ b/src/examples/ping-pong.js
@@ -1,39 +1,59 @@
 export default `
-    <xml xmlns="https://developers.google.com/blockly/xml">
-        <block type="s4d_login" id=")O7+PL3eS1Br}h;?X9N$" x="288" y="163">
-            <value name="TOKEN">
-                <block type="text" id="a7JxIIyK[Yr~TPL^-{W:">
-                    <field name="TEXT">Your bot token</field>
-                </block>
+<xml xmlns="https://developers.google.com/blockly/xml">
+  <block type="s4d_login" id=")O7+PL3eS1Br}h;?X9N$" x="288" y="163">
+    <value name="TOKEN">
+      <block type="text" id="a7JxIIyK[Yr~TPL^-{W:">
+        <field name="TEXT">Your bot token</field>
+      </block>
+    </value>
+  </block>
+  <block type="s4d_on_message" id="Qx+aIDM=_,mj^tl$vGmW" x="288" y="238">
+    <statement name="STATEMENTS">
+      <block type="controls_if" id="Cr$f.P2*Nq2Dl}?D!r\`(">
+        <value name="IF0">
+          <block type="logic_compare" id="oq-Tf{oSnv,],{N*FSF|">
+            <field name="OP">EQ</field>
+            <value name="A">
+              <block type="s4d_message_content" id="pyFMNvR6J#o6Ky/UA~]f"></block>
             </value>
-        </block>
-        <block type="s4d_on_message" id="Qx+aIDM=_,mj^tl$vGmW" x="288" y="238">
-            <statement name="STATEMENTS">
-                <block type="controls_if" id="Cr$f.P2*Nq2Dl}?D!r\`(">
-                    <value name="IF0">
-                        <block type="logic_compare" id="oq-Tf{oSnv,],{N*FSF|">
-                            <field name="OP">EQ</field>
-                            <value name="A">
-                                <block type="s4d_message_content" id="pyFMNvR6J#o6Ky/UA~]f" />
-                            </value>
-                            <value name="B">
-                                <block type="text" id=";[??XKp36YJf2U}j2_}e">
-                                    <field name="TEXT">!ping</field>
-                                </block>
-                            </value>
-                        </block>
-                    </value>
-                    <statement name="DO0">
-                        <block type="s4d_reply" id="wgo^7yFoMz,K{AaMl6L)">
-                            <value name="CONTENT">
-                                <block type="text" id="N-4C!JnJCe,s$75i%8Ce">
-                                    <field name="TEXT">pong!</field>
-                                </block>
-                            </value>
-                        </block>
-                    </statement>
-                </block>
-            </statement>
-        </block>
-    </xml>
+            <value name="B">
+              <block type="text" id=";[??XKp36YJf2U}j2_}e">
+                <field name="TEXT">!ping</field>
+              </block>
+            </value>
+          </block>
+        </value>
+        <statement name="DO0">
+          <block type="s4d_reply" id="=cV{q}25R;1]*xD*y7eY">
+            <value name="CONTENT">
+              <shadow type="text" id="aLEok6/YAP}z:vO:D]hU">
+                <field name="TEXT"></field>
+              </shadow>
+            </value>
+            <value name="EMBED">
+              <block type="s4d_message_embed" id="P*EIdJ/qnZE_O^zpQALP">
+                <mutation xmlns="http://www.w3.org/1999/xhtml" message="true" color="true"></mutation>
+                <value name="MESSAGE">
+                  <block type="text" id="(\`5Aa5e#VX\`,2$O5J5~~">
+                    <field name="TEXT">pong!</field>
+                  </block>
+                </value>
+                <value name="COLOR">
+                  <block type="colour_picker" id="kY}c}_\`#W\`/iTyM_(B$z">
+                    <field name="COLOUR">#33ff33</field>
+                  </block>
+                </value>
+              </block>
+            </value>
+            <value name="MENTION">
+              <block type="logic_boolean" id="PeC=Mrcj;8M8Iiwm4JdS">
+                <field name="BOOL">TRUE</field>
+              </block>
+            </value>
+          </block>
+        </statement>
+      </block>
+    </statement>
+  </block>
+</xml>
 `;
\ No newline at end of file
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index be0355b4e..48469d6d9 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -1,32 +1,107 @@
 {
   "BASE_BLOCKS": "Base blocks",
   "MESSAGE_RELATED_BLOCKS": "Blocks related to messages",
-  "REPLY": "reply %1",
+  "REPLY": "reply %1 embed %2 mention %3",
+  "EDITED_REPLY": "edited reply %1 embed %2 mention %3",
+  "SLASH_REPLY": "reply %1 embed %2 ephemeral %3",
+  "ON_THREAD_CREATE": "When thread is created",
+  "TYPING_CHANNEL_RAW": "%1 of typing channel",
+  "ON_THREAD_UNARCHIVE": "When thread is unarchived",
+  "TYPING_TIMESTAMP": "%1 of channel",
+  "START_TYPING_TIMESTAMP": "start timestamp",
+  "START_TYPING_DATE": "start date",
+  "RES_VALID_CHANNEL": "You must specify a valid channel",
+  "ON_THREAD_DELETE": "When thread is deleted",
+  "TOOLBOX_TYPING": "Typing",
+  "MESSAGE_TIMESTAMP": "message timestamp",
+  "TIMESTAMP_DISCORD": "timestamp %2 to discord time%3with style %1",
+  "CURRENT_TIMESTAMP": "current timestamp",
+  "SHORT_TIME": "short time",
+  "LONG_TIME": "long time",
+  "SHORT_DATE": "short date",
+  "LONG_DATE": "long date",
+  "SHORT_DATE_TIME": "short date time",
+  "LONG_DATE_TIME": "long date time",
+  "TIMESTAMP_RELATIVE": "relative",
+  "LABEL_TYPING_EVENT":"Typing event",
+  "LABEL_TYPING_BLOCKS": "Typing blocks",
+  "INVITE_CHANNEL": "invite channel",
+  "INVITE_URL": "invite url",
+  "TYPING_AUTHOR": "typing user",
+  "TYPING_CHANNEL": "channel of typing",
+  "TYPING_SERVER": "server of typing",
+  "ON_START_TYPING": "When someone starts typing",
+  "TOOLBOX_INVITES": "Invites",
+  "LABEL_INVITE_EVENTS": "Invite events",
+  "CREATE_DATE": "create date",
+  "INVITE_MAX_AGE": "max age",
+  "INVITE_MAX_USES": "max uses",
+  "EXPIRE_DATE": "expire date",
+  "LABEL_INVITE_BLOCKS": "Invite blocks",
+  "INVITE_USES": "invite uses",
+  "INVITE_AUTHOR": "author of invite",
+  "ON_INVITE_DELETE": "When invite is deleted",
+  "INVITE_SERVER": "invite server",
+  "ON_INVITE_CREATE": "When invite is created",
+  "CHANNEL_OF_THREAD": "channel of thread %1",
+  "DIRECT_REPLY": "direct reply %1 embed %2 mention %3",
   "LOGIN": "Connect to Discord with the token %1",
   "LOGIN_TOOLTIP": "Connect your bot to Discord. To get your bot token, go to https://discord.com/developers/.",
   "ON_MESSAGE": "When a message is received",
+  "ON_SLASH": "When slash command is received",
+  "RES_MISSING_THREAD": "You must specify a valid thread!",
+  "INVITE_CHANNEL_RAW": "%1 of invite channel",
+  "INVITE_MAX": "%1 of invite",
+  "INVITE_CODE": "invite code",
+  "CHANNEL_CATEGORY": "category of channel %1",
+  "THREAD_ARCHIVE": "%1 thread %2",
+  "ON_DIRECT": "When a direct message is received",
+  "DETECT_SLASH": "Detect slash commands",
+  "ON_THREAD_ARCHIVE": "When thread is archived",
+  "MESSAGE_THREAD": "message thread",
   "ON_CONNECTED": "When the bot is connected",
+  "ON_THREAD_MESSAGE": "When thread message is received",
+  "ON_EDITED": "When a message is edited",
+  "TOOLBOX_EDITED": "Edited",
+  "TOOLBOX_DIRECT": "Direct",
   "ON_CONNECTED_TOOLTIP": "Event emitted when your bot is connected to Discord.",
   "MESSAGE_ID": "message ID",
   "MESSAGE_CONTENT": "message content",
   "MESSAGE_AUTHOR": "message author",
+  "THREAD_REPLY": "thread reply %1 embed %2 mention %3",
+  "EDITED_AUTHOR": "edited message author",
   "MESSAGE_AUTHOR_RAW": "%1 of the message author",
+  "LABEL_THREAD_ARCHIVE": "Thread archive/unarchive",
+  "THREAD_REACTION": "add reaction %1 on thread message",
+  "DELETE_THREAD_MESSAGE": "delete thread message",
+  "THREAD_RAW": "%1 of the message thread",
+  "EDITED_AUTHOR_RAW": "%1 of the edited message author",
   "USERNAME": "username",
+  "THREAD_GUILD_RAW":"%1 of the thread message server",
   "NICKNAME": "nickname",
+  "THREAD_MESSAGE_AUTHOR_RAW": "%1 of thread message author",
   "GET_GUILD": "find server %1 using %2",
   "NAME": "name",
   "ADD_ROLE": "add role %1 to member %2",
   "REMOVE_ROLE": "remove role %1 from member %2",
   "BAN_MEMBER": "ban member %1",
   "KICK_MEMBER": "kick member %1",
-  "SEND_MEMBER": "send %1 to member %2",
+  "SEND_MEMBER": "send %1embed%2to member %3",
+  "DIRECT_CONTENT": "direct mesage content",
   "MESSAGE_GUILD": "message server",
+  "THREAD_MESSAGE_GUILD": "thread message server",
+  "EDITED_GUILD": "edited message server",
+  "EDITED_ID": "edited message ID",
   "MESSAGE_CHANNEL": "message channel",
+  "EDITED_MESSAGE_CHANNEL": "edited message channel",
   "BASIC_BLOCKS": "Basic blocks",
   "ADVANCED_BLOCKS": "Advanced blocks",
   "MENTIONED_MEMBER": "mentioned member",
+  "OLD_EDITED_MENTIONED_MEMBER": "old edited mentioned member",
+  "NEW_EDITED_MENTIONED_MEMBER": "new edited mentioned member",
   "ADMINISTRATOR": "Administrator",
   "DETECT_MESSAGES": "Detect messages",
+  "DETECT_EDITED": "Detect editing",
   "MESSAGE_ACTIONS": "Actions on the message",
   "RELATED_TO_MESSAGE_STRINGS": "Strings related to the message",
   "DELETE_MESSAGE": "delete the message",
@@ -75,8 +150,13 @@
   "PERM_CHANGE_NICKNAME": "change nickname",
   "PERM_MANAGE_NICKNAMES": "manage nicknames",
   "PERM_MANAGE_ROLES": "manage roles",
+  "SLASH_VALUE": "Get %1 option name %2",
   "PERM_MANAGE_WEBHOOKS": "manage webhooks",
+  "DIRECT_REACTION": "add reaction %1 to direct message",
   "PERM_MANAGE_EMOJIS": "manage emojis",
+  "DELETE_DIRECT": "delete direct message",
+  "DIRECT_BOT": "direct author is bot?",
+  "TAG": "tag",
   "JOINS_RELATED_BLOCKS": "Blocks related to member joins",
   "DETECT_JOINS": "Detect joins",
   "ON_MEMBER_JOIN": "When a member joins a server",
@@ -86,12 +166,50 @@
   "JOINING_MEMBER_RAW": "%1 of the joining member",
   "JOINING_GUILD": "joining member server",
   "TEMPORARILY": "Temporarily",
+  "THREAD_NAME": "name of thread %1",
+  "DELETED_THREAD": "deleted thread",
+  "THREAD_SERVER": "server of thread %1",
+  "RES_HAS_ROLE_MISSING_ROLE": "You must specify a valid role",
+  "THREAD_OTHER_LABEL": "Other thread stuff",
+  "RES_HAS_ROLE_MISSING_MEMBER": "You must specify a valid member",
   "HOURS": "hours",
+  "DATABASE_LENGTH": "length of database",
+  "ROLE_EXIST": "role %1 exist?",
   "REASON": "reason",
+  "RES_MUST_BE_IN_ON_THREAD_DELETE":"This block may only be used in a \"When a thread is deleted\" event",
+  "DISCRIMINATOR": "discriminator",
+  "THREAD_CREATE_LABEL": "Detect creating thread",
+  "THREAD_DELETE_LABEL": "Detect deleting thread",
+  "MESSAGE_CREATE_THREAD": "start thread on message %7 with name%1 auto archive after%2%4then%6%3if not enoguh server boost level%8%5",
+  "CREATE_THREAD": "start thread in channel %1 with name %2 archive after %3 %7then%5%4if not enough server boost level%8%6",
+  "CREATED_THREAD": "started thread",
+  "THREAD_HOUR": "1 hour",
+  "THREAD_DAY": "1 day",
+  "THREAD_3DAY": "3 days",
+  "THREAD_WEEK": "1 week",
+  "HAS_ROLE": "member %2 has role %1",
+  "CREATED_THREAD_ON": "created thread",
+  "DIRECT_ID": "direct message ID",
+  "UNARCHIVED_THREAD": "(un)archived thread",
+  "DIRECT_AUTHOR_INFO": "Informations about direct message author",
+  "DIRECT_AUTHOR_RAW": "%1 of direct message author",
   "DURING_HOURS": "during",
+  "SLASH_AUTHOR": "slash command author",
+  "SLASH_CHANNEL": "slash command channel",
+  "SLASH_SERVER": "slash command server",
+  "SLASH_NAME": "slash command name",
   "WITH_REASON": "for the reason",
+  "THREAD_MESSAGE_CONTENT": "thread message content",
+  "RES_MUST_BE_IN_THREAD_START": "This block may only be used in a \"start thread\" block!",
+  "RES_MISSING_CHANNEL": "You must specify a valid channel!",
+  "RES_MUST_BE_IN_ON_THREAD_START": "This block may only be used in a \"When a thread is created\" event",
+  "RES_MUST_BE_IN_ON_UNARCHIVE_THREAD": "This block may only be used in a \"When a thread is (un)archived\" event",
   "RES_MUST_BE_IN_ON_MESSAGE": "This block may only be used in a \"When a message is received\" event",
+  "RES_MUST_BE_IN_ON_SLASH": "This block may only be used in a \"When slash command is received\" event",
+  "RES_MUST_BE_IN_ON_DIRECT": "This block may only be used in a \"When a direct message is received\" event",
+  "RES_MUST_BE_IN_ON_THREAD_MESSAGE": "This block may only be used in a \"When thread message is received\" event",
   "RES_MISSING_CONTENT": "You must specify a valid content to reply!",
+  "RES_MISSING_SLASH_NAME": "You must specify a valid slash value to get!",
   "RES_MISSING_MEMBER_HAS_PERMISSION": "You must specify a valid member to check permissions!",
   "RES_MUST_BE_IN_ON_MEMBER_JOIN": "This block may only be used in a \"When a member joins a server\" event",
   "RES_ADD_ROLE_MISSING_ROLE": "You must specify a valid name or role ID to add!",
@@ -111,15 +229,26 @@
   "RES_INCLUDES_TEXT": "You must specify a text to see if that includes something!",
   "RES_INCLUDES_INCLUDES": "You must specify a text to see if in the other text includes that!",
   "NEWLINE": "new line",
+  "CPU_MODEL": "CPU model",
+  "THREAD_MESSAGE_AUTHOR": "thread message author",
+  "THREAD_MESSAGE_ID": "thread message ID",
+  "REQUEST_THEN": "JSON request %1 then %2",
+  "REQUEST_VALUE": "get value on request %1",
+  "REQUESTED_OBJECT": "requested object",
+  "OBJECT_GET_VALUE": "get value %2 of object %1",
   "FIND_CHANNEL": "Find a channel",
+  "REPLY_REFERENCE": "reference reply %1 embed %2 if no reference %3%4",
   "SEND_CHANNEL_LABEL": "Send a message in the found channel",
+  "LABEL_THREAD_MESSAGE": "Thread messages",
   "GET_CHANNEL": "get the channel with %2 equal to %1",
   "RES_MISSING_CHANNEL_VALUE": "You must specify a valid channel name or ID!",
   "RES_SEND_CHANNEL_CONTENT": "You must specify a content to send!",
   "RES_SEND_CHANNEL_CHANNEL": "You must specify a channel in which to send the content!",
-  "SEND_CHANNEL": "send %1 in the channel %2",
+  "SEND_CHANNEL": "send %1embed%2in channel %3",
+  "SEND_THREAD": "send%1embed%2thread%3",
   "TOOLBOX_LOGIC": "Logic",
   "TOOLBOX_LOOPS": "Loops",
+  "TOOLBOX_REQUESTS": "Requests",
   "TOOLBOX_MATH": "Math",
   "TOOLBOX_TEXT": "Text",
   "TOOLBOX_LISTS": "Lists",
@@ -149,20 +278,28 @@
   "RES_GET_ROLE_VALUE": "You must specify a valid name or role ID!",
   "RES_GET_SERVER_VALUE": "You must specify a valid server name or ID!",
   "FIND_ROLE": "Find a role",
+  "START_TYPING": "start typing%1 in channel %2",
+  "MEMBER_STATUS": "presence status of %1",
   "ROLE_ASSIGNMENT": "Roles assignment",
   "FIND_MEMBER": "Find a member",
+  "LOG": "log in console %1",
   "GET_MEMBER": "get member with %2 equal to %1 on server %3",
   "INIT_TOOLTIP": "Allows you to use Discord blocks!",
+  "MEMBER_IS_STREAMING": "member %1 is streaming",
   "JOINING_GUILD_RAW": "%1 of the server of the joining member",
   "LABEL_MEMBER_ACTIONS": "Actions on the member",
   "LABEL_MESSAGE_CONTEXT": "Message context",
+  "LABEL_EDITED_INTERACTION": "Interactions with message",
   "MESSAGE_CHANNEL_RAW": "%1 of the channel of the message",
+  "EDITED_CHANNEL_RAW": "%1 of the channel of edited message",
   "MESSAGE_GUILD_RAW": "%1 of the server of the message",
+  "EDITED_GUILD_RAW": "%1 of the server of the message",
   "RES_GET_MEMBER_SERVER": "You must specify a valid server on which the member is!",
   "RES_GET_MEMBER_VALUE": "You must specify a valid member ID or member name!",
   "TOOLBOX_MEMBERS": "Member",
   "MEMBER_INFORMATIONS": "Members informations",
   "RES_VALID_MEMBER": "You must specify a valid member !",
+  "DELETE_EDITED_MESSAGE": "delete edited message",
   "MEMBER_DISCRIMINATOR": "discriminator of member %1",
   "MEMBER_ID": "id of member %1",
   "MEMBER_TAG": "tag of member %1",
@@ -170,6 +307,9 @@
   "MEMBER_IS_BOT": "member %1 is a bot",
   "SET_MEMBER_NICKNAME": "change nickname of member %1 new nickname %2",
   "RES_SET_MEMBER_NICKNAME_MEMBER": "You must specify a valid member to change nicknam",
+  "RES_INVALID_OBJECT": "You must specify a valid object",
+  "RES_MUST_BE_IN_JSON_REQUEST": "This block may only be used in \"JSON request then\" block!",
+  "RES_MISSING_LINK": "Missing link to request",
   "RES_SET_MEMBER_NICKNAME_NEW_NICKNAME": "You must specify a valid new nickname for the member!",
   "SERVER_BOOST_COUNT": "number of boosts of server %1",
   "SERVER_BOOST_LEVEL": "boost level of server %1",
@@ -196,15 +336,23 @@
   "BOT_SERVER_COUNT": "bot server count",
   "TOOLBOX_E_JOINS": "Joins",
   "TOOLBOX_E_MESSAGES": "Messages",
+  "TOOLBOX_SLASH": "Slash",
+  "CPU_USAGE": "CPU usage",
+  "NEW_EMBED": "create new embed then",
   "TOOLBOX_E_REACTIONS": "Reactions",
   "TOOLBOX_DATABASE": "Database",
   "GET_DATA": "get %1 from the database",
+  "RES_MUST_BE_IN_GET_USAGE": "This block may only be in \"get CPU usage\" block!",
+  "GET_CPU_USAGE": "get CPU usage then", 
   "LABEL_READ_DB": "Read database",
+  "CLEAR_ALL_DATA": "clear database",
   "LABEL_UPDATE_DB": "Update database",
   "SET_DATA": "set %1 to %2 in database",
   "DELETE_DATA": "delete %1 from database",
   "HAS_DATA": "%1 exists in database",
   "ADD_DATA": "add %1 to %2",
+  "NEW_CONTENT": "new message content",
+  "OLD_CONTENT": "old message content",
   "SUBTRACT_DATA": "subtract %1 from %2",
   "DETECT_LEAVES": "Detect leaves",
   "LEAVING_GUILD": "leaving member server",
diff --git a/src/locales/en.js b/src/locales/en.js
index cfffcad72..b6335203c 100644
--- a/src/locales/en.js
+++ b/src/locales/en.js
@@ -11,6 +11,7 @@ export const applyBlocklyLocale = () => {
 export const websiteMessages = {
     untitled: "Untitled document",
     help: "Help",
+    slash: "Register slash commands",
     load: {
         error: "The uploaded file is corrupted and cannot be loaded by Scratch For Discord..."
     },
@@ -82,12 +83,6 @@ export const websiteMessages = {
     },
     code_modal: {
         title: "JavaScript code of your bot"
-    },
-    autosave: {
-        title: "Restore a project",
-        text: "You did not save your project before quitting Scratch For Discord? No problem, you can choose the project you want to restore from the menu below!",
-        restore: "Restore",
-        cancel: "Cancel"
     }
 };
 
diff --git a/src/main.js b/src/main.js
index f562f1d68..5b4b10e7b 100755
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,6 @@
 import Vue from 'vue';
 import { BootstrapVue, IconsPlugin } from 'bootstrap-vue';
 import App from './App.vue';
-import autosave from './autosave'
 import store from './store';
 import VueSwal from 'vue-swal';
 import Vuei18n from 'vue-i18n';
@@ -27,17 +26,11 @@ Vue.config.productionTip = false;
 Vue.config.ignoredElements = ["field","block","category","xml","mutation","value","sep"];
 
 import blocklyLocaleEN from "blockly/msg/en";
-import blocklyLocaleFR from "blockly/msg/fr";
-import blocklyLocalePT from "blockly/msg/pt";
 
 import customLocaleEN from './locales/en';
-import customLocaleFR from './locales/fr';
-import customLocalePT from './locales/pt';
 
 const messages = {
-    en: customLocaleEN.websiteMessages,
-    fr: customLocaleFR.websiteMessages,
-    pt: customLocalePT.websiteMessages
+    en: customLocaleEN.websiteMessages
 };
 
 const i18n = new Vuei18n({
@@ -62,8 +55,8 @@ Vue.mixin({
                 renderer: "zelos",
                 theme: Theme,
                 grid: {
-                    spacing: 25,
-                    length: 3,
+                    spacing: 9,
+                    length: 30,
                     colour: "#ccc",
                     snap: true
                 },
@@ -96,35 +89,21 @@ Vue.mixin({
                     // Change website languages (navbar, etc...)
                     this.$root.$i18n.locale = "en";
                     break;
-                case "fr":
-                    // Change Blockly language for default blocks
-                    Blockly.setLocale(blocklyLocaleFR);
-                    // Change Blockly language for custom blocks
-                    customLocaleFR.applyBlocklyLocale();
-                    // Change website languages (navbar, etc...)
-                    this.$root.$i18n.locale = "fr";
-                    break;
-                case "pt":
-                    // Change Blockly language for default blocks
-                    Blockly.setLocale(blocklyLocalePT);
-                    // Change Blockly language for custom blocks
-                    customLocalePT.applyBlocklyLocale();
-                    // Change website languages (navbar, etc...)
-                    this.$root.$i18n.locale = "pt";
-                    break;
-                default:
-                    break;
             }
         },
         getWorkspaceCode(){
             if(!this.$store.state.workspace) return "";
             return `
                 (async()=>{
-                const Discord = require("discord.js");
-                const Database = require("easy-json-database");
-                const devMode = typeof __E_IS_DEV !== "undefined" && __E_IS_DEV;
-                const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
-                const s4d = {
+                const Discord = require("discord.js"),
+                Database = require("easy-json-database"),
+                request = require('request'),
+                os = require("os"),
+                process = require("process"),
+                pidusage = require("pidusage"),
+                devMode = typeof __E_IS_DEV !== "undefined" && __E_IS_DEV,
+                delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms)),
+                s4d = {
                     Discord,
                     database: new Database(\`\${devMode ? S4D_NATIVE_GET_PATH : "."}/db.json\`),
                     joiningMember:null,
@@ -138,7 +117,7 @@ Vue.mixin({
                 };
                 s4d.client = new s4d.Discord.Client({
                     intents: [Object.values(s4d.Discord.Intents.FLAGS).reduce((acc, p) => acc | p, 0)],
-                    partials: ["REACTION"]
+                    partials: ["REACTION", "CHANNEL"]
                 });
 
                 ${Blockly.JavaScript.workspaceToCode(this.$store.state.workspace)}
@@ -153,10 +132,7 @@ Vue.mixin({
 new Vue({
     store,
     render: h => h(App),
-    i18n,
-    mounted() {
-        autosave(this);
-    }
+    i18n
 }).$mount("#app");
 
 import 'bootstrap/dist/css/bootstrap.css';
diff --git a/src/prompt.js b/src/prompt.js
index 8ce7de381..78f44a738 100755
--- a/src/prompt.js
+++ b/src/prompt.js
@@ -39,6 +39,7 @@ Blockly.prompt = function(msg, defaultValue, callback) {
 		},
 		showCancelButton: true,
 		confirmButtonText: "Look up",
+		ADD_START_HATS: true,
 		showLoaderOnConfirm: true,
 		allowOutsideClick: () => !Swal.isLoading()
 	}).then(result => {
diff --git a/src/theme.js b/src/theme.js
new file mode 100644
index 000000000..991541e82
--- /dev/null
+++ b/src/theme.js
@@ -0,0 +1,101 @@
+/**
+ * @license
+ * Copyright 2020 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @fileoverview Modern theme.
+ */
+
+ import Blockly from 'blockly/core';
+
+ export default Blockly.Theme.defineTheme('amoderns', {
+   'base': Blockly.Themes.Dark,
+   'blockStyles': {
+     'colour_blocks': {
+       'colourPrimary': '#a5745b',
+       'colourSecondary': '#dbc7bd',
+       'colourTertiary': '#845d49',
+     },
+     'list_blocks': {
+       'colourPrimary': '#745ba5',
+       'colourSecondary': '#c7bddb',
+       'colourTertiary': '#5d4984',
+     },
+     'logic_blocks': {
+       'colourPrimary': '#5b80a5',
+       'colourSecondary': '#bdccdb',
+       'colourTertiary': '#496684',
+     },
+     'loop_blocks': {
+       'colourPrimary': '#5ba55b',
+       'colourSecondary': '#bddbbd',
+       'colourTertiary': '#498449',
+     },
+     'math_blocks': {
+       'colourPrimary': '#5b67a5',
+       'colourSecondary': '#bdc2db',
+       'colourTertiary': '#495284',
+     },
+     'procedure_blocks': {
+       'colourPrimary': '#995ba5',
+       'colourSecondary': '#d6bddb',
+       'colourTertiary': '#7a4984',
+     },
+     'text_blocks': {
+       'colourPrimary': '#5ba58c',
+       'colourSecondary': '#bddbd1',
+       'colourTertiary': '#498470',
+     },
+     'variable_blocks': {
+       'colourPrimary': '#a55b99',
+       'colourSecondary': '#dbbdd6',
+       'colourTertiary': '#84497a',
+     },
+     'variable_dynamic_blocks': {
+       'colourPrimary': '#a55b99',
+       'colourSecondary': '#dbbdd6',
+       'colourTertiary': '#84497a',
+     },
+     'hat_blocks': {
+       'colourPrimary': '#a55b99',
+       'colourSecondary': '#dbbdd6',
+       'colourTertiary': '#84497a',
+       'hat': 'cap',
+     },
+   },
+   'categoryStyles': {
+     'colour_category': {
+       'colour': '#a5745b',
+     },
+     'list_category': {
+       'colour': '#745ba5',
+     },
+     'logic_category': {
+       'colour': '#5b80a5',
+     },
+     'loop_category': {
+       'colour': '#5ba55b',
+     },
+     'math_category': {
+       'colour': '#5b67a5',
+     },
+     'procedure_category': {
+       'colour': '#995ba5',
+     },
+     'text_category': {
+       'colour': '#5ba58c',
+     },
+     'variable_category': {
+       'colour': '#a55b99',
+     },
+     'variable_dynamic_category': {
+       'colour': '#a55b99',
+     },
+   },
+   'componentStyles': {},
+   'fontStyle': {},
+   'startHats': false,
+ });
+ 
\ No newline at end of file
diff --git a/src/toolbox.js b/src/toolbox.js
index 5e0ad8433..6d6626a4c 100644
--- a/src/toolbox.js
+++ b/src/toolbox.js
@@ -389,9 +389,13 @@ export default (Blockly) => {
         <sep />
         <category name="{{ TOOLBOX_VARIABLES }}" colour="#a55b80" custom="VARIABLE" />
         <category name="{{ TOOLBOX_FUNCTIONS }}" colour="#995ba5" custom="PROCEDURE" />
+        
         <category name="{{ TOOLBOX_OTHER }}" colour="#D14081">
             <block type="s4d_current"></block>
             <block type="s4d_run_save_output"></block>
+            <block type="s4d_cpu_model"></block>
+            <block type="s4d_cpu_get_usage"/>
+            <block type="s4d_cpu_usage"/>
             <block type="s4d_wait_seconds">
                 <value name="TIME">
                     <shadow type="math_number">
@@ -399,9 +403,12 @@ export default (Blockly) => {
                     </shadow>
                 </value>
             </block>
+            <block type="s4d_eval_output"></block>
+            <block type="s4d_eval"></block>
+            <block type="s4d_log"></block>
         </category>
         <sep />
-        <category name="{{ TOOLBOX_BASE }}" colour="#F46580">
+        <category name="{{ TOOLBOX_BASE }}" colour="#7282ba"> #F46580
         <label text="%{BKY_MANDATORY_BLOCKS}" web-class="boldtext"></label>
             <block type="s4d_login">
                 <value name="TOKEN">
@@ -425,6 +432,7 @@ export default (Blockly) => {
             <label text="%{BKY_MESSAGE_INFORMATIONS}"></label>
             <block type="s4d_message_content"></block>
             <block type="s4d_message_id"></block>
+            <block type="s4d_message_timestamp"/>
             <block type="s4d_message_author"></block>
             <block type="s4d_mentioned_member"></block>
             <label text="%{BKY_LABEL_MESSAGE_CONTEXT}"></label>
@@ -436,6 +444,19 @@ export default (Blockly) => {
             <block type="s4d_message_guild_raw"></block>
             <label text="%{BKY_MESSAGE_ACTIONS}"></label>
             <block type="s4d_reply">
+                <value name="MENTION">
+                    <block type="logic_boolean">
+                        <field name="BOOL">FALSE</field>
+                    </block>
+                </value>
+                <value name="CONTENT">
+                    <shadow type="text">
+                        <field name="TEXT">{{ REPLY_EXAMPLE }}</field>
+                    </shadow>
+                </value>
+
+            </block>
+            <block type="s4d_reference_reply">
                 <value name="CONTENT">
                     <shadow type="text">
                         <field name="TEXT">{{ REPLY_EXAMPLE }}</field>
@@ -450,10 +471,165 @@ export default (Blockly) => {
                     </shadow>
                 </value>
             </block>
+            <block type="s4d_message_start_thread"/>
+            <block type="s4d_started_message_thread"/>
             <label text="%{BKY_TOOLS}"></label>
             <block type="s4d_message_embed"></block>
         </category>
-        <category name="{{ TOOLBOX_E_JOINS }}" colour="#EABB11">
+        <category name="{{ TOOLBOX_DIRECT }}" colour="#00BBE6">
+            <label text="%{BKY_MESSAGE_RELATED_BLOCKS}" web-class="boldtext"></label>
+            <block type="s4d_send_member"></block>
+            <label text="{{ DETECT_MESSAGES }}"></label>
+            <block type="s4d_on_direct"></block>
+            <label text="{{ MESSAGE_INFORMATIONS }}"></label>
+            <block type="s4d_direct_content"></block>
+            <block type="s4d_direct_id"></block>
+            <label text="{{ DIRECT_AUTHOR_INFO }}"></label>
+            <block type="s4d_direct_author_raw"></block>
+            <block type="s4d_direct_bot"></block>
+            <label text="{{ MESSAGE_ACTIONS }}"></label>
+            <block type="s4d_direct_reply">
+                <value name="CONTENT">
+                    <shadow type="text">
+                        <field name="TEXT">{{ REPLY_EXAMPLE }}</field>
+                    </shadow>
+                </value>
+                <value name="MENTION">
+                    <block type="logic_boolean">
+                        <field name="BOOL">FALSE</field>
+                    </block>
+                </value>
+            </block>
+            <block type="s4d_direct_reaction">
+                <value name="REACTION">
+                    <shadow type="text">
+                        <field name="TEXT">👍</field>
+                    </shadow>
+                </value>
+            </block>
+            <block type="s4d_direct_delete"></block>
+        </category>
+        <category name="Threads" colour="#AA97D8">
+            <label text="%{BKY_LABEL_THREAD_MESSAGE}"/>
+            <block type="s4d_on_thread_message"/>
+            <block type="s4d_send_thread"/>
+            <label text="{{ MESSAGE_INFORMATIONS }}"/>
+            <block type="s4d_thread_message_content"/>
+            <block type="s4d_thread_message_id"/>
+            <block type="s4d_thread_message_author"/>
+            <label text="%{BKY_LABEL_MESSAGE_CONTEXT}"/>
+            <block type="s4d_message_thread"/>
+            <block type="s4d_server_thread"/>
+            <label text="%{BKY_RELATED_TO_MESSAGE_STRINGS}"/>
+            <block type="s4d_thread_message_author_raw"/>
+            <block type="s4d_thread_raw"/>
+            <block type="s4d_thread_guild_raw"/>
+            <label text="%{BKY_MESSAGE_ACTIONS}"/>
+            <block type="s4d_start_thread"/>
+            <block type="s4d_started_thread"/>
+            <block type="s4d_thread_reply">
+                <value name="CONTENT">
+                    <shadow type="text">
+                        <field name="TEXT">{{ REPLY_EXAMPLE }}</field>
+                    </shadow>
+                </value>
+                <value name="MENTION">
+                    <block type="logic_boolean">
+                        <field name="BOOL">FALSE</field>
+                    </block>
+                </value>
+            </block>
+            <block type="s4d_thread_reaction">
+                <value name="REACTION">
+                    <shadow type="text">
+                        <field name="TEXT">👍</field>
+                    </shadow>
+                </value>
+            </block>
+            <block type="s4d_thread_message_delete"/>
+            <label text="%{BKY_LABEL_THREAD_ARCHIVE}"/>
+            <block type="s4d_on_thread_archive"/>
+            <block type="s4d_on_thread_unarchive"/>
+            <block type="s4d_unarchived_thread"/>
+            <label text="%{BKY_THREAD_CREATE_LABEL}"/>
+            <block type="s4d_on_thread_create"/>
+            <block type="s4d_created_thread_on"/>
+            <label text="%{BKY_THREAD_DELETE_LABEL}"/>
+            <block type="s4d_on_thread_delete"/>
+            <block type="s4d_deleted_thread"/>
+            <label text="%{BKY_THREAD_OTHER_LABEL}"/>
+            <block type="s4d_thread_channel"/>
+            <block type="s4d_thread_name"/>
+            <block type="s4d_thread_server"/>
+            <block type="s4d_thread_archive"/>
+        </category>
+        <category name="{{ TOOLBOX_SLASH }}" colour="#D088D1">
+        <label text="{{ DETECT_SLASH }}"></label>
+        <block type="s4d_on_slash"></block>
+        <block type="s4d_slash_name"></block>
+        <block type="s4d_slash_author"></block>
+        <block type="s4d_slash_channel"></block>
+        <block type="s4d_slash_server"></block>
+        <block type="s4d_slash_value"></block>
+        <block type="s4d_slash_reply">
+            <value name="EPHEMERAL">
+                <block type="logic_boolean">
+                    <field name="BOOL">FALSE</field>
+                </block>
+            </value>
+            <value name="CONTENT">
+                    <shadow type="text">
+                        <field name="TEXT">{{ REPLY_EXAMPLE }}</field>
+                    </shadow>
+                </value>
+        </block>
+        </category>
+        <category name="{{ TOOLBOX_EDITED }}" colour="#18c847">
+        <label text="%{BKY_DETECT_EDITED}"></label>
+        <block type="s4d_on_edited"></block>
+        <label text="%{BKY_MESSAGE_INFORMATIONS}"></label>
+        <block type="s4d_new_content"></block>
+        <block type="s4d_old_content"></block>
+        <block type="s4d_edited_id"></block>
+        <block type="s4d_edited_author"></block>
+        <block type="s4d_edited_old_mentioned_member"></block>
+        <block type="s4d_edited_new_mentioned_member"></block>
+        <label text="%{BKY_LABEL_MESSAGE_CONTEXT}"></label>
+        <block type="s4d_edited_channel"></block>
+        <block type="s4d_edited_server"></block>
+        <label text="%{BKY_RELATED_TO_MESSAGE_STRINGS}"></label>
+        <block type="s4d_edited_author_raw"></block>
+        <block type="s4d_edited_channel_raw"></block>
+        <block type="s4d_edited_guild_raw"></block>
+        <label text="%{BKY_LABEL_EDITED_INTERACTION}"></label>
+        <block type="s4d_edited_reply">
+                <value name="CONTENT">
+                    <shadow type="text">
+                        <field name="TEXT">{{ REPLY_EXAMPLE }}</field>
+                    </shadow>
+                </value>
+            </block>
+        <block type="s4d_edited_delete"></block>
+        <block type="s4d_add_edited_reaction">
+                <value name="REACTION">
+                    <shadow type="text">
+                        <field name="TEXT">👍</field>
+                    </shadow>
+                </value>
+            </block>
+        </category>
+        <category name="{{ TOOLBOX_TYPING }}" colour="#9acd32">
+            <label text="%{BKY_LABEL_TYPING_EVENT}"/>
+            <block type="s4d_on_start_typing"/>
+            <label text="%{BKY_LABEL_TYPING_BLOCKS}"/>
+            <block type="s4d_start_typing"/>
+            <block type="s4d_typing_author"/>
+            <block type="s4d_typing_channel"/>
+            <block type="s4d_typing_server"/>
+            <block type="s4d_typing_channel_raw"/>
+            <block type="s4d_typing_time"/>
+        </category>
+        <category name="{{ TOOLBOX_E_JOINS }}" colour="#c2e000">
             <label text="%{BKY_JOINS_RELATED_BLOCKS}" web-class="boldtext"></label>
             <label text="%{BKY_DETECT_JOINS}"></label>
             <block type="s4d_on_member_join"></block>
@@ -464,6 +640,21 @@ export default (Blockly) => {
             <block type="s4d_joining_member_raw"></block>
             <block type="s4d_joining_guild_raw"></block>
         </category>
+        <category name="{{ TOOLBOX_INVITES }}" colour="#fdd9b5">
+            <label text="{{ LABEL_INVITE_EVENTS }}"/>
+            <block type="s4d_on_create_invite"/>
+            <block type="s4d_on_invite_delete"/>
+            <label text="{{ LABEL_INVITE_BLOCKS }}"/>
+            <block type="s4d_inv_channel"/>
+            <block type="s4d_inv_guild"/>
+            <block type="s4d_inviter"/>
+            <block type="s4d_invite_code"/>
+            <block type="s4d_inv_url"/>
+            <block type="s4d_inv_uses"/>
+            <block type="s4d_inv_date"/>
+            <block type="s4d_inv_channel_raw"/>
+            <block type="s4d_inv_max"/>
+        </category>
         <category name="{{ TOOLBOX_E_LEAVES }}" colour="#778899">
             <label text="%{BKY_LEAVES_RELATED_BLOCKS}" web-class="boldtext"></label>
             <label text="%{BKY_DETECT_LEAVES}"></label>
@@ -484,6 +675,38 @@ export default (Blockly) => {
             <block type="s4d_react_emoji"></block>
             <block type="s4d_react_member"></block>
         </category>
+        <category name="Events" colour="#ffc269">
+            <category name="User" colour="#d3fd6d">
+                <block type="s4d_on_useru"></block>
+                <block type="s4d_update_user"></block>
+                <block type="s4d_av_url_update"></block>
+                <block type="s4d_username_update"></block>
+                <block type="s4d_discrim_update"></block>
+            </category>
+            <category name="Voice" colour="#518cee"><block type="s4d_on_vc"></block>
+                <block type="s4d_on_vc_um"></block>
+                <block type="s4d_on_vc_ud"></block>
+                <block type="s4d_on_vc_sss"></block>
+                <block type="s4d_on_vc_switch"></block>
+                <block type="s4d_update_member"></block>
+                <label text="Join/Leave" web-class="boldtext"></label>
+                <block type="s4d_join/leave_channel"></block>
+                <block type="s4d_join/leave_channel_raw"></block>
+                <label text="Mute" web-class="boldtext"></label>
+                <block type="s4d_mute_type"></block>
+                <label text="Unmute" web-class="boldtext"></label>
+                <block type="s4d_oldmute_type"></block>
+                <label text="Deaf/Undeaf" web-class="boldtext"></label>
+                <block type="s4d_deaf_type"></block>
+                <label text="Streaming Start/Stop" web-class="boldtext"></label>
+                <block type="s4d_streaming_channel"></block>
+                <block type="s4d_stream_channel_raw"></block>
+                <label text="VC switch" web-class="boldtext"></label>
+                <block type="s4d_switch_chnl"></block>
+                <block type="s4d_old_channel_raw"></block>
+                <block type="s4d_new_channel_raw"></block>
+            </category>
+        </category>
         <sep />
         <category name="{{ TOOLBOX_SERVER }}" colour="#D85E47">
             <label text="%{BKY_FIND_SERVER}"></label>
@@ -501,7 +724,15 @@ export default (Blockly) => {
             <label text="%{BKY_FIND_CHANNEL}"></label>
             <block type="s4d_get_channel"></block>
             <label text="%{BKY_SEND_CHANNEL_LABEL}"></label>
-            <block type="s4d_send_channel"></block>
+            <block type="s4d_send_channel">
+                <value name="CONTENT">
+                    <shadow type="text">
+                        <field name="TEXT">{{ REPLY_EXAMPLE }}</field>
+                    </shadow>
+                </value>
+            </block>
+            <block type="s4d_channel_category"></block>
+            <block type="s4d_chnl_exist"></block>
             <label text="%{BKY_FORMS}"></label>
             <block type="s4d_send_wait_reply">
                 <value name="CONTENT">
@@ -528,6 +759,7 @@ export default (Blockly) => {
 
             <label text="%{BKY_CHANNEL_ACTIONS}"></label>
             <block type="s4d_create_channel"></block>
+            <block type="s4d_start_typing"></block>
         </category>
         <category name="{{ TOOLBOX_ROLES }}" colour="#2EB66B">
             <label text="%{BKY_FIND_ROLE}"></label>
@@ -535,6 +767,8 @@ export default (Blockly) => {
             <label text="%{BKY_ROLE_ASSIGNMENT}"></label>
             <block type="s4d_add_role"></block>
             <block type="s4d_remove_role"></block>
+            <block type="s4d_has_role"></block>
+            <block type="s4d_role_exist"></block>
         </category>
         <category name="{{ TOOLBOX_MEMBERS }}" colour="#187795">
             <label text="%{BKY_FIND_MEMBER}"></label>
@@ -544,6 +778,8 @@ export default (Blockly) => {
             <block type="s4d_member_discriminator"></block>
             <block type="s4d_member_tag"></block>
             <block type="s4d_member_username"></block>
+            <block type="s4d_member_status"></block>
+            <block type="s4d_member_streaming"></block>
             <block type="s4d_member_has_permission"></block>
             <block type="s4d_member_is_bot"></block>
             <label text="%{BKY_LABEL_MEMBER_ACTIONS}"></label>
@@ -555,6 +791,18 @@ export default (Blockly) => {
             <block type="s4d_set_member_nickname"></block>
         </category>
         <sep />
+        <category name="Time" colour="#4d7198">
+            <block type="s4d_date_now"/>
+            <block type="s4d_date_discord_string"/>
+            <block type="s4d_date_string"/>
+            <block type="s4d_date_value"/>
+        </category>
+        <category name="{{ TOOLBOX_REQUESTS }}" colour="#9e639f">
+            <block type="s4d_request_then"/>
+            <block type="s4d_request_value"/>
+            <block type="s4d_get_object_value"/>
+            <block type="s4d_requested_object"/>
+        </category>
         <category name="{{ TOOLBOX_DATABASE }}" colour="#FF0000">
             <label text="%{BKY_LABEL_READ_DB}"></label>
             <block type="s4d_get_data">
@@ -571,6 +819,7 @@ export default (Blockly) => {
                     </shadow>
                 </value>
             </block>
+            <block type="s4d_db_length"/>
             <label text="%{BKY_LABEL_UPDATE_DB}"></label>
             <block type="s4d_set_data">
                 <value name="KEY">
@@ -591,6 +840,7 @@ export default (Blockly) => {
                     </shadow>
                 </value>
             </block>
+            <block type="s4d_clear_all_data"/>
             <block type="s4d_add_data">
                 <value name="COUNT">
                     <shadow type="math_number">
diff --git a/vue.config.js b/vue.config.js
index c67c6ea6e..c1850f5fa 100755
--- a/vue.config.js
+++ b/vue.config.js
@@ -1,5 +1,5 @@
 module.exports = {
     devServer: {
-        port: 3000
+      disableHostCheck: true
     }
-}
+}
\ No newline at end of file
diff --git a/yarn.lock b/yarn.lock
index 19ed39348..a87727da8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5624,13 +5624,6 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-lie@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
-  integrity sha1-mkNrLMd0bKWd56QfpGmz77dr2H4=
-  dependencies:
-    immediate "~3.0.5"
-
 lie@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.3.0.tgz#dcf82dee545f46074daf200c7c1c5a08e0f40f6a"
@@ -5684,13 +5677,6 @@ loader-utils@^2.0.0:
     emojis-list "^3.0.0"
     json5 "^2.1.2"
 
-localforage@^1.10.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
-  integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
-  dependencies:
-    lie "3.1.1"
-
 locate-path@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e"