diff --git a/plan-nede.svg b/plan-nede.svg
index b4a0798..75bd3a9 100644
--- a/plan-nede.svg
+++ b/plan-nede.svg
@@ -35,14 +35,14 @@
      showgrid="true"
      inkscape:lockguides="true"
      inkscape:zoom="1.3481151"
-     inkscape:cx="561.52476"
+     inkscape:cx="561.15387"
      inkscape:cy="396.85039"
      inkscape:window-width="2304"
      inkscape:window-height="1247"
      inkscape:window-x="43"
-     inkscape:window-y="193"
+     inkscape:window-y="165"
      inkscape:window-maximized="0"
-     inkscape:current-layer="svg5">
+     inkscape:current-layer="layer4">
     <inkscape:grid
        type="xygrid"
        id="grid182"
@@ -230,13 +230,12 @@
        inkscape:isstock="true"
        inkscape:label="Stripes 05 (1:4)">
       <rect
-   style="stroke:none"
-   x="0"
-   y="-0.5"
-   width="1"
-   height="2"
-   id="rect158" />
-
+         style="stroke:none"
+         x="0"
+         y="-0.5"
+         width="1"
+         height="2"
+         id="rect158" />
     </pattern>
     <rect
        x="671.43856"
@@ -786,7 +785,7 @@
      inkscape:label="grid"
      transform="matrix(0.99999885,0,0,1,0.21322914,-7.4867708)"
      id="g6092"
-     style="display:inline"
+     style="display:none"
      sodipodi:insensitive="true">
     <g
        inkscape:label="MajorXGridlines"
@@ -2401,7 +2400,7 @@
          style="font-family:'Bodoni 72';-inkscape-font-specification:'Bodoni 72, ';text-align:start;writing-mode:lr-tb;direction:ltr;white-space:pre;shape-inside:url(#rect53);display:inline;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.377953;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><tspan
            x="177.2168"
            y="338.88154"
-           id="tspan2">Seng</tspan></text>
+           id="tspan1">Seng</tspan></text>
     </g>
     <g
        id="g54"
@@ -2421,7 +2420,7 @@
          style="font-family:'Bodoni 72';-inkscape-font-specification:'Bodoni 72, ';text-align:start;writing-mode:lr-tb;direction:ltr;white-space:pre;shape-inside:url(#rect54);display:inline;opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.377953;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><tspan
            x="148.30859"
            y="83.74091"
-           id="tspan3">Skrivepult</tspan></text>
+           id="tspan2">Skrivepult</tspan></text>
     </g>
   </g>
   <g
@@ -2452,9 +2451,10 @@
     <g
        id="g60"
        inkscape:label="pipe"
-       transform="translate(0,-5.0279163)">
+       transform="translate(-82.446128,-10.250032)"
+       style="fill:none;fill-opacity:1">
       <rect
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="rect57"
          width="12.533382"
          height="12.319003"
@@ -2483,15 +2483,6 @@
        d="m 237.19317,140.615 11.43177,-9.35843 13.285,-7.81497 6.79753,8.15968 -10.21733,11.77798 -11.39652,9.32957 c 0,0 -2.54273,-0.45595 -6.40819,-5.02392 -3.86548,-4.56794 -3.49225,-7.06992 -3.49225,-7.06992 z"
        sodipodi:nodetypes="cccccczc"
        inkscape:label="lenestol" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect61"
-       width="28.22171"
-       height="19.710402"
-       x="209.1991"
-       y="90.388374"
-       ry="0"
-       inkscape:label="peis" />
   </g>
   <g
      inkscape:groupmode="layer"
@@ -2584,7 +2575,7 @@
          inkscape:label="hylle"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan4">30</tspan></text>
+           id="tspan3">30</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,109.59039,14.999548)"
@@ -2593,7 +2584,7 @@
          inkscape:label="bestikk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan6">60</tspan></text>
