diff --git a/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl b/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl
index d6a1362..10a68be 100644
--- a/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/customization-templates/moderation-customization-templates/src/main/resources/en_US/listener/warningCreatedListener/warning_threshold_notification_embed_en_US.ftl
@@ -1,13 +1,17 @@
 {
-  "title": {
-    "title": "<@safe_include "warning_threshold_reached_notification_title"/>"
-  },
-  <#include "abstracto_color">,
-  <#assign warnedMemberMention=memberDisplay.memberMention>
-  <#assign warnedUserId=memberDisplay.userId>
-  <#assign memberMention=memberDisplay.memberMention>
-  <#assign warnCount=warnCount>
-  <#assign channelDisplay=channelDisplay>
-  <#assign messageId=messageId>
-  "description": "<@safe_include "warning_threshold_reached_notification_description"/>"
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "warning_threshold_reached_notification_title"/>"
+            },
+            <#include "abstracto_color">,
+            <#assign warnedMemberMention=memberDisplay.memberMention>
+            <#assign warnedUserId=memberDisplay.userId>
+            <#assign memberMention=memberDisplay.memberMention>
+            <#assign warnCount=warnCount>
+            <#assign channelDisplay=channelDisplay>
+            <#assign messageId=messageId>
+            "description": "<@safe_include "warning_threshold_reached_notification_description"/>"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl
index 3977bd5..eee9aa3 100644
--- a/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_created_notification_embed_en_US.ftl
@@ -1,41 +1,45 @@
 {
-  "title": {
-    "title": "<@safe_include "starboard_post_created_title"/>"
-  },
-  <#include "abstracto_color">,
-  "description": "<@safe_include "starboard_post_created_description"/>",
-  "fields": [
-      {
-        "name": "<@safe_include "starboard_post_notification_field_starboard_message"/>",
-        <#if starboardMessage??>
-            "value": "[<@safe_include "starboard_post_notification_field_starboard_message_jump"/>](${starboardMessage.jumpUrl})"
-        <#else>
-            "value": "${post.starboardMessageId?c}"
-        </#if>
-      },
-      {
-        "name": "<@safe_include "starboard_post_notification_field_starred_message"/>",
-        <#if starredMessage??>
-            "value": "[<@safe_include "starboard_post_notification_field_starboard_message_jump"/>](${starredMessage.jumpUrl})"
-        <#else>
-            "value": "${post.postMessageId?c}"
-        </#if>
-      },
-      {
-        "name": "<@safe_include "starboard_post_notification_field_starred_user"/>",
-        <#if starredMember??>
-            "value": "${starredMember.asMention}"
-        <#else>
-            "value": "${starredUserId?c} (<@safe_include "user_left_server"/>)"
-        </#if>
-      },
-      {
-        "name": "<@safe_include "starboard_post_notification_field_starring_user"/>",
-        <#if starringMember??>
-            "value": "${starringMember.asMention}"
-        <#else>
-            "value": "${starringUserId?c} (<@safe_include "user_left_server"/>)"
-        </#if>
-      }
-  ]
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "starboard_post_created_title"/>"
+            },
+            <#include "abstracto_color">,
+            "description": "<@safe_include "starboard_post_created_description"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "starboard_post_notification_field_starboard_message"/>",
+                    <#if starboardMessage??>
+                    "value": "[<@safe_include "starboard_post_notification_field_starboard_message_jump"/>](${starboardMessage.jumpUrl})"
+                    <#else>
+                    "value": "${post.starboardMessageId?c}"
+                    </#if>
+                },
+                {
+                    "name": "<@safe_include "starboard_post_notification_field_starred_message"/>",
+                    <#if starredMessage??>
+                    "value": "[<@safe_include "starboard_post_notification_field_starboard_message_jump"/>](${starredMessage.jumpUrl})"
+                    <#else>
+                    "value": "${post.postMessageId?c}"
+                    </#if>
+                },
+                {
+                    "name": "<@safe_include "starboard_post_notification_field_starred_user"/>",
+                    <#if starredMember??>
+                    "value": "${starredMember.asMention}"
+                    <#else>
+                    "value": "${starredUserId?c} (<@safe_include "user_left_server"/>)"
+                    </#if>
+                },
+                {
+                    "name": "<@safe_include "starboard_post_notification_field_starring_user"/>",
+                    <#if starringMember??>
+                    "value": "${starringMember.asMention}"
+                    <#else>
+                    "value": "${starringUserId?c} (<@safe_include "user_left_server"/>)"
+                    </#if>
+                }
+            ]
+        }
+    ]
 }
