diff --git a/source/Ox/js/Format.js b/source/Ox/js/Format.js
index fa4ae0ef..83e9532d 100644
--- a/source/Ox/js/Format.js
+++ b/source/Ox/js/Format.js
@@ -669,7 +669,7 @@ Ox.formatString <f> Basic string formatting
     > Ox.formatString('{a}{b}', {a: 'foo', b: 'bar'})
     'foobar'
 @*/
-Ox.formatString = function (string, collection) {
+Ox.formatString = function(string, collection) {
     return string.replace(/\{([^}]+)\}/g, function(string, match) {
         return collection[match];
     });
@@ -684,7 +684,7 @@ Ox.formatUnit <f> Formats a number with a unit
 @*/
 Ox.formatUnit = function(number, string, decimals) {
     return Ox.formatNumber(number, decimals)
-        + (string == '%' ? '' : ' ') + string;
+        + (/^[:%]/.test(string) ? '' : ' ') + string;
 };
 
 /*@