+           id="tspan4">60</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,125.47558,14.961361)"
@@ -2602,7 +2593,7 @@
          inkscape:label="oppvaskemaskin"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan20">60</tspan></text>
+           id="tspan5">60</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,143.23158,14.900808)"
@@ -2611,7 +2602,7 @@
          inkscape:label="vask"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan21">80</tspan></text>
+           id="tspan6">80</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,161.80484,14.575671)"
@@ -2620,7 +2611,7 @@
          inkscape:label="søppel"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan22">60</tspan></text>
+           id="tspan7">60</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0,0.26458333,-0.26458333,0,209.82445,-80.768898)"
@@ -2629,7 +2620,7 @@
          inkscape:label="dybde benk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan23">60</tspan></text>
+           id="tspan8">60</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0,0.26458333,-0.26458333,0,209.75908,-88.668815)"
@@ -2638,7 +2629,7 @@
          inkscape:label="dybde bakplan"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan24">15</tspan></text>
+           id="tspan9">15</tspan></text>
     </g>
     <g
        id="g40"
@@ -2646,58 +2637,40 @@
        transform="translate(0,-5.0279163)">
       <text
          xml:space="preserve"
-         transform="matrix(0.26458333,0,0,0.26458333,76.423862,53.71596)"
+         transform="matrix(0.26458333,0,0,0.26458333,91.911201,53.84833)"
          id="text4860-3-1-8-2-1"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;white-space:pre;shape-inside:url(#rect4862-0-5-7-04-3);display:inline;fill:none;stroke:#000000;stroke-width:1.13386;stroke-dasharray:none;stroke-opacity:1"
          inkscape:label="høgskap"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan25">60</tspan></text>
+           id="tspan10">60</tspan></text>
       <text
          xml:space="preserve"
-         transform="matrix(0.26458333,0,0,0.26458333,62.591969,53.770535)"
-         id="text4860-3-1-8-2-7"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;white-space:pre;shape-inside:url(#rect4862-0-5-7-04-8);display:inline;fill:none;stroke:#000000;stroke-width:1.13386;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:label="kaffestasjon"><tspan
-           x="374.72852"
-           y="69.305558"
-           id="tspan26">45</tspan></text>
-      <text
-         xml:space="preserve"
-         transform="matrix(0,0.26458333,-0.26458333,0,171.84911,-19.762148)"
-         id="text4860-3-1-8-0-2"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;white-space:pre;shape-inside:url(#rect4862-0-5-7-5-7);display:inline;fill:none;stroke:#000000;stroke-width:1.13386;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:label="dybde benk"><tspan
-           x="374.72852"
-           y="69.305558"
-           id="tspan27">60</tspan></text>
-      <text
-         xml:space="preserve"
-         transform="matrix(0.26458333,0,0,0.26458333,94.272404,53.976263)"
+         transform="matrix(0.26458333,0,0,0.26458333,105.921,53.976263)"
          id="text4860-3-1-8-2-4"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;white-space:pre;shape-inside:url(#rect4862-0-5-7-04-4);display:inline;fill:none;stroke:#000000;stroke-width:1.13386;stroke-dasharray:none;stroke-opacity:1"
          inkscape:label="kjøleskap"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan28">90</tspan></text>
+           id="tspan11">60</tspan></text>
       <text
          xml:space="preserve"
-         transform="matrix(0.26458333,0,0,0.26458333,136.65509,54.428461)"
+         transform="matrix(0.26458333,0,0,0.26458333,141.68517,54.16372)"
          id="text4860-3-1-8-2-4-5"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;white-space:pre;shape-inside:url(#rect4862-0-5-7-04-4-1);display:inline;fill:none;stroke:#000000;stroke-width:1.13386;stroke-dasharray:none;stroke-opacity:1"
          inkscape:label="komfyr"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan29">90</tspan></text>
+           id="tspan12">60</tspan></text>
       <text
          xml:space="preserve"
-         transform="matrix(0.26458333,0,0,0.26458333,114.54113,54.176452)"
+         transform="matrix(0.26458333,0,0,0.26458333,123.40995,54.308822)"
          id="text4860-3-1-8-2-4-55"
          style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:10.6667px;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal;white-space:pre;shape-inside:url(#rect4862-0-5-7-04-4-9);display:inline;fill:none;stroke:#000000;stroke-width:1.13386;stroke-dasharray:none;stroke-opacity:1"
          inkscape:label="arbeidsbenk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan30">80</tspan></text>
+           id="tspan13">60</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,159.1324,54.803719)"
@@ -2706,7 +2679,7 @@
          inkscape:label="arbeidsbenk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan31">80</tspan></text>
+           id="tspan14">60</tspan></text>
     </g>
     <g
        id="g41"
@@ -2719,7 +2692,7 @@
          inkscape:label="bredde"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan32">75</tspan></text>
+           id="tspan15">75</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,43.38348,31.108664)"
@@ -2728,7 +2701,7 @@
          inkscape:label="arbeidsbenk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan33">270</tspan></text>
+           id="tspan16">270</tspan></text>
     </g>
     <g
        id="g43"
@@ -2746,7 +2719,7 @@
          style="font-family:'Bodoni 72';-inkscape-font-specification:'Bodoni 72, ';text-align:start;writing-mode:lr-tb;direction:ltr;white-space:pre;shape-inside:url(#rect43);display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.188976;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"><tspan
            x="418.12109"
            y="655.32099"
-           id="tspan34">Til kjeller</tspan></text>
+           id="tspan17">Til kjeller</tspan></text>
     </g>
     <path
        style="display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.3;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker-end:url(#marker43-5)"
@@ -2771,7 +2744,7 @@
          inkscape:label="dybde benk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan35">90</tspan></text>
+           id="tspan18">90</tspan></text>
     </g>
     <g
        id="g45-0"
@@ -2792,7 +2765,7 @@
          inkscape:label="dybde benk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan36">90</tspan></text>
+           id="tspan19">90</tspan></text>
     </g>
   </g>
   <g
@@ -2806,19 +2779,19 @@
        transform="matrix(-7.2381079e-5,0.26458332,-0.26458332,-7.2381079e-5,371.64208,-139.45403)"><tspan
          x="714.40234"
          y="401.79384"
-         id="tspan39">Plan, første etasje, sett fra oven
+         id="tspan20">Plan, første etasje, sett fra oven
 </tspan><tspan
          x="714.40234"
          y="415.12721"
-         id="tspan40">Forslag
+         id="tspan21">Forslag
 </tspan><tspan
          x="714.40234"
          y="428.46059"
-         id="tspan41">1:40
+         id="tspan22">1:40
 </tspan><tspan
          x="714.40234"
          y="441.79396"
-         id="tspan42">Alle mål ±10cm</tspan></text>
+         id="tspan23">Alle mål ±10cm</tspan></text>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -2836,7 +2809,7 @@
          inkscape:label="0"><tspan
            x="90.501953"
            y="68.815323"
-           id="tspan43">0</tspan></text>
+           id="tspan24">0</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.24552462,-7.2338083)"
@@ -2845,7 +2818,7 @@
          inkscape:label="1"><tspan
            x="184.91797"
            y="68.327042"
-           id="tspan44">1</tspan></text>
+           id="tspan25">1</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.2635806,-7.719942)"
@@ -2854,7 +2827,7 @@
          inkscape:label="2"><tspan
            x="279.33398"
            y="70.28212"
-           id="tspan45">2</tspan></text>
+           id="tspan26">2</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.13718871,-7.4079395)"
@@ -2863,7 +2836,7 @@
          inkscape:label="3"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan46">3</tspan></text>
+           id="tspan27">3</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.28163659,-7.6635225)"
@@ -2872,7 +2845,7 @@
          inkscape:label="4"><tspan
            x="468.16602"
            y="69.793839"