\ No newline at end of file
diff --git a/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl
index b4fbe93..939c934 100644
--- a/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/customization-templates/starboard-customization-templates/src/main/resources/en_US/listener/starboardNotification/starboard_post_deleted_notification_embed_en_US.ftl
@@ -1,33 +1,37 @@
 {
-  "title": {
-    "title": "<@safe_include "starboard_post_deleted_title"/>"
-  },
-  <#include "abstracto_color">,
-  "description": "<@safe_include "starboard_post_deleted_description"/>",
-  "fields": [
-      {
-        "name": "<@safe_include "starboard_post_notification_field_starred_message"/>",
-        <#if starredMessage??>
-            "value": "[<@safe_include "starboard_post_notification_field_starboard_message_jump"/>](${starredMessage.jumpUrl})"
-        <#else>
-            "value": "${starredMessageSimple.jumpUrl}"
-        </#if>
-      },
-      {
-        "name": "<@safe_include "starboard_post_notification_field_starred_user"/>",
-        <#if starredMember??>
-            "value": "${starredMember.asMention}"
-        <#else>
-            "value": "${starredUserId?c} (<@safe_include "user_left_server"/>)"
-        </#if>
-      },
-      {
-        "name": "<@safe_include "starboard_post_notification_field_starring_user"/>",
-        <#if starringMember??>
-            "value": "${starringMember.asMention}"
-        <#else>
-            "value": "${starringUserId?c} (<@safe_include "user_left_server"/>)"
-        </#if>
-      }
-  ]
+    "embeds": [
+        {
+            "title": {
+                "title": "<@safe_include "starboard_post_deleted_title"/>"
+            },
+            <#include "abstracto_color">,
+            "description": "<@safe_include "starboard_post_deleted_description"/>",
+            "fields": [
+                {
+                    "name": "<@safe_include "starboard_post_notification_field_starred_message"/>",
+                    <#if starredMessage??>
+                    "value": "[<@safe_include "starboard_post_notification_field_starboard_message_jump"/>](${starredMessage.jumpUrl})"
+                    <#else>
+                    "value": "${starredMessageSimple.jumpUrl}"
+                    </#if>
+                },
+                {
+                    "name": "<@safe_include "starboard_post_notification_field_starred_user"/>",
+                    <#if starredMember??>
+                    "value": "${starredMember.asMention}"
+                    <#else>
+                    "value": "${starredUserId?c} (<@safe_include "user_left_server"/>)"
+                    </#if>
+                },
+                {
+                    "name": "<@safe_include "starboard_post_notification_field_starring_user"/>",
+                    <#if starringMember??>
+                    "value": "${starringMember.asMention}"
+                    <#else>
+                    "value": "${starringUserId?c} (<@safe_include "user_left_server"/>)"
+                    </#if>
+                }
+            ]
+        }
+    ]
 }
