diff --git a/portal-web/docroot/html/portlet/wiki/css/main.css b/portal-web/docroot/html/portlet/wiki/css/main.css
index f3de09cfe01cd1be55ef84db26c8671ce41dd897..e4c155275c4cd052dae16848f0335dc6d682a8c8 100644
--- a/portal-web/docroot/html/portlet/wiki/css/main.css
+++ b/portal-web/docroot/html/portlet/wiki/css/main.css
@@ -1,24 +1,37 @@
+@import "compass";
+
 .portlet-wiki {
 	.wiki-body {
+		@include hyphenation;
+
 		ol ol {
 			list-style: decimal outside;
 		}
 
 		pre {
-			background : #fff;
-			border: 1px dashed #2f6fab;
+			background : #FFF;
+			border: 1px dashed #2F6FAB;
 			margin: 5px 0;
 			padding: 0.5em;
 		}
+
+		table {
+			border-collapse: collapse;
+			width: 100%;
+		}
+
+		table, th, td {
+			border: 1px solid;
+		}
 	}
 
 	a.createpage {
-		color: #f00;
+		color: #F00;
 	}
 
 	.toc {
-		border: 1px solid #aaa;
-		background-color: #f9f9f9;
+		border: 1px solid #AAA;
+		background-color: #F9F9F9;
 		padding: 0 1em;
 
 		h4 {
@@ -50,7 +63,7 @@
 	}
 
 	.page-categories {
-		color: #7d7d7d;
+		color: #7D7D7D;
 	}
 
 	.taglib-discussion {
@@ -58,31 +71,31 @@
 	}
 
 	.page-tags {
-		color: #7d7d7d;
+		color: #7D7D7D;
 	}
 
-	.portlet-body h2 a.hashlink,
-	.portlet-body h3 a.hashlink,
-	.portlet-body h4 a.hashlink {
-		color: #DDE0E1;
-		font-size: 12px;
-		text-decoration: none;
-	}
+	.portlet-body {
+		h1.page-title .return-to-page {
+			background: url(@theme_image_path@/wiki/return_to_page.png) no-repeat 0 50%;
+			padding-left: 20px;
+			text-decoration: none;
+		}
 
-	.portlet-body h2:hover a.hashlink,
-	.portlet-body h3:hover a.hashlink,
-	.portlet-body h4:hover a.hashlink {
-		color: #777;
-	}
+		h2, h3, h4 {
+			a.hashlink {
+				color: #DDE0E1;
+				font-size: 12px;
+				text-decoration: none;
+			}
 
-	.portlet-body h1.page-title .return-to-page {
-		background: url(@theme_image_path@/wiki/return_to_page.png) no-repeat 0 50%;
-		padding-left: 20px;
-		text-decoration: none;
+			&:hover a.hashlink {
+				color: #777;
+			}
+		}
 	}
 
 	.preview {
-		background: #ffc;
+		background: #FFC;
 		border: 1px dotted gray;
 		padding: 3px;
 	}
@@ -97,113 +110,117 @@
 
 	.child-pages {
 		margin: 2em 0;
-	}
 
-	.child-pages h2 {
-		background-color: #DDD;
-		border-width: 0;
-		font-weight: normal;
-		margin: 0 0 0.5em;
-		padding: 0.2em;
-	}
+		h2 {
+			background-color: #DDD;
+			border-width: 0;
+			font-weight: normal;
+			margin: 0 0 0.5em;
+			padding: 0.2em;
+		}
 
-	.child-pages h3 {
-		font-size: 1.2em;
-		margin-bottom: 0.3em;
-	}
+		h3 {
+			font-size: 1.2em;
+			margin-bottom: 0.3em;
+		}
 
-	.child-pages ul {
-		margin-top: 0;
-	}
+		ul {
+			margin-top: 0;
+		}
 
-	.child-pages li {
-		font-weight: bold;
-		font-size: 1.1em;
+		li {
+			font-weight: bold;
+			font-size: 1.1em;
+		}
 	}
 
-	.content-body .wiki-code {
-		background: #fff;
-		border: 1px solid #777;
-		font-family: monospace;
-		white-space: pre;
-	}
+	.content-body {
+		.wiki-code {
+			background: #FFF;
+			border: 1px solid #777;
+			font-family: monospace;
+			white-space: pre;
+		}
 
-	.content-body .code-lines {
-		border-right: 1px solid #ccc;
-		color: #000;
-		margin-right: 5px;
-		padding: 0 5px;
-	}
+		.code-lines {
+			border-right: 1px solid #CCC;
+			color: #000;
+			margin-right: 5px;
+			padding: 0 5px;
+		}
 
-	.content-body a.external-link {
-		background: transparent url(@theme_image_path@/wiki/external.png) right top no-repeat;
-		text-decoration: none;
-		padding-right: 10px;
-	}
+		a.external-link {
+			background: transparent url(@theme_image_path@/wiki/external.png) right top no-repeat;
+			text-decoration: none;
+			padding-right: 10px;
 
-	.content-body a.external-link:hover {
-		background: transparent url(@theme_image_path@/wiki/external.png) right top no-repeat;
-		text-decoration: underline;
-		padding-right: 11px;
+			&:hover {
+				background: transparent url(@theme_image_path@/wiki/external.png) right top no-repeat;
+				text-decoration: underline;
+				padding-right: 11px;
+			}
+		}
 	}
 
-	.history-navigation .central-info a.change-mode {
-		font-weight: bold;
-	}
+	.history-navigation {
+		background: #EEE;
+		border-top: 1px solid #CCC;
+		margin: 15px 0 20px;
+		overflow: hidden;
+		padding: 5px;
 
-	.history-navigation .central-info span.change-mode {
-		color: #999;
-		font-weight: bold;
-	}
+		.central-info {
+			float: left;
+			padding-left: 10px;
+			padding-right: 10px;
+			text-align: center;
+			width: 66%;
 
-	.history-navigation .central-info {
-		float: left;
-		padding-left: 10px;
-		padding-right: 10px;
-		text-align: center;
-		width: 66%;
-	}
+			a.change-mode {
+				font-weight: bold;
+			}
 
-	.history-navigation .central-title {
-		font-weight: bold;
-		padding-right: 20px;
-	}
+			span.change-mode {
+				color: #999;
+				font-weight: bold;
+			}
+		}
 
-	.history-navigation .central-username {
-		font-weight: bold;
-	}
+		.central-title {
+			font-weight: bold;
+			padding-right: 20px;
+		}
 
-	.history-navigation .next {
-		background-image: url(@theme_image_path@/arrows/paging_next.png);
-		background-position: 100% 0;
-		float: right;
-		padding-right: 15px;
-	}
+		.central-username {
+			font-weight: bold;
+		}
 
-	.history-navigation .previous {
-		background-image: url(@theme_image_path@/arrows/paging_previous.png);
-		float: left;
-		padding-left: 15px;
-	}
+		.next {
+			background-image: url(@theme_image_path@/arrows/paging_next.png);
+			background-position: 100% 0;
+			float: right;
+			padding-right: 15px;
+		}
 
-	.history-navigation a, .history-navigation span {
-		background: url() no-repeat;
-	}
+		.previous {
+			background-image: url(@theme_image_path@/arrows/paging_previous.png);
+			float: left;
+			padding-left: 15px;
+		}
 
-	.history-navigation span.next {
-		background-position: 100% 100%;
-	}
+		a, span {
+			background: url() no-repeat;
+		}
 
-	.history-navigation span.previous {
-		background-position: 0 100%;
-	}
+		span {
+			&.next {
+				background-position: 100% 100%;
+			}
 
-	.history-navigation {
-		background: #eee;
-		border-top: 1px solid #ccc;
-		margin: 15px 0 20px;
-		overflow: hidden;
-		padding: 5px;
+			&.previous {
+				background-position: 0 100%;
+			}
+		}
 	}
 
 	.node-current {
@@ -212,36 +229,36 @@
 	}
 
 	.page-actions {
+		clear: both;
 		margin-top: 1.5em;
 
 		&:after {
-			clear: both;
 			content: ".";
 			display: block;
 			height: 0;
 			visibility: hidden;
 		}
-	}
 
-	.page-actions .article-actions {
-		border-right: 1px solid #999;
-		float: left;
-		margin-right: 10px;
-		padding-right: 10px;
-	}
+		.article-actions {
+			border-right: 1px solid #999;
+			float: left;
+			margin-right: 10px;
+			padding-right: 10px;
+		}
 
-	.page-actions .stats {
-		color: #999;
-	}
+		.stats {
+			color: #999;
+		}
 
-	.page-actions.top-actions {
-		margin-bottom: 15px;
-		margin-top: 0;
-		text-align: right;
-	}
+		&.top-actions {
+			margin-bottom: 15px;
+			margin-top: 0;
+			text-align: right;
 
-	.page-actions.top-actions img {
-		margin-left: 5px;
+			img {
+				margin-left: 5px;
+			}
+		}
 	}
 
 	.page-activities {
@@ -266,24 +283,26 @@
 
 	.page-info {
 		width: 100%;
-	}
 
-	.page-info tr th, .page-info tr td {
-		border: 1px solid #ccc;
-		border-left: none;
-		border-right: none;
-		padding: 0.3em 1em;
-	}
-
-	.page-old-version a {
-		color: #f93;
+		tr {
+			th, td {
+				border: 1px solid #CCC;
+				border-left-width: 0;
+				border-right-width: 0;
+				padding: 0.3em 1em;
+			}
+		}
 	}
 
 	.page-old-version {
-		color: #f93;
+		color: #F93;
 		line-height: 1.2em;
 		margin: -1em 0 1.4em 0;
 		width: auto;
+
+		a {
+			color: #F93;
+		}
 	}
 
 	.page-ratings {
@@ -291,7 +310,7 @@
 	}
 
 	.page-redirect {
-		color: #7d7d7d;
+		color: #7D7D7D;
 		cursor: pointer;
 		line-height: 1.2em;
 		margin: -1em 0 1.4em 0;
@@ -311,13 +330,15 @@
 		padding-left: 10px;
 	}
 
-	.syntax-help h4 {
-		margin-bottom: 0.5em;
-	}
+	.syntax-help {
+		h4 {
+			margin-bottom: 0.5em;
+		}
 
-	.syntax-help pre {
-		margin-left: 1em;
-		margin-bottom: 1em;
+		pre {
+			margin-left: 1em;
+			margin-bottom: 1em;
+		}
 	}
 
 	.top-links {
@@ -325,14 +346,14 @@
 	}
 
 	.top-links-nodes {
-		border: 1px solid #ddd;
+		border: 1px solid #DDD;
 		float: left;
 		list-style-type: none;
 		margin: 0 0.5em 0.5em;
 		padding: 0.2em 0.5em;
 
 		.top-link-node {
-			border-right: 1px solid #aaa;
+			border-right: 1px solid #AAA;
 			display: inline-block;
 			list-style-type: none;
 			margin: 0.3em;
@@ -359,7 +380,7 @@
 	}
 
 	.subscription-info tr td {
-		border: none;
+		border-width: 0;
 		padding: 0.1em 10px 0.1em 0;
 	}
 