-           id="tspan47">4</tspan></text>
+           id="tspan28">4</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.11913272,-7.7390932)"
@@ -2881,7 +2854,7 @@
          inkscape:label="5"><tspan
            x="563.56055"
            y="70.28212"
-           id="tspan48">5</tspan></text>
+           id="tspan29">5</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.42608447,-7.7566016)"
@@ -2890,7 +2863,7 @@
          inkscape:label="6"><tspan
            x="656.99805"
            y="70.28212"
-           id="tspan49">6</tspan></text>
+           id="tspan30">6</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.47908577,-7.8501974)"
@@ -2899,7 +2872,7 @@
          inkscape:label="7"><tspan
            x="750.92578"
            y="70.772355"
-           id="tspan50">7</tspan></text>
+           id="tspan31">7</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.96776404,-7.5010186)"
@@ -2908,7 +2881,7 @@
          inkscape:label="8"><tspan
            x="843.875"
            y="69.793839"
-           id="tspan51">8</tspan></text>
+           id="tspan32">8</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,25.973408,-7.5166784)"
@@ -2917,7 +2890,7 @@
          inkscape:label="9"><tspan
            x="843.875"
            y="69.793839"
-           id="tspan52">9</tspan></text>
+           id="tspan33">9</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,50.244408,-7.475023)"
@@ -2926,7 +2899,7 @@
          inkscape:label="10"><tspan
            x="843.875"
            y="69.793839"
