diff --git a/annales.csl b/annales.csl
index f3fceb9a3b..89d458965b 100644
--- a/annales.csl
+++ b/annales.csl
@@ -20,7 +20,7 @@
       <term name="ordinal-02">e</term>
       <term name="ordinal-03">e</term>
       <term name="ordinal-04">e</term>
-      <term name="cited">op. cit.</term>
+      <term name="cited">op.&#160;cit.</term>
       <term name="page" form="short">
         <single>p.</single>
         <multiple>p.</multiple>
@@ -44,7 +44,7 @@
           <name form="long" and="text" name-as-sort-order="first" sort-separator=" " initialize-with="." font-style="normal">
             <name-part name="family" font-variant="small-caps"/>
           </name>
-          <label form="short" prefix=" (" suffix=".)"/>
+          <label form="short" prefix="&#160;(" suffix=".)"/>
         </names>
       </else-if>
     </choose>
@@ -53,7 +53,7 @@
     <names variable="editor">
       <name form="long" and="text" delimiter-precedes-last="never" sort-separator=" " font-style="normal">
       </name>
-      <label form="short" prefix=" (" suffix=".)"/>
+      <label form="short" prefix="&#160;(" suffix=".)"/>
     </names>
   </macro>
   <macro name="translator">
@@ -70,26 +70,26 @@
       </if>
       <else-if type="article-journal article-newspaper article-magazine" match="any">
         <group delimiter=", ">
-          <text variable="title" text-case="capitalize-first" prefix="« " suffix=" »" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
           <text variable="container-title" font-style="italic"/>
         </group>
       </else-if>
       <else-if type="thesis" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="« " suffix=" »" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
           <text variable="genre" suffix=", " prefix=" "/>
           <text variable="publisher"/>
         </group>
       </else-if>
       <else-if type="manuscript" match="any">
         <group delimiter=",">
-          <text variable="title" text-case="capitalize-first" prefix="« " suffix=" »" font-style="normal"/>
+          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
           <text variable="genre" prefix=" "/>
         </group>
       </else-if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
         <group delimiter="">
-          <text variable="title" text-case="capitalize-first" prefix="« " suffix=" »,"/>
+          <text variable="title" text-case="capitalize-first" prefix="«&#160;" suffix="&#160;»,"/>
           <text value="in" font-style="italic" suffix=" " prefix=" "/>
           <text macro="editor" suffix=", "/>
           <text variable="container-title" text-case="capitalize-first" font-style="italic"/>
@@ -102,7 +102,7 @@
         </group>
       </else-if>
       <else>
-        <text variable="title" prefix="« " suffix=" »"/>
+        <text variable="title" prefix="«&#160;" suffix="&#160;»"/>
       </else>
     </choose>
   </macro>
@@ -132,7 +132,7 @@
             <text variable="number-of-volumes" prefix=". " suffix="/"/>
             <text variable="volume"/>
           </group>
-          <text variable="locator" prefix="p. "/>
+          <text variable="locator" prefix="p.&#160;"/>
         </group>
       </if>
       <else-if type="chapter entry-dictionary entry-encyclopedia" match="any">
@@ -148,7 +148,7 @@
           <label variable="page" form="short"/>
           <group delimiter=", ">
             <text variable="page"/>
-            <text variable="locator" prefix="p. "/>
+            <text variable="locator" prefix="p.&#160;"/>
           </group>
         </group>
       </else-if>
@@ -157,7 +157,7 @@
           <label variable="page" form="short"/>
           <group delimiter=", ">
             <text variable="page"/>
-            <text variable="locator" prefix="p. "/>
+            <text variable="locator" prefix="p.&#160;"/>
           </group>
         </group>
       </else-if>
@@ -171,7 +171,7 @@
           <group delimiter=" " font-style="normal">
             <choose>
               <if variable="locator" match="any">
-                <text variable="locator" prefix="p. "/>
+                <text variable="locator" prefix="p.&#160;"/>
               </if>
               <else-if variable="locator" match="none">
                 <label variable="page" form="short"/>
@@ -228,7 +228,7 @@
   <macro name="volume">
     <choose>
       <if is-numeric="volume">
-        <text term="volume" form="short" suffix=". "/>
+        <text term="volume" form="short" suffix=".&#160;"/>
         <text variable="volume"/>
       </if>
       <else>
@@ -239,7 +239,7 @@
   <macro name="issue">
     <choose>
       <if is-numeric="issue">
-        <text term="issue" form="short" suffix=" "/>
+        <text term="issue" form="short" suffix="&#160;"/>
         <text variable="issue"/>
       </if>
       <else>
@@ -250,16 +250,16 @@
   <macro name="collection">
     <choose>
       <if is-numeric="collection-number">
-        <text variable="collection-title" prefix=" coll. « " suffix=" »"/>
-        <text variable="collection-number" prefix=", n˚ "/>
+        <text variable="collection-title" prefix=" coll.&#160;«&#160;" suffix="&#160;»"/>
+        <text variable="collection-number" prefix=", n˚&#160;"/>
       </if>
       <else>
-        <text variable="collection-title" prefix=" coll. « " suffix=" »"/>
+        <text variable="collection-title" prefix=" coll.&#160;«&#160;" suffix="&#160;»"/>
       </else>
     </choose>
   </macro>
   <citation>
-    <layout prefix="" suffix="." delimiter=" ; ">
+    <layout prefix="" suffix="." delimiter="&#160;; ">
       <choose>
         <if position="ibid-with-locator">
           <group delimiter=", ">
@@ -278,11 +278,11 @@
                 <text variable="title" form="short" font-style="italic"/>
               </if>
               <else>
-                <text variable="title" text-case="capitalize-first" form="short" prefix="« " suffix=" »" font-style="normal"/>
+                <text variable="title" text-case="capitalize-first" form="short" prefix="«&#160;" suffix="&#160;»" font-style="normal"/>
               </else>
             </choose>
             <text term="cited" font-style="italic" suffix="."/>
-            <text variable="locator" prefix="p. "/>
+            <text variable="locator" prefix="p.&#160;"/>
           </group>
         </else-if>
         <else>