diff --git a/doc/03_reference/images/blockdiagram.svg b/doc/03_reference/images/blockdiagram.svg
index 001a94fb0..aa141c799 100644
--- a/doc/03_reference/images/blockdiagram.svg
+++ b/doc/03_reference/images/blockdiagram.svg
@@ -19,7 +19,6 @@
    xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs2">
-    <style type="text/css">@import url(http://fonts.googleapis.com/css?family=Exo+2);</style>
     <marker
        inkscape:stockid="SquareM"
        orient="auto"
@@ -186,7 +185,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.315615"
-     inkscape:cx="216.62872"
+     inkscape:cx="217.00878"
      inkscape:cy="386.51125"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
@@ -253,7 +252,7 @@
          id="tspan2068-5-0"
          x="-69.017548"
          y="129.96315"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.87778px;font-family:'Exo 2';-inkscape-font-specification:'Exo 2 Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.264583px">Ibex Core</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:9.87778px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';fill:#ffffff;fill-opacity:1;stroke-width:0.264583px">Ibex Core</tspan></text>
     <rect
        style="display:inline;fill:none;fill-opacity:1;stroke:#a21f4f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4554-36-3-0"
@@ -275,15 +274,14 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="-1.2360843"
-       y="279.71188"
-       id="text1301"
-       transform="translate(95.448437,-117.39207)"><tspan
+       x="94.212349"
+       y="162.31981"
+       id="text1301"><tspan
          sodipodi:role="line"
          id="tspan1299"
-         x="-1.2360843"
-         y="279.71188"
-         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;font-family:'Exo 2';-inkscape-font-specification:'Exo 2 Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Optional feature</tspan></text>
+         x="94.212349"
+         y="162.31981"
+         style="font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Italic';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:0.264583">Optional feature</tspan></text>
     <path
        inkscape:connector-curvature="0"
        style="display:inline;fill:#ffffff;stroke-width:0.297135"
@@ -324,15 +322,15 @@
         <text
            xml:space="preserve"
            style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#e0384f;fill-opacity:1;stroke:none;stroke-width:0.264583"
-           x="77.552826"
-           y="-77.514648"
+           x="94.960678"
+           y="-77.513489"
            id="text1467-3"
            transform="rotate(90)"><tspan
              sodipodi:role="line"
              id="tspan1465-5"
-             x="77.552826"
-             y="-77.514648"
-             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';fill:#000000;fill-opacity:1;stroke-width:0.264583">PMP Check</tspan></text>
+             x="94.960678"
+             y="-77.513489"
+             style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.264583">PMP Check</tspan></text>
       </g>
     </g>
     <rect
@@ -360,15 +358,15 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="172.05075"
-       y="-174.19821"
+       x="208.96339"
+       y="-174.18018"
        id="text1251-7"
        transform="rotate(90)"><tspan
          sodipodi:role="line"
          id="tspan1249-5"
-         x="172.05075"
-         y="-174.19821"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583">Data Memory Interface</tspan></text>
+         x="208.96339"
+         y="-174.18018"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;stroke-width:0.264583">Data Memory Interface</tspan></text>
     <rect
        style="fill:#ffe0e5;fill-opacity:1;stroke:#6c0e1d;stroke-width:0.265;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4554-36-7-5-6-5-3-0"
@@ -398,15 +396,15 @@
          ry="2.9559603" />
       <text
          xml:space="preserve"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583"
-         x="41.242962"
-         y="81.034111"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583"
+         x="46.193565"
+         y="80.4189"
          id="text1267"><tspan
            sodipodi:role="line"
            id="tspan1265"
-           x="41.242962"
-           y="81.034111"
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';fill:#000000;fill-opacity:1;stroke-width:0.264583">PC</tspan></text>
+           x="46.193565"
+           y="80.4189"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.264583">PC</tspan></text>
       <path
          style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="m 46.30209,82.577125 -1.32292,2.64584 H 47.625 Z"
@@ -469,29 +467,29 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="-29.346651"
-       y="217.00528"
+       x="-29.359219"
+       y="217.03493"
        id="text1167-6"><tspan
          sodipodi:role="line"
-         x="-29.346651"
-         y="217.00528"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';text-align:center;text-anchor:middle;stroke-width:0.264583"
+         x="-29.359219"
+         y="217.03493"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;stroke-width:0.264583"
          id="tspan1190">Prefetch</tspan><tspan
          sodipodi:role="line"
-         x="-29.346651"
-         y="223.18462"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';text-align:center;text-anchor:middle;stroke-width:0.264583"
+         x="-29.359219"
+         y="223.20854"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;stroke-width:0.264583"
          id="tspan3">Buffer</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="-29.408606"
-       y="196.28996"
+       x="-29.435354"
+       y="196.35132"
        id="text1167-6-6"><tspan
          sodipodi:role="line"
-         x="-29.408606"
-         y="196.28996"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';text-align:center;text-anchor:middle;stroke-width:0.264583"
+         x="-29.435354"
+         y="196.35132"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;stroke-width:0.264583"
          id="tspan1190-5">ICache</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:0.5, 0.5;stroke-dashoffset:0;stroke-opacity:1"
@@ -502,7 +500,7 @@
        xml:space="preserve"
        id="flowRoot1200"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:8px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
-       transform="matrix(0.26458333,0,0,0.26458333,-83.556607,114.50229)"><flowRegion
+       transform="matrix(0.26458333,0,0,0.26458333,-84.088038,114.50229)"><flowRegion
          id="flowRegion1202"><rect
            id="rect1204"
            width="103.41554"
@@ -510,7 +508,7 @@
            x="155"
            y="437.51968" /></flowRegion><flowPara
          id="flowPara1206"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, '">Configuration chooses ICache or Prefetch Buffer</flowPara></flowRoot>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle">Configuration chooses ICache or Prefetch Buffer</flowPara></flowRoot>
     <rect
        style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect1323"
@@ -530,7 +528,7 @@
        id="rect1372"
        style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
     <flowRoot
-       transform="matrix(0.26458333,0,0,0.26458333,-81.889166,90.75952)"
+       transform="matrix(0.26458333,0,0,0.26458333,-90.410769,91.288687)"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:26.6667px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none"
        id="flowRoot1382"
        xml:space="preserve"><flowRegion
@@ -541,7 +539,7 @@
            width="160"
            id="rect1386" /></flowRegion><flowPara
          id="flowPara1388"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, '">Execute</flowPara></flowRoot>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle">Execute</flowPara></flowRoot>
     <rect
        style="fill:#e0384f;fill-opacity:1;stroke:#000000;stroke-width:0.5;stroke-miterlimit:10;stroke-dasharray:0.5, 0.5;stroke-dashoffset:0;stroke-opacity:1"
        id="rect1153-2"
@@ -566,13 +564,13 @@
       <text
          transform="rotate(90)"
          id="text1467"
-         y="-77.601135"
-         x="92.104904"
+         y="-77.513489"
+         x="109.22854"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#e0384f;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';fill:#000000;fill-opacity:1;stroke-width:0.264583"
-           y="-77.601135"
-           x="92.104904"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.264583"
+           y="-77.513489"
+           x="109.22854"
            id="tspan1465"
            sodipodi:role="line">PMP Check</tspan></text>
     </g>
@@ -592,21 +590,21 @@
          id="tspan1122"
          x="36.121101"
          y="237.31757"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944px;line-height:2.25;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583">Imm</tspan><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944px;line-height:2.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.264583">Imm</tspan><tspan
          sodipodi:role="line"
          x="36.121101"
          y="242.87381"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944px;line-height:2.25;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944px;line-height:2.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.264583"
          id="tspan1126">Reg</tspan><tspan
          sodipodi:role="line"
          x="36.121101"
          y="248.43004"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944px;line-height:2.25;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944px;line-height:2.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.264583"
          id="tspan1128">PC</tspan><tspan
          sodipodi:role="line"
          x="36.121101"
          y="253.98628"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944px;line-height:2.25;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.46944px;line-height:2.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.264583"
          id="tspan1130">Fwd</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -630,12 +628,12 @@
       <text
          id="text1176"
          y="152.58504"
-         x="159.21214"
+         x="165.34737"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';fill:#000000;fill-opacity:1;stroke-width:0.264583"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.264583"
            y="152.58504"
-           x="159.21214"
+           x="165.34737"
            id="tspan1174"
            sodipodi:role="line">LSU</tspan></text>
     </g>
@@ -648,36 +646,36 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="112.84055"
+       x="130.0457"
        y="158.95309"
        id="text1237"><tspan
          sodipodi:role="line"
          id="tspan1235"
-         x="112.84055"
+         x="130.0457"
          y="158.95309"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2 Bold';stroke-width:0.264583">Writeback</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;stroke-width:0.264583">Writeback</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="-48.518738"
+       x="-20.073837"
        y="159.36632"
        id="text1241"><tspan
          sodipodi:role="line"
          id="tspan1239"
-         x="-48.518738"
+         x="-20.073835"
          y="159.36632"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2 Bold';stroke-width:0.264583">Instruction Fetch</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;stroke-width:0.264583">Instruction Fetch</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="35.18837"
+       x="68.463394"
        y="159.36632"
        id="text1245"><tspan
          sodipodi:role="line"
          id="tspan1243"
-         x="35.18837"
+         x="68.463394"
          y="159.36632"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2 Bold';stroke-width:0.264583">Decode and Execute</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans Bold';text-align:center;text-anchor:middle;stroke-width:0.264583">Decode and Execute</tspan></text>
     <g
        id="g1256"
        transform="translate(-79.323437,93.33562)"
@@ -694,13 +692,13 @@
       <text
          transform="rotate(90)"
          id="text1251"
-         y="11.063112"
-         x="68.742104"
+         y="11.084597"
+         x="115.59161"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';fill:#000000;fill-opacity:1;stroke-width:0.264583"
-           y="11.063112"
-           x="68.742104"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;fill:#000000;fill-opacity:1;stroke-width:0.264583"
+           y="11.084597"
+           x="115.59161"
            id="tspan1249"
            sodipodi:role="line">Instruction Memory Interface</tspan></text>
     </g>
@@ -718,13 +716,13 @@
          rx="1.6447315" />
       <text
          id="text1286"
-         y="51.371414"
-         x="87.249001"
+         y="51.438759"
+         x="106.57756"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
          xml:space="preserve"><tspan
-           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583"
-           y="51.371414"
-           x="87.249001"
+           style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;stroke-width:0.264583"
+           y="51.438759"
+           x="106.57756"
            id="tspan1284"
            sodipodi:role="line">Register File</tspan></text>
     </g>
@@ -1085,14 +1083,14 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="57.14064"
+       x="63.445469"
        y="242.15735"
        id="text1394"><tspan
          sodipodi:role="line"
          id="tspan1392"
-         x="57.14064"
+         x="63.445469"
          y="242.15735"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583">ALU</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;stroke-width:0.264583">ALU</tspan></text>
     <rect
        ry="1"
        rx="1"
@@ -1105,14 +1103,14 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="53.902496"
+       x="62.986069"
        y="252.99501"
        id="text1400"><tspan
          sodipodi:role="line"
          id="tspan1398"
-         x="53.902496"
+         x="62.986069"
          y="252.99501"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583">Mul/Div</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;stroke-width:0.264583">Mul/Div</tspan></text>
     <path
        inkscape:connector-curvature="0"
        id="path1305-7-6-0-7"
@@ -1190,7 +1188,7 @@
          id="tspan957-9-8-12"
          x="-91.675667"
          y="148.23085"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11667px;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583px">debug_req_i</tspan></text>
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:2.11667px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.264583px">debug_req_i</tspan></text>
     <path
        style="fill:none;stroke:#000000;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 114.21941,252.75229 v 12.95486"
@@ -1213,14 +1211,14 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="54.22427"
-       y="213.91147"
+       x="52.964939"
+       y="213.9061"
        id="text1406"><tspan
          sodipodi:role="line"
          id="tspan1404"
-         x="54.22427"
-         y="213.91147"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583">CSRs</tspan></text>
+         x="52.964939"
+         y="213.9061"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.264583">CSRs</tspan></text>
     <path
        inkscape:connector-curvature="0"
        id="path1305-7-6-0-7-9-3"
@@ -1264,14 +1262,14 @@
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="42.844845"
-       y="194.91318"
+       x="42.79118"
+       y="195.0114"
        id="text1337"><tspan
          sodipodi:role="line"
          id="tspan1335"
-         x="42.844845"
-         y="194.91318"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583">Decoder</tspan></text>
+         x="42.79118"
+         y="195.0114"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.264583">Decoder</tspan></text>
     <path
        inkscape:connector-curvature="0"
        id="path1305-7-6-0"
@@ -1346,30 +1344,30 @@
        inkscape:connector-curvature="0" />
     <text
        xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="-20.300032"
-       y="248.78493"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;letter-spacing:0px;word-spacing:0px;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
+       x="-20.243507"
+       y="250.10785"
        id="text1406-7"><tspan
          sodipodi:role="line"
          id="tspan1404-0"
-         x="-20.300032"
-         y="248.78493"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';text-align:center;text-anchor:middle;stroke-width:0.264583">Compressed</tspan><tspan
+         x="-20.243507"
+         y="250.10785"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;stroke-width:0.264583">Compressed</tspan><tspan
          sodipodi:role="line"
-         x="-20.300032"
-         y="257.61255"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';text-align:center;text-anchor:middle;stroke-width:0.264583"
-         id="tspan1320">Instr. Decoder</tspan></text>
+         x="-20.243507"
+         y="256.28146"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:4.93889px;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';text-align:center;text-anchor:middle;stroke-width:0.264583"
+         id="tspan1320">Instruction Decoder</tspan></text>
     <text
        xml:space="preserve"
        style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:7.05556px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.264583"
-       x="52.241653"
-       y="173.75357"
+       x="53.165443"
+       y="173.84474"
        id="text1337-9"><tspan
          sodipodi:role="line"
          id="tspan1335-3"
-         x="52.241653"
-         y="173.75357"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Exo 2';-inkscape-font-specification:'Exo 2, ';stroke-width:0.264583">Controller</tspan></text>
+         x="53.165443"
+         y="173.84474"
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';stroke-width:0.264583">Controller</tspan></text>
   </g>
 </svg>