-           id="tspan53">10</tspan></text>
+           id="tspan34">10</tspan></text>
     </g>
     <g
        id="g7-8"
@@ -2940,7 +2913,7 @@
          inkscape:label="0"><tspan
            x="90.501953"
            y="68.815323"
-           id="tspan54">0</tspan></text>
+           id="tspan35">0</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-155.61958,15.598245)"
@@ -2949,7 +2922,7 @@
          inkscape:label="1"><tspan
            x="184.91797"
            y="68.327042"
-           id="tspan55">1</tspan></text>
+           id="tspan36">1</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-180.52607,40.220514)"
@@ -2958,7 +2931,7 @@
          inkscape:label="2"><tspan
            x="279.33398"
            y="70.28212"
-           id="tspan56">2</tspan></text>
+           id="tspan37">2</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-205.76587,65.382472)"
@@ -2967,7 +2940,7 @@
          inkscape:label="3"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan57">3</tspan></text>
+           id="tspan38">3</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-230.49339,89.971179)"
@@ -2976,7 +2949,7 @@
          inkscape:label="4"><tspan
            x="468.16602"
            y="69.793839"
-           id="tspan58">4</tspan></text>
+           id="tspan39">4</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-255.75386,114.94984)"
@@ -2985,7 +2958,7 @@
          inkscape:label="5"><tspan
            x="563.56055"
            y="70.28212"
-           id="tspan59">5</tspan></text>
+           id="tspan40">5</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-280.49723,140.08183)"
@@ -2994,7 +2967,7 @@
          inkscape:label="6"><tspan
            x="656.99805"
            y="70.28212"
-           id="tspan60">6</tspan></text>
+           id="tspan41">6</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-305.33516,164.6831)"
@@ -3003,7 +2976,7 @@
          inkscape:label="7"><tspan
            x="750.92578"
            y="70.772355"
-           id="tspan61">7</tspan></text>
+           id="tspan42">7</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-329.91971,189.86418)"
@@ -3012,7 +2985,7 @@
          inkscape:label="8"><tspan
            x="843.875"
            y="69.793839"
-           id="tspan62">8</tspan></text>
+           id="tspan43">8</tspan></text>
     </g>
   </g>
   <metadata
@@ -3036,25 +3009,6 @@
      id="layer4"
      inkscape:label="kjøkken"
      style="display:inline">
