diff --git a/htdocs/demo/index.php b/htdocs/demo/index.php
index 0bf431f6f..1dead0de5 100644
--- a/htdocs/demo/index.php
+++ b/htdocs/demo/index.php
@@ -5,6 +5,7 @@
   <title>Online Demo - Cppcheck</title>
   <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Orbitron&amp;text=Cppcheck" />
   <link rel="stylesheet" type="text/css" href="/site/css/all.min.css" />
+  <link rel="stylesheet" type="text/css" href="/site/css/geshi.min.css" />
   <link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
   <script type="text/javascript">
     function checkCodeLength() {
diff --git a/htdocs/site/css/all.css b/htdocs/site/css/all.css
index 51da7422a..dd84ae3ed 100644
--- a/htdocs/site/css/all.css
+++ b/htdocs/site/css/all.css
@@ -140,21 +140,6 @@ a.downloadnow em {
   font-style: normal;
 }
 
-/* Source Code */
-pre.code {
-  padding: .5em;
-  background: #f7f7f7;
-  border: 1px solid #e2e2e2;
-}
-pre.code em {
-  color: green;
-}
-.geshicode {
-  padding: .5em;
-  background: #f7f7f7;
-  border: 1px solid #e2e2e2;
-}
-
 /* Command */
 pre.cmd {
   padding: .5em;
@@ -163,32 +148,6 @@ pre.cmd {
   border-left: 10px solid #c0c0c0;
 }
 
-/* Results table */
-#resultsTable {
-  border-collapse: collapse;
-}
-#resultsTable th {
-  padding: .25em;
-  text-align: left;
-  background: #e2e2e2;
-  border: 1px solid #e2e2e2;
-}
-#resultsTable td {
-  padding: .25em;
-  background: #f7f7f7;
-  border: 1px solid #e2e2e2;
-}
-#resultsTable .center {
-  text-align: center;
-}
-
-/* Max characters */
-.maxChars {
-  margin-left: 2em;
-  color: #888;
-  font-size: smaller;
-}
-
 /* Printing */
 @media print {
   #header { color: black; border-bottom: 1px solid black; }
diff --git a/htdocs/site/css/all.min.css b/htdocs/site/css/all.min.css
index 6ee49a3c0..1b6ad8e44 100644
--- a/htdocs/site/css/all.min.css
+++ b/htdocs/site/css/all.min.css
@@ -1 +1 @@
-body{margin:0;padding:0;font-family:Calibri,Verdana,sans-serif;color:#000;background:#eee}dt{font-weight:700}a:link{color:#036;text-decoration:underline}a:visited{color:#036;text-decoration:underline}a:focus{color:#369;text-decoration:none}a:link:hover,a:visited:hover{color:#369;text-decoration:none}a:active{color:#369;text-decoration:none}#header{color:#69c;background:#036}#header h1{margin:0;padding:0;font-family:Orbitron,Calibri,Verdana,sans-serif}#header p{margin:0;padding:0;font-size:larger}#tabs{color:#eee;background:#369;border-top:1px solid #000;border-bottom:1px solid #000}#tabs ul{margin:0;padding:0;list-style-type:none;font-size:larger}#tabs ul li{display:inline;margin:0;padding:0 .5em;border-right:1px solid #000}#tabs ul li:first-child{padding-left:0}#tabs ul li:last-child{border:0}#tabs a:link{color:#eee;text-decoration:none}#tabs a:visited{color:#eee;text-decoration:none}#tabs a:focus{color:#fff;text-decoration:underline}#tabs a:hover{color:#fff;text-decoration:underline}#tabs a:active{color:#fff;text-decoration:underline}#anchors ul{margin:0;padding:.5em 0;list-style-type:none;font-size:smaller}#anchors ul li{display:inline;margin:0;padding:0 .5em}#anchors ul li:first-child{padding-left:0}#anchors .wrap{padding:0}.wrap{width:50em;margin:0 auto;padding:.5em}.rssfeeditems em{margin-left:.5em;color:#888;font-size:smaller}a.downloadnow{display:block;width:12em;margin:0;padding:5px;text-align:center;text-decoration:none;color:#fff;background:#060;border:1px solid #060;border-radius:.5em;-moz-border-radius:.5em;-khtml-border-radius:.5em;-webkit-border-radius:.5em}a.downloadnow:link,a.downloadnow:visited{text-decoration:none;color:#fff}a.downloadnow:focus,a.downloadnow:hover{text-decoration:none;color:#fff;background:#090}a.downloadnow strong{display:block;font-size:larger;font-weight:700}a.downloadnow em{display:block;font-size:smaller;font-style:normal}pre.code{padding:.5em;background:#f7f7f7;border:1px solid #e2e2e2}pre.code em{color:green}.geshicode{padding:.5em;background:#f7f7f7;border:1px solid #e2e2e2}pre.cmd{padding:.5em;background:#f7f7f7;border:1px solid #c0c0c0;border-left:10px solid #c0c0c0}#resultsTable{border-collapse:collapse}#resultsTable th{padding:.25em;text-align:left;background:#e2e2e2;border:1px solid #e2e2e2}#resultsTable td{padding:.25em;background:#f7f7f7;border:1px solid #e2e2e2}#resultsTable .center{text-align:center}.maxChars{margin-left:2em;color:#888;font-size:smaller}@media print{#header{ color:#000;border-bottom:1px solid black}#tabs{display:none}#resultsTable th{background:#fff;border:1px solid black}#resultsTable td{background:#fff;border:1px solid black}}
\ No newline at end of file
+body{margin:0;padding:0;font-family:Calibri,Verdana,sans-serif;color:#000;background:#eee}dt{font-weight:700}a:link{color:#036;text-decoration:underline}a:visited{color:#036;text-decoration:underline}a:focus{color:#369;text-decoration:none}a:link:hover,a:visited:hover{color:#369;text-decoration:none}a:active{color:#369;text-decoration:none}#header{color:#69c;background:#036}#header h1{margin:0;padding:0;font-family:Orbitron,Calibri,Verdana,sans-serif}#header p{margin:0;padding:0;font-size:larger}#tabs{color:#eee;background:#369;border-top:1px solid #000;border-bottom:1px solid #000}#tabs ul{margin:0;padding:0;list-style-type:none;font-size:larger}#tabs ul li{display:inline;margin:0;padding:0 .5em;border-right:1px solid #000}#tabs ul li:first-child{padding-left:0}#tabs ul li:last-child{border:0}#tabs a:link{color:#eee;text-decoration:none}#tabs a:visited{color:#eee;text-decoration:none}#tabs a:focus{color:#fff;text-decoration:underline}#tabs a:hover{color:#fff;text-decoration:underline}#tabs a:active{color:#fff;text-decoration:underline}#anchors ul{margin:0;padding:.5em 0;list-style-type:none;font-size:smaller}#anchors ul li{display:inline;margin:0;padding:0 .5em}#anchors ul li:first-child{padding-left:0}#anchors .wrap{padding:0}.wrap{width:50em;margin:0 auto;padding:.5em}.rssfeeditems em{margin-left:.5em;color:#888;font-size:smaller}a.downloadnow{display:block;width:12em;margin:0;padding:5px;text-align:center;text-decoration:none;color:#fff;background:#060;border:1px solid #060;border-radius:.5em;-moz-border-radius:.5em;-khtml-border-radius:.5em;-webkit-border-radius:.5em}a.downloadnow:link,a.downloadnow:visited{text-decoration:none;color:#fff}a.downloadnow:focus,a.downloadnow:hover{text-decoration:none;color:#fff;background:#090}a.downloadnow strong{display:block;font-size:larger;font-weight:700}a.downloadnow em{display:block;font-size:smaller;font-style:normal}pre.cmd{padding:.5em;background:#f7f7f7;border:1px solid #c0c0c0;border-left:10px solid #c0c0c0}@media print{#header{ color:#000;border-bottom:1px solid black}#tabs{display:none}#resultsTable th{background:#fff;border:1px solid black}#resultsTable td{background:#fff;border:1px solid black}}
\ No newline at end of file
diff --git a/htdocs/site/css/geshi.css b/htdocs/site/css/geshi.css
index 21948c5d9..e3cff549e 100644
--- a/htdocs/site/css/geshi.css
+++ b/htdocs/site/css/geshi.css
@@ -1,3 +1,44 @@
+/* Source Code */
+pre.code {
+  padding: .5em;
+  background: #f7f7f7;
+  border: 1px solid #e2e2e2;
+}
+pre.code em {
+  color: green;
+}
+.geshicode {
+  padding: .5em;
+  background: #f7f7f7;
+  border: 1px solid #e2e2e2;
+}
+
+/* Results table */
+#resultsTable {
+  border-collapse: collapse;
+}
+#resultsTable th {
+  padding: .25em;
+  text-align: left;
+  background: #e2e2e2;
+  border: 1px solid #e2e2e2;
+}
+#resultsTable td {
+  padding: .25em;
+  background: #f7f7f7;
+  border: 1px solid #e2e2e2;
+}
+#resultsTable .center {
+  text-align: center;
+}
+
+/* Max characters */
+.maxChars {
+  margin-left: 2em;
+  color: #888;
+  font-size: smaller;
+}
+
 /**
  * GeSHi (C) 2004 - 2007 Nigel McNie, 2007 - 2008 Benny Baumann
  * (http://qbnz.com/highlighter/ and http://geshi.org/)
diff --git a/htdocs/site/css/geshi.min.css b/htdocs/site/css/geshi.min.css
index da8a227e2..6d3f55149 100644
--- a/htdocs/site/css/geshi.min.css
+++ b/htdocs/site/css/geshi.min.css
@@ -1 +1 @@
-.cpp.geshicode .de1,.cpp.geshicode .de2{font:normal normal 1em/1.2em monospace;margin:0;padding:0;background:0;vertical-align:top}.cpp.geshicode{font-family:monospace}.cpp.geshicode .imp{font-weight:700;color:red}.cpp.geshicode li,.cpp.geshicode .li1{font-weight:400;vertical-align:top}.cpp.geshicode .ln{width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;color:#999}.cpp.geshicode .kw1{color:#00f}.cpp.geshicode .kw2{color:#00f}.cpp.geshicode .kw3{color:#00d}.cpp.geshicode .kw4{color:#00f}.cpp.geshicode .co1{color:#666}.cpp.geshicode .co2{color:#390}.cpp.geshicode .coMULTI{color:red;font-style:italic}.cpp.geshicode .es0{color:#009;font-weight:700}.cpp.geshicode .es1{color:#009;font-weight:700}.cpp.geshicode .es2{color:#609;font-weight:700}.cpp.geshicode .es3{color:#609;font-weight:700}.cpp.geshicode .es4{color:#609;font-weight:700}.cpp.geshicode .es5{color:#069;font-weight:700}.cpp.geshicode .br0{color:#008000}.cpp.geshicode .sy0{color:#008000}.cpp.geshicode .sy1{color:#000080}.cpp.geshicode .sy2{color:#000040}.cpp.geshicode .sy3{color:#000040}.cpp.geshicode .sy4{color:#008080}.cpp.geshicode .st0{color:red}.cpp.geshicode .nu0{color:#00d}.cpp.geshicode .nu6{color:#208080}.cpp.geshicode .nu8{color:#208080}.cpp.geshicode .nu12{color:#208080}.cpp.geshicode .nu16{color:#800080}.cpp.geshicode .nu17{color:#800080}.cpp.geshicode .nu18{color:#800080}.cpp.geshicode .nu19{color:#800080}.cpp.geshicode .me1{color:#078}.cpp.geshicode .me2{color:#078}.cpp.geshicode span.xtra{display:block}
\ No newline at end of file
+pre.code{padding:.5em;background:#f7f7f7;border:1px solid #e2e2e2}pre.code em{color:green}.geshicode{padding:.5em;background:#f7f7f7;border:1px solid #e2e2e2}#resultsTable{border-collapse:collapse}#resultsTable th{padding:.25em;text-align:left;background:#e2e2e2;border:1px solid #e2e2e2}#resultsTable td{padding:.25em;background:#f7f7f7;border:1px solid #e2e2e2}#resultsTable .center{text-align:center}.maxChars{margin-left:2em;color:#888;font-size:smaller}.cpp.geshicode .de1,.cpp.geshicode .de2{font:normal normal 1em/1.2em monospace;margin:0;padding:0;background:0;vertical-align:top}.cpp.geshicode{font-family:monospace}.cpp.geshicode .imp{font-weight:700;color:red}.cpp.geshicode li,.cpp.geshicode .li1{font-weight:400;vertical-align:top}.cpp.geshicode .ln{width:1px;text-align:right;margin:0;padding:0 2px;vertical-align:top;color:#999}.cpp.geshicode .kw1{color:#00f}.cpp.geshicode .kw2{color:#00f}.cpp.geshicode .kw3{color:#00d}.cpp.geshicode .kw4{color:#00f}.cpp.geshicode .co1{color:#666}.cpp.geshicode .co2{color:#390}.cpp.geshicode .coMULTI{color:red;font-style:italic}.cpp.geshicode .es0{color:#009;font-weight:700}.cpp.geshicode .es1{color:#009;font-weight:700}.cpp.geshicode .es2{color:#609;font-weight:700}.cpp.geshicode .es3{color:#609;font-weight:700}.cpp.geshicode .es4{color:#609;font-weight:700}.cpp.geshicode .es5{color:#069;font-weight:700}.cpp.geshicode .br0{color:#008000}.cpp.geshicode .sy0{color:#008000}.cpp.geshicode .sy1{color:#000080}.cpp.geshicode .sy2{color:#000040}.cpp.geshicode .sy3{color:#000040}.cpp.geshicode .sy4{color:#008080}.cpp.geshicode .st0{color:red}.cpp.geshicode .nu0{color:#00d}.cpp.geshicode .nu6{color:#208080}.cpp.geshicode .nu8{color:#208080}.cpp.geshicode .nu12{color:#208080}.cpp.geshicode .nu16{color:#800080}.cpp.geshicode .nu17{color:#800080}.cpp.geshicode .nu18{color:#800080}.cpp.geshicode .nu19{color:#800080}.cpp.geshicode .me1{color:#078}.cpp.geshicode .me2{color:#078}.cpp.geshicode span.xtra{display:block}
\ No newline at end of file