@@ 113,7 113,7 @@ 
 (require 'dash)
 
 (defun --escape-percent-construct (string)
-   (s-replace "%" "%%" string))
+   (replace-regexp-in-string "\\(%\\)" "\\1\\1" string))
 
 ;(defun --merge-face-in-list (sexp face-to-merge)
 ;  (let ((head (car sexp)))

          
@@ 139,7 139,8 @@ 
 ;
 (defun xc-line/centre-space (right-length)
    "Creates the space for the centre of the mode line"
-   `(:propertize " " display (space :align-to (- right ,right-length))))
+   `(:propertize " " display (space :align-to (- right (- 0 right-margin)
+                                                 ,right-length))))
 
 (defun xc-line/format-part-expand-symbols (sym)
     "Expands symbols when they are bound"