-    <g
-       id="g35"
-       inkscape:label="kaffestasjon"
-       transform="translate(0,-5.0279163)">
-      <path
-         id="rect34"
-         style="fill:#d1f5bd;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2"
-         d="m 168.97018,75.097855 v 14.767716 h -11.44786 v -3.319856 a 11.44786,11.44786 135 0 1 11.44786,-11.44786 z"
-         inkscape:path-effect="#path-effect34"
-         inkscape:original-d="m 157.52232,75.097855 h 11.44786 v 14.767716 h -11.44786 z"
-         inkscape:label="kaffetrakter" />
-      <use
-         xlink:href="#sjjb-food.svg:cafe"
-         width="469.78888"
-         height="356.46317"
-         style="fill:#000000;stroke:none"
-         id="use1-2"
-         transform="matrix(0.01070345,0,0,0.01070345,162.69786,82.514991)" />
-    </g>
     <rect
        style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.198906;stroke-dasharray:0.198906, 0.198906;stroke-dashoffset:0"
        id="rect21"
@@ -3113,35 +3067,27 @@
        inkscape:original-d="m 178.0163,17.791393 h 7.65251 v 15.282268 h -7.65251 z"
        transform="translate(17.802768,-4.4809689)"
        inkscape:label="hyller" />
-    <rect
-       style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
-       id="rect28"
-       width="19.740484"
-       height="14.775086"
-       x="249.28032"
-       y="70.051964"
-       ry="0"
-       inkscape:label="skuffer/arbeidsbenk" />
     <rect
        style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
        id="rect28-6"
-       width="19.740484"
+       width="14.842779"
        height="14.775086"
-       x="206.65758"
-       y="70.091957"
+       x="222.88333"
+       y="70.224327"
        ry="0"
        inkscape:label="skuffer/arbeidsbenk" />
     <g
        id="g30"
        inkscape:label="komfyr"
-       transform="translate(1.3737412,-5.0279163)">
+       transform="translate(12.887412,-4.7631755)">
       <rect
-         style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
+         style="display:inline;fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
          id="rect29"
-         width="22.525948"
+         width="15.113204"
          height="14.775089"
-         x="225.1384"
-         y="75.08651" />
+         x="234.18707"
+         y="70.058594"
+         transform="translate(-9.0486691,5.0279163)" />
       <circle
          style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
          id="path29"
@@ -3154,12 +3100,6 @@
          cx="236.65492"
          cy="78.882156"
          r="2.4826989" />
-      <circle
-         style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
-         id="path29-7"
-         cx="243.892"
-         cy="78.882156"
-         r="2.4826989" />
       <circle
          style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
          id="path29-2"
@@ -3172,13 +3112,16 @@
          cx="236.45361"
          cy="86.121246"
          r="2.4826989" />
-      <circle
-         style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
-         id="path29-21"
-         cx="243.80252"
-         cy="86.121246"
-         r="2.4826989" />
     </g>
+    <rect
+       style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.172196;stroke-dasharray:0.172196, 0.172196;stroke-dashoffset:0"
+       id="rect28"
+       width="14.605842"
+       height="14.802891"
+       x="253.36992"
+       y="70.170433"
+       ry="0"
+       inkscape:label="skuffer/arbeidsbenk" />
     <g
        id="g31"
        inkscape:label="søppel"
@@ -3219,7 +3162,7 @@
     <g
        id="g33"
        inkscape:label="kjøleskap"
-       transform="translate(1.3737412,-5.0279163)">
+       transform="matrix(0.65560144,0,0,1.002562,88.141388,-5.1600943)">
       <rect
          style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
          id="rect30"
@@ -3248,15 +3191,15 @@
          transform="matrix(0.26458333,0,0,0.26458333,-1.3737412,0)"><tspan
            x="704.90234"
            y="326.67646"
-           id="tspan64"><tspan
+           id="tspan45"><tspan
              style="fill:#000000"
