diff --git a/common/src/main/java/xyz/jpenilla/tabtps/common/util/TranslatableProvider.java b/common/src/main/java/xyz/jpenilla/tabtps/common/util/TranslatableProvider.java
index 2473c930..9ce73f01 100644
--- a/common/src/main/java/xyz/jpenilla/tabtps/common/util/TranslatableProvider.java
+++ b/common/src/main/java/xyz/jpenilla/tabtps/common/util/TranslatableProvider.java
@@ -117,13 +117,14 @@ public static void loadBundle(final String bundleName, final Class<?> clazz) {
     registerAll(
       registry,
       availableLocales(bundleName, clazz),
-      bundleName
+      bundleName,
+      false
     );
 
     GlobalTranslator.translator().addSource(registry);
   }
 
-  private static void registerAll(final TranslationRegistry registry, final Set<Locale> locales, final String bundleName) {
+  private static void registerAll(final TranslationRegistry registry, final Set<Locale> locales, final String bundleName, final boolean escapeSingleQuotes) {
     for (final Locale locale : locales) {
       final ResourceBundle bundle = PropertyResourceBundle.getBundle(bundleName, locale, UTF8ResourceBundleControl.get());
       for (final String key : bundle.keySet()) {
@@ -131,7 +132,10 @@ private static void registerAll(final TranslationRegistry registry, final Set<Lo
           registry.register(
             formatKey(bundleName, key),
             locale,
-            new MessageFormat(TranslationRegistry.SINGLE_QUOTE_PATTERN.matcher(bundle.getString(key)).replaceAll("''"))
+            new MessageFormat(
+              escapeSingleQuotes ? TranslationRegistry.SINGLE_QUOTE_PATTERN.matcher(bundle.getString(key)).replaceAll("''") : bundle.getString(key),
+              locale
+            )
           );
         } catch (final IllegalArgumentException | MissingResourceException | ClassCastException ex) {
           LOGGER.warn("Failed to load translation for key '{}' from bundle '{}' with the '{}' locale.", key, bundleName, locale.getDisplayName(), ex);
diff --git a/common/src/main/messages/xyz/jpenilla/tabtps/common/messages.properties b/common/src/main/messages/xyz/jpenilla/tabtps/common/messages.properties
index 06844252..51396a4a 100644
--- a/common/src/main/messages/xyz/jpenilla/tabtps/common/messages.properties
+++ b/common/src/main/messages/xyz/jpenilla/tabtps/common/messages.properties
@@ -27,7 +27,7 @@ help.showing_results_for_query=Showing search results for query
 help.no_results_for_query=No results for query
 help.available_commands=Available Commands
 help.click_to_show_help=Click to show help for this command
-help.page_out_of_range=Error: Page {0} is not in range. Must be in range [1, {1}]
+help.page_out_of_range=Error\: Page {0} is not in range. Must be in range [1, {1}]
 help.click_for_next_page=Click for next page
 help.click_for_previous_page=Click for previous page
 
@@ -48,21 +48,21 @@ command.ping_all.description=Displays the pings of connected players with an ave
 command.memory.description=Displays the current memory pools of the server JVM. Output will vary greatly based on garbage collection settings.
 
 # Command exceptions
-command.exception.invalid_argument=Invalid command argument: {0}
-command.exception.invalid_syntax=Invalid command syntax. Correct command syntax is: {0}
+command.exception.invalid_argument=Invalid command argument\: {0}
+command.exception.invalid_syntax=Invalid command syntax. Correct command syntax is\: {0}
 command.exception.invalid_sender_type=Invalid command sender. You must be of type {0}.
-command.exception.no_permission=I'm sorry, but you do not have permission to perform this command.\nPlease contact the server administrators if you believe that this is in error.
+command.exception.no_permission=I''m sorry, but you do not have permission to perform this command.\nPlease contact the server administrators if you believe that this is in error.
 command.exception.command_execution=An internal error occurred while attempting to perform this command.
 
 # Command feedback text
-misc.command.text.no_players_found=No players found for selector: '{0}'
+misc.command.text.no_players_found=No players found for selector\: ''{0}''
 command.ping.text.player_pings=Player Pings
 command.ping.text.console_must_provide_player=Console must provide a player to check the ping of.
 command.ping.text.average_ping=Average ping
 command.ping.text.amount_players={0} players
 command.ping.text.amount_players_singular={0} player
-command.ping_self.text.your_ping=Your ping: {0}
-command.ping_target.text.targets_ping={0}'s ping: {1}
+command.ping_self.text.your_ping=Your ping\: {0}
+command.ping_target.text.targets_ping={0}''s ping\: {1}
 command.memory.text.header=Memory Usage
 command.tickinfo.text.mspt_hover=Milliseconds per tick. Avg. MSPT ≤ 50 -> 20 TPS
 command.tickinfo.text.tps_hover=Ticks per second. 20 is optimal.
@@ -77,9 +77,9 @@ command.toggle.actionbar.enabled=Enabled action bar display.
 command.toggle.actionbar.disabled=Disabled action bar display.
 
 # Command argument parse failure messages
-command.caption.argument.parse.failure.number='{0}' is not a valid number in the range [{1}, {2}].
-command.caption.argument.parse.failure.string='{0}' is not a valid string of type {1}.
-command.caption.argument.parse.failure.selector.malformed=Selector '{0}' is malformed.
+command.caption.argument.parse.failure.number=''{0}'' is not a valid number in the range [{1}, {2}].
+command.caption.argument.parse.failure.string=''{0}'' is not a valid string of type {1}.
+command.caption.argument.parse.failure.selector.malformed=Selector ''{0}'' is malformed.
 command.caption.argument.parse.failure.selector.non_player_in_player_selector=Non-player(s) selected in player selector.
 
 # Misc