diff --git a/wortschlucker/templates/layout.html b/wortschlucker/templates/layout.html
index ca5d89c..85806d4 100644
--- a/wortschlucker/templates/layout.html
+++ b/wortschlucker/templates/layout.html
@@ -40,11 +40,14 @@
 <!-- end #header -->
 <!-- end #header-wrapper -->
 <div id="logo">
-	<a href="${base_url}">
-	<img src="${base_url}media/logo.gif" width="201" height="79" alt="WortSchlucker logo" />
-	<h1>Wortschlucker</h1>
-	</a>
-	<p><em> template design by <a href="http://www.freecsstemplates.org/">Free CSS Templates</a></em></p>
+	<div id="logo-image">
+		<a href="${base_url}">
+		<img src="${base_url}media/images/logo.png" width="67" height="96" alt="WortSchlucker logo" /></a>
+	</div>
+	<div id="logo-text">
+		<a href="${base_url}"><h1>Wortschlucker</h1></a>
+		<p><em> nomnomnom</em></p>
+	</div>
 </div>
 <hr />
 <!-- end #logo -->
diff --git a/wortschlucker/templates/media/images/logo.png b/wortschlucker/templates/media/images/logo.png
new file mode 100644
index 0000000..afc364c
Binary files /dev/null and b/wortschlucker/templates/media/images/logo.png differ
diff --git a/wortschlucker/templates/media/images/wortschlucker-logo.svg b/wortschlucker/templates/media/images/wortschlucker-logo.svg
new file mode 100644
index 0000000..dda827a
--- /dev/null
+++ b/wortschlucker/templates/media/images/wortschlucker-logo.svg
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   id="svg9024"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="wortschlucker-logo.svg"
+   inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/logo.png"
+   inkscape:export-xdpi="4.4099998"
+   inkscape:export-ydpi="4.4099998">
+  <defs
+     id="defs9026">
+    <linearGradient
+       id="linearGradient9589">
+      <stop
+         style="stop-color:#ff0303;stop-opacity:1;"
+         offset="0"
+         id="stop9591" />
+      <stop
+         style="stop-color:#650000;stop-opacity:1;"
+         offset="1"
+         id="stop9593" />
+    </linearGradient>
+    <inkscape:path-effect
+       effect="spiro"
+       id="path-effect9587"
+       is_visible="true" />
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective9032" />
+    <inkscape:perspective
+       id="perspective9790"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.35"
+     inkscape:cx="-480.75179"
+     inkscape:cy="738.63564"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1276"
+     inkscape:window-height="976"
+     inkscape:window-x="21"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata9029">
+    <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></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Ebene 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       sodipodi:type="arc"
+       style="fill:#de9606;fill-opacity:1;stroke:none"
+       id="path9684"
+       sodipodi:cx="376.7869"
+       sodipodi:cy="951.34692"
+       sodipodi:rx="314.15744"
+       sodipodi:ry="44.446712"
+       d="m 690.94434,951.34692 a 314.15744,44.446712 0 1 1 -628.314884,0 314.15744,44.446712 0 1 1 628.314884,0 z"
+       transform="matrix(1,0,0,1.25,3.0304576,-247.245)"
+       inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/logo.png"
+       inkscape:export-xdpi="9.4300585"
+       inkscape:export-ydpi="9.4300585" />
+    <path
+       sodipodi:nodetypes="ccssccc"
+       d="m 386.44957,214.16607 c -1.81633,-3.25605 -4.12254,-6.82765 -5.44888,-9.76811 -19.24156,-57.28546 1.01207,-82.04701 28.41119,-114.447666 11.68159,-13.814 25.89152,-9.747952 30.94106,2.54257 7.22242,17.579286 5.99624,14.176776 4.22847,14.176776 -48.85595,8.70056 -53.02426,53.14935 -58.13194,107.49642 l 10e-5,1e-5 z"
+       id="path9575"
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/logo.png"
+       inkscape:export-xdpi="9.4300585"
+       inkscape:export-ydpi="9.4300585" />
+    <g
+       id="g9601"
+       transform="translate(48.571425,171.42857)"
+       inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/logo.png"
+       inkscape:export-xdpi="9.4300585"
+       inkscape:export-ydpi="9.4300585">
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;stroke:#333333;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         id="path9597"
+         sodipodi:cx="-461.63971"
+         sodipodi:cy="263.43304"
+         sodipodi:rx="51.51778"
+         sodipodi:ry="51.51778"
+         d="m -410.12193,263.43304 c 0,28.45249 -23.0653,51.51778 -51.51778,51.51778 -28.45248,0 -51.51778,-23.06529 -51.51778,-51.51778 0,-28.45248 23.0653,-51.51778 51.51778,-51.51778 28.45248,0 51.51778,23.0653 51.51778,51.51778 z"
+         transform="translate(848.53535,-218.4801)" />
+      <path
+         transform="matrix(-0.4288055,0,0,0.6634282,186.07869,-129.25397)"
+         d="m -410.12193,263.43304 a 51.51778,51.51778 0 1 1 -103.03556,0 51.51778,51.51778 0 1 1 103.03556,0 z"
+         sodipodi:ry="51.51778"
+         sodipodi:rx="51.51778"
+         sodipodi:cy="263.43304"
+         sodipodi:cx="-461.63971"
+         id="path9599"
+         style="fill:#000000;stroke:none"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="fill:#d40000;fill-opacity:1;stroke:#333333;stroke-width:10;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       d="m 515.8876,286.22947 c -71.61022,43.50436 -247.94955,48.54703 -245.87528,131.00505 1.53449,61.00001 90.57037,220.44199 144.2734,249.41338 21.41771,11.5543 180.55163,-26.11334 199.82668,-91.45831 -33.13595,2.87851 -145.14658,-6.38599 -162.68383,-97.11312 -26.59888,-137.60648 48.10601,-168.20907 64.45903,-191.847 z"
+       id="path9581"
+       sodipodi:nodetypes="csscsc"
+       inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/logo.png"
+       inkscape:export-xdpi="9.4300585"
+       inkscape:export-ydpi="9.4300585" />
+    <path
+       style="fill:#800000;stroke:none"
+       d="m 325,464.38248 c 3.57143,70.38292 48.41956,100.70044 81.42857,104.3299 53.08154,5.83651 66.41527,-21.72846 128.27555,46.82411 -52.85714,22.54787 -96.78543,10.35049 -140.2005,-10.80992 C 351.92646,583.97454 334.07906,533.18669 325,464.38248 z"
+       id="path9680"
+       sodipodi:nodetypes="cscsc"
+       inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/logo.png"
+       inkscape:export-xdpi="9.4300585"
+       inkscape:export-ydpi="9.4300585" />
+    <path
+       style="fill:#333333;stroke:none"
+       d="m 301.64033,852.85749 c -4.77196,23.81228 -19.31545,70.90863 -2.14286,88.08122 10.77496,10.77496 49.32657,8.75466 60.10153,-2.0203 17.50931,-17.50931 -18.51947,-62.83732 -1.01016,-80.34664 15.489,-15.489 41.13391,-15.489 56.62291,0 18.18275,18.18275 -18.18275,58.96012 0,77.14286 15.48901,15.48901 45.93957,15.48901 61.42858,0 18.85618,-18.85618 -1.58743,-62.12402 -5,-88.57143 -5.71429,-44.28571 -47.56495,-99.53113 -27.85715,-106.42857 8.86741,-3.10347 15.67028,-2.4472 25.45788,7.3718 6.16542,6.1852 7.35719,25.16891 14.28571,30.48535 17.47754,13.41099 54.76903,-18.29069 45.33826,-43.4621 -7.96704,-21.26463 -29.74375,-10.92276 -44.7069,-13.71778 -22.53779,-4.20991 -46.10297,6.24294 -46.10297,-27.0921 0,-37.38212 156.97065,-24.48346 178.88975,-117.77808 -20.91737,20.82831 -32.6901,26.4989 -40.38592,31.44535 -21.35594,13.72643 -79.96571,29.11942 -120.19737,24.13305 -30.84203,-3.82261 -86.06201,-17.708 -109.59901,-66.71062 C 309.11318,487.00563 325.15345,421.13025 358.70242,371.13666 407.13614,298.9623 589.54454,315.00248 496.90496,259.67325 360.61914,141.9817 263.11378,242.51502 239.48225,268.47358 c -25.49353,28.00391 -46.43376,69.42337 -57.57128,144.8475 -11.89464,80.55141 19.97715,200.18736 85.44629,239.99181 47.10601,28.63988 93.43107,22.69212 67.84147,49.31992 -19.64459,20.44159 -19.49641,14.24201 -45.58532,19.57377 -21.02304,4.29645 -25.19226,-10.72368 -40.75074,4.05339 -20.11286,19.10271 5.09745,50.33408 21.47557,51.25832 24.53724,1.38466 20.36859,-8.90941 34.68797,-25.89208 10.38684,-12.31871 20.59528,-18.11462 25.80242,-10.17805 22.42214,34.17519 -21.06542,70.87579 -29.1883,111.40933 z"
+       id="path9034"
+       sodipodi:nodetypes="cssssssssssssscsssscssssssssss"
+       inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/logo.png"
+       inkscape:export-xdpi="9.4300585"
+       inkscape:export-ydpi="9.4300585" />
+    <g
+       id="g9605"
+       transform="translate(48.571425,171.42857)"
+       inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/logo.png"
+       inkscape:export-xdpi="9.4300585"
+       inkscape:export-ydpi="9.4300585">
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;stroke:none"
+         id="path9672"
+         sodipodi:cx="-461.63971"
+         sodipodi:cy="263.43304"
+         sodipodi:rx="51.51778"
+         sodipodi:ry="51.51778"
+         d="m -410.12193,263.43304 a 51.51778,51.51778 0 1 1 -103.03556,0 51.51778,51.51778 0 1 1 103.03556,0 z"
+         transform="matrix(-0.12853671,0,0,0.1988661,313.29075,-6.8729613)" />
+      <path
+         transform="translate(788.53535,-218.4801)"
+         d="m -410.12193,263.43304 c 0,28.45249 -23.0653,51.51778 -51.51778,51.51778 -28.45248,0 -51.51778,-23.06529 -51.51778,-51.51778 0,-28.45248 23.0653,-51.51778 51.51778,-51.51778 28.45248,0 51.51778,23.0653 51.51778,51.51778 z"
+         sodipodi:ry="51.51778"
+         sodipodi:rx="51.51778"
+         sodipodi:cy="263.43304"
+         sodipodi:cx="-461.63971"
+         id="path9036"
+         style="fill:#ffffff;stroke:#333333;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#000000;stroke:none"
+         id="path9548"
+         sodipodi:cx="-461.63971"
+         sodipodi:cy="263.43304"
+         sodipodi:rx="51.51778"
+         sodipodi:ry="51.51778"
+         d="m -410.12193,263.43304 a 51.51778,51.51778 0 1 1 -103.03556,0 51.51778,51.51778 0 1 1 103.03556,0 z"
+         transform="matrix(-0.4288055,0,0,0.6634282,111.54787,-129.25397)" />
+      <path
+         transform="matrix(-0.12853671,0,0,0.1988661,241.38939,-6.8729613)"
+         d="m -410.12193,263.43304 a 51.51778,51.51778 0 1 1 -103.03556,0 51.51778,51.51778 0 1 1 103.03556,0 z"
+         sodipodi:ry="51.51778"
+         sodipodi:rx="51.51778"
+         sodipodi:cy="263.43304"
+         sodipodi:cx="-461.63971"
+         id="path9670"
+         style="fill:#ffffff;stroke:none"
+         sodipodi:type="arc" />
+    </g>
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       id="path9552"
+       d="m -617.93268,81.937098 c -0.9612,-0.675937 -2.12939,-1.346577 -2.88355,-2.027822 -12.29901,-14.760522 -13.80459,-31.172396 -0.32166,-44.571565 0,0 3.97205,-12.701045 11.45951,-6.132622 5.97608,5.242555 -0.60854,10.808896 -0.60854,10.808896 -27.68072,24.165349 3.15768,15.042655 -7.64581,41.923133 l 5e-5,-2e-5 z"
+       sodipodi:nodetypes="cccsccc" />
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       id="path9577"
+       d="m -1422.1149,109.95016 c 2.7137,1.81769 5.6205,4.17755 8.141,5.45291 50.5745,17.15122 94.647,4.65704 115.9284,-43.70304 0,0 28.9742,-22.993756 4.4557,-35.850875 -19.5693,-10.261876 -12.6347,-3.622483 -12.6347,-3.622483 -19.2124,57.782658 -62.7072,66.748358 -115.8904,77.723608 l 0,-1.2e-4 z"
+       sodipodi:nodetypes="cccsccc"
+       inkscape:transform-center-x="52.527932"
+       inkscape:transform-center-y="-46.29346" />
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       id="path9609"
+       d="m 327.87814,232.7375 c -1.81633,-3.25606 -4.12254,-6.82765 -5.44888,-9.76811 -19.24156,-57.28546 1.01207,-82.04701 28.41119,-114.44767 11.68159,-13.813997 25.94269,-9.768847 30.94106,2.54257 9.49526,23.38767 4.22847,14.17678 4.22847,14.17678 -48.85595,8.70056 -53.02426,53.14935 -58.13194,107.49642 l 10e-5,1e-5 z"
+       sodipodi:nodetypes="ccssccc"
+       inkscape:export-xdpi="9.4300585"
+       inkscape:export-ydpi="9.4300585"
+       inkscape:export-filename="/home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/logo.png" />
+    <image
+       y="397.86218"
+       x="-1178.3572"
+       id="image9792"
+       height="229"
+       width="71"
+       xlink:href="file:///home/mtsrc/daten/projekte/firma/wortschlucker/templates/media/images/img04.jpg"
+       style="fill:#f9b631;fill-opacity:1" />
+  </g>
+</svg>
diff --git a/wortschlucker/templates/media/style.css b/wortschlucker/templates/media/style.css
index 758baa0..df3a188 100644
--- a/wortschlucker/templates/media/style.css
+++ b/wortschlucker/templates/media/style.css
@@ -211,6 +211,7 @@ hr { display: none; }
 	padding-left: 20px;
 }
 
+
 #logo h1, #logo p {
 	margin: 0px;
 	line-height: normal;
@@ -236,6 +237,17 @@ hr { display: none; }
 	color: #FFFFFF;
 }
 
+#logo-image {
+	vertical-align:middle;
+	float:left;
+	margin-right:20px;
+}
+
+
+#logo-text {
+	
+}
+
 #banner {
 	padding-bottom: 20px;
 }