-             id="tspan63">Kjøleskap</tspan></tspan></text>
+             id="tspan44">Kjøleskap</tspan></tspan></text>
     </g>
     <g
        id="g38"
        inkscape:label="høgskåp"
        style="display:inline"
-       transform="translate(0,-5.0279163)">
+       transform="translate(23.79419,-4.9487934)">
       <rect
          style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
          id="rect33"
@@ -3272,11 +3215,11 @@
          style="font-family:'Bodoni 72';-inkscape-font-specification:'Bodoni 72, ';text-align:start;writing-mode:lr-tb;direction:ltr;white-space:pre;shape-inside:url(#rect37);display:inline;fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:0.377953;stroke-dasharray:none;stroke-dashoffset:0"><tspan
            x="645.39648"
            y="319.35419"
-           id="tspan65">Høgskap
+           id="tspan46">Høgskap
 </tspan><tspan
            x="645.39648"
            y="334.35419"
-           id="tspan66">mikrobølge</tspan></text>
+           id="tspan47">mikrobølge</tspan></text>
     </g>
     <rect
        style="fill:#d1f5bd;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:0.2, 0.2;stroke-dashoffset:0"
@@ -3286,5 +3229,19 @@
        x="116.6263"
        y="24.463669"
        inkscape:label="kjøkkenbord" />
+    <rect
+       style="fill:#cbcbcb;fill-opacity:1;stroke:#000000;stroke-width:0.15664"
+       id="rect2"
+       width="12.58435"
+       height="12.623909"
+       x="169.68517"
+       y="84.818291" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:0.2"
+       id="rect3"
+       width="4.1143942"
+       height="29.908478"
+       x="188.34258"
+       y="67.968117" />
   </g>
 </svg>
diff --git a/plan-oppe.svg b/plan-oppe.svg
index fc289bc..df61f07 100644
--- a/plan-oppe.svg
+++ b/plan-oppe.svg
@@ -33,14 +33,14 @@
      showgrid="true"
      inkscape:lockguides="true"
      inkscape:zoom="1.3317361"
-     inkscape:cx="560.92194"
-     inkscape:cy="396.85039"
+     inkscape:cx="560.54649"
+     inkscape:cy="396.8504"
      inkscape:window-width="2240"
      inkscape:window-height="1234"
-     inkscape:window-x="-122"
-     inkscape:window-y="116"
+     inkscape:window-x="0"
+     inkscape:window-y="88"
      inkscape:window-maximized="0"
-     inkscape:current-layer="g6092">
+     inkscape:current-layer="layer5">
     <inkscape:grid
        type="xygrid"
        id="grid182"
@@ -2220,7 +2220,7 @@
        id="path14"
        inkscape:label="yttervegger" />
     <rect
-       style="fill:#dadada;fill-opacity:1;stroke:#000000;stroke-width:0.19585;stroke-dasharray:none"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.19585;stroke-dasharray:none"
        id="rect9"
        width="115.02524"
        height="5.1585441"
@@ -2253,7 +2253,7 @@
        ry="0"
        inkscape:label="vindu vest soverom vest" />
     <rect
-       style="fill:#d9d9d9;fill-opacity:1;stroke:#000000;stroke-width:0.200691;stroke-dasharray:none"
+       style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.200691;stroke-dasharray:none"
        id="rect15"
        width="67.695671"
        height="5.0080996"
@@ -2370,7 +2370,7 @@
     <g
        id="g50"
        inkscape:label="wc"
-       transform="translate(1.3578438,-0.67892191)">
+       transform="translate(1.3578438,-4.8511074)">
       <ellipse
          style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.2;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path47"
@@ -2395,7 +2395,8 @@
     </g>
     <g
        id="g52"
-       inkscape:label="vask">
+       inkscape:label="vask"
+       transform="translate(0,-2.384106)">
       <rect
          style="opacity:1;fill:#bee8fa;fill-opacity:0.871835;fill-rule:nonzero;stroke:#000000;stroke-width:0.181114;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="rect51"