\ No newline at end of file
diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl
index 67b38ee..e964d2b 100644
--- a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/FAQUsage/FAQUsage_response_embed_en_US.ftl
@@ -1,6 +1,8 @@
 {
-    <#include "abstracto_color">,
-    "description": "
+    "embeds": [
+        {
+        <#include "abstracto_color">,
+        "description": "
 <#list uses as usage>
 <#assign usage=usage>
 <#assign commandName=usage.faqCommandName><@safe_include "FAQUsage_command_display"/>:
@@ -11,4 +13,6 @@
 <@safe_include "FAQUsage_usage_display"/><#sep>, </#list>
 <#else>
 <@safe_include "FAQUsage_no_usages"/></#list>"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_embed_en_US.ftl
index 4998752..a1f4ed1 100644
--- a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/faq/FAQ_response_embed_en_US.ftl
@@ -2,20 +2,24 @@
   <#if additionalMessage??>
   "additionalMessage": "${additionalMessage?json_string}"
   </#if>
-  <#if description?? || imageURL??>
-    <#include "user_author">
-    <#if additionalMessage??>,</#if>
-    <@user_author user=author/>
-    <#if description??>
-    ,"description": "${description?json_string}"
-    </#if>
-    ,"color" : {
-        "r": "${red}",
-        "g": "${green}",
-        "b": "${blue}"
-    }
-    <#if imageURL??>
-    ,"imageUrl": "${imageURL}"
-    </#if>
-  </#if>
+    "embeds": [
+        {
+            <#if description?? || imageURL??>
+            <#include "user_author">
+            <#if additionalMessage??>,</#if>
+            <@user_author user=author/>
+            <#if description??>
+            ,"description": "${description?json_string}"
+            </#if>
+            ,"color" : {
+                "r": "${red}",
+                "g": "${green}",
+                "b": "${blue}"
+            }
+            <#if imageURL??>
+            ,"imageUrl": "${imageURL}"
+            </#if>
+            </#if>
+        }
+    ]
 }
\ No newline at end of file
diff --git a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl
index 087f164..3822b1b 100644
--- a/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/module-templates/faq-templates/src/main/resources/en_US/commands/listFAQCommands/listFAQCommands_response_embed_en_US.ftl
@@ -1,7 +1,9 @@
 {
-    <#include "abstracto_color">,
-    "description": "
-    <@safe_include "listFAQCommands_command_header"/>
+    "embeds": [
+        {
+        <#include "abstracto_color">,
+        "description": "
+<@safe_include "listFAQCommands_command_header"/>
 
 <#list commands as command>
 <#assign command=command>
@@ -17,4 +19,6 @@
 
 <#else>
 <@safe_include "listFAQCommands_no_commands"/></#list>"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl
index 891db31..d718475 100644
--- a/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/module-templates/news-templates/src/main/resources/en_US/commands/news/news_post_embed_en_US.ftl
@@ -1,12 +1,18 @@
 {
   <#assign roleMention="<@&479202891358535681>"/>
   <#assign authorMention>${author.user.name}#${author.user.discriminator}</#assign>
-  "additionalMessage": "<@safe_include "news_post_description"/>",
-  <#if message.attachments?size gt 0>
-    "imageUrl": "${message.attachments[0].proxyUrl}",
-  </#if>
-  "metaConfig": {
-    "allowsRoleMention": true,
-    "preventEmptyEmbed": true
-  }
+    "additionalMessage": "<@safe_include "news_post_description"/>",
+    "embeds": [
+        {
+            <#if message.attachments?size gt 0>
+            "imageUrl": "${message.attachments[0].proxyUrl}",
+            </#if>
+            "metaConfig": {
+                "preventEmptyEmbed": true
+            }
+        }
+    ],
+    "messageConfig": {
+        "allowsRoleMention": true
+    }
 }
\ No newline at end of file
diff --git a/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl
index 602dc6d..a0d5944 100644
--- a/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_referral_post_embed_en_US.ftl
@@ -1,17 +1,21 @@
 {
-  <#include "abstracto_color">,
-  <#include "member_author">
-  <#assign member=postingMember>
-  <@member_author member=member/>,
-  <#include "full_member_info">
-  "description": "<@safe_include "referralListener_referral_post_description"/>",
-  "fields": [
-  <#list referrals as referral><#assign referral=referral>
-      {
-        "name": "<@safe_include "referral_link_type_${referral.type.key}"/>",
-        "value": "[${referral.referralIdentifier?json_string}](${referral.referralLink?json_string})"
-      }
-      <#sep>,
-      </#list>
-  ]
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            <#include "member_author">
+            <#assign member=postingMember>
+            <@member_author member=member/>,
+            <#include "full_member_info">
+            "description": "<@safe_include "referralListener_referral_post_description"/>",
+            "fields": [
+                <#list referrals as referral><#assign referral=referral>
+                {
+                    "name": "<@safe_include "referral_link_type_${referral.type.key}"/>",
+                    "value": "[${referral.referralIdentifier?json_string}](${referral.referralLink?json_string})"
+                }
+                <#sep>,
+            </#list>
+            ]
+        }
+    ]
 }
\ No newline at end of file
diff --git a/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl
index 5de2510..b958e93 100644
--- a/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/module-templates/referral-templates/src/main/resources/en_US/listener/referralListener/referralListener_too_recent_post_embed_en_US.ftl
@@ -1,5 +1,9 @@
 {
- <#include "abstracto_color">,
-  "description": "<@safe_include "too_recent_referral_post"/>",
-  "timeStamp": "${nextReferralDate}"
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "description": "<@safe_include "too_recent_referral_post"/>",
+            "timeStamp": "${nextReferralDate}"
+        }
+    ]
 }
\ No newline at end of file
diff --git a/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl b/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl
index 22515f4..6d0772a 100644
--- a/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl
+++ b/templates/oneplus-bot-templates/template-overrides/webservices-template-overrides/src/main/resources/en_US/urban/commands/urbanDefine/urban_define_response_model_embed_en_US.ftl
@@ -1,21 +1,25 @@
 {
-  <#include "abstracto_color">,
-  "fields": [
-      {
-            "name": "<@safe_include "urban_search_command_response_embed_field_title_link"/>",
-            "value": "${definition.url?json_string}",
-            "inline": "true"
-      },
-      {
-            "name": "<@safe_include "urban_search_command_response_embed_field_title_example"/>",
-            "value": "${definition.example?json_string}",
-            "valueLengthLimit": 250,
-            "inline": "true"
-      }
-  ],
-  "additionalMessage": "${definition.definition?json_string}",
-  "metaConfig": {
-    "messageLimit": 1,
-    "additionalMessageLengthLimit": 250
-  }
+    "additionalMessage": "${definition.definition?json_string}",
+    "embeds": [
+        {
+            <#include "abstracto_color">,
+            "fields": [
+                {
+                    "name": "<@safe_include "urban_search_command_response_embed_field_title_link"/>",
+                    "value": "${definition.url?json_string}",
+                    "inline": "true"
+                },
+                {
+                    "name": "<@safe_include "urban_search_command_response_embed_field_title_example"/>",
+                    "value": "${definition.example?json_string}",
+                    "valueLengthLimit": 250,
+                    "inline": "true"
+                }
+            ]
+        }
+    ],
+    "messageConfig": {
+        "messageLimit": 1,
+        "additionalMessageLengthLimit": 250
+    }
 }
\ No newline at end of file
diff --git a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl
index 9aebe20..ff9af22 100644
--- a/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl
+++ b/templates/translations/customization-translations/moderation-customization-translations/src/main/resources/en_US/config/feature_setup_posttarget_warnThresholdNotification_en_US.ftl
@@ -1 +1 @@
-The channel in which warn threshold notifications should be sent to. Default: ${defaultValue}
\ No newline at end of file
+The channel in which warn threshold notifications should be sent to. Default: ${currentTarget}
\ No newline at end of file