diff --git a/client/src/main/kotlin/org/dreamexposure/discal/client/message/embed/CalendarEmbed.kt b/client/src/main/kotlin/org/dreamexposure/discal/client/message/embed/CalendarEmbed.kt
index 0e05f1cc..69aa1ef6 100644
--- a/client/src/main/kotlin/org/dreamexposure/discal/client/message/embed/CalendarEmbed.kt
+++ b/client/src/main/kotlin/org/dreamexposure/discal/client/message/embed/CalendarEmbed.kt
@@ -59,16 +59,15 @@ object CalendarEmbed : EmbedMaker {
                         date.key.toInstant().asDiscordTimestamp(DiscordTimestampFormat.LONG_DATE)
                 )
 
-                val content = StringBuilder().append("```\n")
+                val content = StringBuilder()
                 date.value.forEach {
                     content.append(it.start.asDiscordTimestamp(DiscordTimestampFormat.SHORT_TIME))
                             .append(" - ")
                             .append(it.end.asDiscordTimestamp(DiscordTimestampFormat.SHORT_TIME))
                             .append(" | ")
-                    if (it.name.isNotBlank()) content.append(it.name).append(" | ")
-                    content.append(it.eventId).append("\n")
+                    if (it.name.isNotBlank()) content.append("`${it.name}`").append(" | ")
+                    content.append("`${it.eventId}`").append("\n")
                 }
-                content.append("```")
 
                builder.addField(fieldTitle, content.toString(), false)
             }
diff --git a/core/src/main/resources/i18n/embed/calendar.properties b/core/src/main/resources/i18n/embed/calendar.properties
index 66947e28..31d16cdb 100644
--- a/core/src/main/resources/i18n/embed/calendar.properties
+++ b/core/src/main/resources/i18n/embed/calendar.properties
@@ -3,9 +3,9 @@ link.field.timezone=Time Zone
 link.field.host=Host
 link.field.number=Number
 link.field.id=ID
-link.field.date=%s (Local)
+link.field.date={0} (Local)
 link.footer.default=View the entire calendar with events by clicking the title
-link.footer.update=Last Updated \u22C4 %s
+link.footer.update=Last Updated \u22C4 {0}
 
 wizard.title=Calendar Wizard
 wizard.field.name=* Name