@@ -2467,7 +2468,7 @@
          inkscape:label="dybde benk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan7">90</tspan></text>
+           id="tspan1">90</tspan></text>
     </g>
     <g
        id="g45-0"
@@ -2488,7 +2489,7 @@
          inkscape:label="dybde benk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan8">90</tspan></text>
+           id="tspan2">90</tspan></text>
     </g>
     <g
        id="g45-0-9"
@@ -2509,7 +2510,7 @@
          inkscape:label="dybde benk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan9">90</tspan></text>
+           id="tspan3">90</tspan></text>
     </g>
     <g
        id="g45-0-9-8"
@@ -2530,7 +2531,7 @@
          inkscape:label="dybde benk"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan10">90</tspan></text>
+           id="tspan4">90</tspan></text>
     </g>
   </g>
   <g
@@ -2544,19 +2545,19 @@
        transform="matrix(-7.2381079e-5,0.26458332,-0.26458332,-7.2381079e-5,371.64208,-139.45403)"><tspan
          x="714.40234"
          y="401.79384"
-         id="tspan11">Plan, andre etasje, sett fra oven
+         id="tspan5">Plan, andre etasje, sett fra oven
 </tspan><tspan
          x="714.40234"
          y="415.12721"
-         id="tspan12">Forslag
+         id="tspan6">Forslag
 </tspan><tspan
          x="714.40234"
          y="428.46059"
-         id="tspan13">1:40
+         id="tspan7">1:40
 </tspan><tspan
          x="714.40234"
          y="441.79396"
-         id="tspan14">Alle mål ±10cm</tspan></text>
+         id="tspan8">Alle mål ±10cm</tspan></text>
   </g>
   <g
      inkscape:groupmode="layer"
@@ -2574,7 +2575,7 @@
          inkscape:label="0"><tspan
            x="90.501953"
            y="68.815323"
-           id="tspan15">0</tspan></text>
+           id="tspan9">0</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.24552462,-7.2338083)"
@@ -2583,7 +2584,7 @@
          inkscape:label="1"><tspan
            x="184.91797"
            y="68.327042"
-           id="tspan16">1</tspan></text>
+           id="tspan10">1</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.2635806,-7.719942)"
@@ -2592,7 +2593,7 @@
          inkscape:label="2"><tspan
            x="279.33398"
            y="70.28212"
-           id="tspan17">2</tspan></text>
+           id="tspan11">2</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.13718871,-7.4079395)"
@@ -2601,7 +2602,7 @@
          inkscape:label="3"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan18">3</tspan></text>
+           id="tspan12">3</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.28163659,-7.6635225)"
@@ -2610,7 +2611,7 @@
          inkscape:label="4"><tspan
            x="468.16602"
            y="69.793839"
-           id="tspan19">4</tspan></text>
+           id="tspan13">4</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.11913272,-7.7390932)"
@@ -2619,7 +2620,7 @@
          inkscape:label="5"><tspan
            x="563.56055"
            y="70.28212"
-           id="tspan20">5</tspan></text>
+           id="tspan14">5</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.42608447,-7.7566016)"
@@ -2628,7 +2629,7 @@
          inkscape:label="6"><tspan
            x="656.99805"
            y="70.28212"
-           id="tspan21">6</tspan></text>
+           id="tspan15">6</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.47908577,-7.8501974)"
@@ -2637,7 +2638,7 @@
          inkscape:label="7"><tspan
            x="750.92578"
            y="70.772355"
-           id="tspan22">7</tspan></text>
+           id="tspan16">7</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,0.96776404,-7.5010186)"
@@ -2646,7 +2647,7 @@
          inkscape:label="8"><tspan
            x="843.875"
            y="69.793839"
