diff --git a/pinaxcon/templates/registrasion/badge.svg b/pinaxcon/templates/registrasion/badge.svg
index 499ac6dbadf37296911a9ada27f4fdcbaa923af6..941a414c07e6988ac5f42596b575fedbcdb8d50e 100644
--- a/pinaxcon/templates/registrasion/badge.svg
+++ b/pinaxcon/templates/registrasion/badge.svg
@@ -1,158 +1,14 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
+{% spaceless %}
 
-<!--
-{% load registrasion_tags %}
-{% items_purchased as purchased %}
-{% items_pending as pending %}
-{% items_purchased 1 as ticket %}
-{% total_items_purchased 2 as dinner_count %}
-{% total_items_purchased 4 as breakfast_count %}
--->
+{% load nbpy_tags %}
+{% name_split user.attendee.attendeeprofilebase.attendeeprofile.name as split_name %}
+{% ticket_type as ticket %}
+{% affiliation ticket user as aff %}
+{% company_split aff as split_affiliation %}
+{% special user as special %}
 
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="176.50401mm"
-   height="175.11671mm"
-   viewBox="0 0 625.40792 620.49229"
-   id="svg4599"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="badge.svg">
-  <defs
-     id="defs4601" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.93566975"
-     inkscape:cx="334.04214"
-     inkscape:cy="336.65369"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     fit-margin-top="20"
-     fit-margin-left="20"
-     fit-margin-right="20"
-     fit-margin-bottom="20"
-     inkscape:window-width="1440"
-     inkscape:window-height="801"
-     inkscape:window-x="0"
-     inkscape:window-y="1"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata4604">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(41.973876,21.941793)">
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:24px;line-height:125%;font-family:Gotham;-inkscape-font-specification:Gotham;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="28.572266"
-       y="77.124352"
-       id="text4146"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="77.124352"
-         id="tspan4148"
-         style="font-size:30px"><tspan
-           x="28.572266"
-           y="77.124352"
-           style="font-size:30px"
-           id="tspan4150"
-           dx="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 26.71875">{{ user.attendee.attendeeprofilebase.attendeeprofile.name }}</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="114.62435"
-         id="tspan4154"
-         style="font-size:30px">{{ user.attendee.attendeeprofilebase.attendeeprofile.company }}</tspan><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="152.12436"
-         id="tspan4160"
-         style="font-size:30px" /><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="189.62436"
-         id="tspan4164"
-         style="font-size:30px">{{ user.attendee.attendeeprofilebase.attendeeprofile.free_text_1 }}</tspan><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="227.12436"
-         id="tspan4170"
-         style="font-size:30px">{{ user.attendee.attendeeprofilebase.attendeeprofile.free_text_2 }}</tspan><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="264.62436"
-         id="tspan4176"
-         style="font-size:30px" /><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="302.12436"
-         id="tspan4180"
-         style="font-size:30px"><tspan
-           x="28.572266"
-           style="font-size:30px"
-           id="tspan4182"
-           dx="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 21.640625">{% if user.attendee.attendeeprofilebase.attendeeprofile.of_legal_age %}18+?{% else %}MINOR{% endif %}</tspan></tspan><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="339.62436"
-         id="tspan4186"
-         style="font-size:30px" /><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="377.12436"
-         id="tspan4190"
-         style="font-size:30px">DINNER: {{ dinner_count }}</tspan><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="414.62436"
-         id="tspan4161"
-         style="font-size:30px">BREAKFAST: {{ breakfast_count }}</tspan><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="452.12436"
-         style="font-size:30px"
-         id="tspan4184" /><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="489.62436"
-         style="font-size:30px"
-         id="tspan4187">TICKET: {% for ticket in ticket %}{{ ticket.product.name }}{% endfor %}</tspan><tspan
-         sodipodi:role="line"
-         x="28.572266"
-         y="527.12433"
-         id="tspan4196"
-         style="font-size:30px" /></text>
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:2.4745636;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="rect4182"
-       width="623.97272"
-       height="617.53876"
-       x="-40.736595"
-       y="-20.704514" />
-  </g>
-</svg>
+{% with name1=split_name.first name2=split_name.last affiliation1=split_affiliation.first affiliation2=split_affiliation.last %}
+  {% include "registrasion/badge_outer.svg" %}
+{% endwith %}
+
+{% endspaceless %}