-           id="tspan23">8</tspan></text>
+           id="tspan17">8</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,25.973408,-7.5166784)"
@@ -2655,7 +2656,7 @@
          inkscape:label="9"><tspan
            x="843.875"
            y="69.793839"
-           id="tspan24">9</tspan></text>
+           id="tspan18">9</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,50.244408,-7.475023)"
@@ -2664,7 +2665,7 @@
          inkscape:label="10"><tspan
            x="843.875"
            y="69.793839"
-           id="tspan25">10</tspan></text>
+           id="tspan19">10</tspan></text>
     </g>
     <g
        id="g7-8"
@@ -2678,7 +2679,7 @@
          inkscape:label="0"><tspan
            x="90.501953"
            y="68.815323"
-           id="tspan26">0</tspan></text>
+           id="tspan20">0</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-155.61958,15.598245)"
@@ -2687,7 +2688,7 @@
          inkscape:label="1"><tspan
            x="184.91797"
            y="68.327042"
-           id="tspan27">1</tspan></text>
+           id="tspan21">1</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-180.52607,40.220514)"
@@ -2696,7 +2697,7 @@
          inkscape:label="2"><tspan
            x="279.33398"
            y="70.28212"
-           id="tspan28">2</tspan></text>
+           id="tspan22">2</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-205.76587,65.382472)"
@@ -2705,7 +2706,7 @@
          inkscape:label="3"><tspan
            x="374.72852"
            y="69.305558"
-           id="tspan29">3</tspan></text>
+           id="tspan23">3</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-230.49339,89.971179)"
@@ -2714,7 +2715,7 @@
          inkscape:label="4"><tspan
            x="468.16602"
            y="69.793839"
-           id="tspan30">4</tspan></text>
+           id="tspan24">4</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-255.75386,114.94984)"
@@ -2723,7 +2724,7 @@
          inkscape:label="5"><tspan
            x="563.56055"
            y="70.28212"
-           id="tspan31">5</tspan></text>
+           id="tspan25">5</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-280.49723,140.08183)"
@@ -2732,7 +2733,7 @@
          inkscape:label="6"><tspan
            x="656.99805"
            y="70.28212"
-           id="tspan32">6</tspan></text>
+           id="tspan26">6</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-305.33516,164.6831)"
@@ -2741,7 +2742,7 @@
          inkscape:label="7"><tspan
            x="750.92578"
            y="70.772355"
-           id="tspan33">7</tspan></text>
+           id="tspan27">7</tspan></text>
       <text
          xml:space="preserve"
          transform="matrix(0.26458333,0,0,0.26458333,-329.91971,189.86418)"
@@ -2750,7 +2751,7 @@
          inkscape:label="8"><tspan
            x="843.875"
            y="69.793839"
-           id="tspan34">8</tspan></text>
+           id="tspan28">8</tspan></text>
     </g>
   </g>
   <metadata
diff --git a/vegg-dele.svg b/vegg-dele.svg
index be61ecd..fa53bcf 100644
--- a/vegg-dele.svg
+++ b/vegg-dele.svg
@@ -41,7 +41,7 @@
      inkscape:window-x="269"
      inkscape:window-y="32"
      inkscape:window-maximized="0"
-     inkscape:current-layer="svg5">
+     inkscape:current-layer="layer2">
     <inkscape:grid
        type="xygrid"
        id="grid182"
@@ -2420,7 +2420,7 @@
          transform="matrix(0.26458333,0,0,0.26458333,40.300032,0)"><tspan
            x="197.74023"
            y="355.03993"
-           id="tspan3">320</tspan></text>
+           id="tspan3">330</tspan></text>
       <path
          style="display:inline;fill:none;stroke:#000000;stroke-width:0.323119;stroke-dasharray:0.323119, 0.323119;stroke-dashoffset:0;stroke-opacity:1;marker-start:url(#Stop-8);marker-end:url(#marker6760-4)"
          d="m 54.999883,90.134447 82.501777,0.02242"