diff --git a/openid-connect-server-webapp/pom.xml b/openid-connect-server-webapp/pom.xml
index 68059590f..b3eaa31b6 100644
--- a/openid-connect-server-webapp/pom.xml
+++ b/openid-connect-server-webapp/pom.xml
@@ -84,30 +84,35 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>org.lesscss</groupId>
-				<artifactId>lesscss-maven-plugin</artifactId>
-				<configuration>
-					<sourceDirectory>${project.basedir}/src/main/less</sourceDirectory>
-					<outputDirectory>${project.basedir}/src/main/webapp/resources/bootstrap2/css</outputDirectory>
-					<compress>false</compress>
-					<includes>
-						<include>bootstrap.less</include>
-						<include>bootstrap-responsive.less</include>
-					</includes>
-				</configuration>
+				<groupId>ro.isdc.wro4j</groupId>
+				<artifactId>wro4j-maven-plugin</artifactId>
+				<version>1.8.0</version>
 				<executions>
 					<execution>
+						<phase>compile</phase>
 						<goals>
-							<goal>compile</goal>
+							<goal>run</goal>
 						</goals>
-						<phase>process-sources</phase>
 					</execution>
 				</executions>
+				<configuration>
+					<targetGroups>bootstrap</targetGroups>
+					<destinationFolder>${project.build.directory}/${project.build.finalName}</destinationFolder>
+					<cssDestinationFolder>${project.build.directory}/${project.build.finalName}/resources/bootstrap2/css/</cssDestinationFolder>
+					<jsDestinationFolder>${project.build.directory}/${project.build.finalName}/js/</jsDestinationFolder>
+					<wroManagerFactory>ro.isdc.wro.maven.plugin.manager.factory.ConfigurableWroManagerFactory</wroManagerFactory>
+				</configuration>
 			</plugin>
+			
 		</plugins>
 	</build>
 	<dependencies>
-		<dependency>
+  <dependency>
+    <groupId>ro.isdc.wro4j</groupId>
+    <artifactId>wro4j-extensions</artifactId>
+    <version>1.8.0</version>
+  </dependency>
+  		<dependency>
 			<groupId>org.mitre</groupId>
 			<artifactId>openid-connect-server</artifactId>
 		</dependency>
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/wro.properties b/openid-connect-server-webapp/src/main/webapp/WEB-INF/wro.properties
new file mode 100644
index 000000000..8b8c9dd89
--- /dev/null
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/wro.properties
@@ -0,0 +1,2 @@
+preProcessors=cssImport
+postProcessors=lessCss
diff --git a/openid-connect-server-webapp/src/main/webapp/WEB-INF/wro.xml b/openid-connect-server-webapp/src/main/webapp/WEB-INF/wro.xml
new file mode 100644
index 000000000..a69a55bb9
--- /dev/null
+++ b/openid-connect-server-webapp/src/main/webapp/WEB-INF/wro.xml
@@ -0,0 +1,6 @@
+<groups xmlns="http://www.isdc.ro/wro">	
+  <group name="bootstrap">
+    <css>/less/bootstrap.less</css>
+    <css>/less/bootstrap-responsive.less</css>
+  </group> 	  	
+</groups>
\ No newline at end of file
diff --git a/openid-connect-server-webapp/src/main/less/accordion.less b/openid-connect-server-webapp/src/main/webapp/less/accordion.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/accordion.less
rename to openid-connect-server-webapp/src/main/webapp/less/accordion.less
diff --git a/openid-connect-server-webapp/src/main/less/alerts.less b/openid-connect-server-webapp/src/main/webapp/less/alerts.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/alerts.less
rename to openid-connect-server-webapp/src/main/webapp/less/alerts.less
diff --git a/openid-connect-server-webapp/src/main/less/bootstrap-responsive.less b/openid-connect-server-webapp/src/main/webapp/less/bootstrap-responsive.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/bootstrap-responsive.less
rename to openid-connect-server-webapp/src/main/webapp/less/bootstrap-responsive.less
diff --git a/openid-connect-server-webapp/src/main/less/bootstrap.less b/openid-connect-server-webapp/src/main/webapp/less/bootstrap.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/bootstrap.less
rename to openid-connect-server-webapp/src/main/webapp/less/bootstrap.less
diff --git a/openid-connect-server-webapp/src/main/less/breadcrumbs.less b/openid-connect-server-webapp/src/main/webapp/less/breadcrumbs.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/breadcrumbs.less
rename to openid-connect-server-webapp/src/main/webapp/less/breadcrumbs.less
diff --git a/openid-connect-server-webapp/src/main/less/button-groups.less b/openid-connect-server-webapp/src/main/webapp/less/button-groups.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/button-groups.less
rename to openid-connect-server-webapp/src/main/webapp/less/button-groups.less
diff --git a/openid-connect-server-webapp/src/main/less/buttons.less b/openid-connect-server-webapp/src/main/webapp/less/buttons.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/buttons.less
rename to openid-connect-server-webapp/src/main/webapp/less/buttons.less
diff --git a/openid-connect-server-webapp/src/main/less/carousel.less b/openid-connect-server-webapp/src/main/webapp/less/carousel.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/carousel.less
rename to openid-connect-server-webapp/src/main/webapp/less/carousel.less
diff --git a/openid-connect-server-webapp/src/main/less/close.less b/openid-connect-server-webapp/src/main/webapp/less/close.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/close.less
rename to openid-connect-server-webapp/src/main/webapp/less/close.less
diff --git a/openid-connect-server-webapp/src/main/less/code.less b/openid-connect-server-webapp/src/main/webapp/less/code.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/code.less
rename to openid-connect-server-webapp/src/main/webapp/less/code.less
diff --git a/openid-connect-server-webapp/src/main/less/component-animations.less b/openid-connect-server-webapp/src/main/webapp/less/component-animations.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/component-animations.less
rename to openid-connect-server-webapp/src/main/webapp/less/component-animations.less
diff --git a/openid-connect-server-webapp/src/main/less/dropdowns.less b/openid-connect-server-webapp/src/main/webapp/less/dropdowns.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/dropdowns.less
rename to openid-connect-server-webapp/src/main/webapp/less/dropdowns.less
diff --git a/openid-connect-server-webapp/src/main/less/forms.less b/openid-connect-server-webapp/src/main/webapp/less/forms.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/forms.less
rename to openid-connect-server-webapp/src/main/webapp/less/forms.less
diff --git a/openid-connect-server-webapp/src/main/less/grid.less b/openid-connect-server-webapp/src/main/webapp/less/grid.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/grid.less
rename to openid-connect-server-webapp/src/main/webapp/less/grid.less
diff --git a/openid-connect-server-webapp/src/main/less/hero-unit.less b/openid-connect-server-webapp/src/main/webapp/less/hero-unit.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/hero-unit.less
rename to openid-connect-server-webapp/src/main/webapp/less/hero-unit.less
diff --git a/openid-connect-server-webapp/src/main/less/labels-badges.less b/openid-connect-server-webapp/src/main/webapp/less/labels-badges.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/labels-badges.less
rename to openid-connect-server-webapp/src/main/webapp/less/labels-badges.less
diff --git a/openid-connect-server-webapp/src/main/less/layouts.less b/openid-connect-server-webapp/src/main/webapp/less/layouts.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/layouts.less
rename to openid-connect-server-webapp/src/main/webapp/less/layouts.less
diff --git a/openid-connect-server-webapp/src/main/less/media.less b/openid-connect-server-webapp/src/main/webapp/less/media.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/media.less
rename to openid-connect-server-webapp/src/main/webapp/less/media.less
diff --git a/openid-connect-server-webapp/src/main/less/mixins.less b/openid-connect-server-webapp/src/main/webapp/less/mixins.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/mixins.less
rename to openid-connect-server-webapp/src/main/webapp/less/mixins.less
diff --git a/openid-connect-server-webapp/src/main/less/modals.less b/openid-connect-server-webapp/src/main/webapp/less/modals.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/modals.less
rename to openid-connect-server-webapp/src/main/webapp/less/modals.less
diff --git a/openid-connect-server-webapp/src/main/less/navbar.less b/openid-connect-server-webapp/src/main/webapp/less/navbar.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/navbar.less
rename to openid-connect-server-webapp/src/main/webapp/less/navbar.less
diff --git a/openid-connect-server-webapp/src/main/less/navs.less b/openid-connect-server-webapp/src/main/webapp/less/navs.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/navs.less
rename to openid-connect-server-webapp/src/main/webapp/less/navs.less
diff --git a/openid-connect-server-webapp/src/main/less/pager.less b/openid-connect-server-webapp/src/main/webapp/less/pager.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/pager.less
rename to openid-connect-server-webapp/src/main/webapp/less/pager.less
diff --git a/openid-connect-server-webapp/src/main/less/pagination.less b/openid-connect-server-webapp/src/main/webapp/less/pagination.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/pagination.less
rename to openid-connect-server-webapp/src/main/webapp/less/pagination.less
diff --git a/openid-connect-server-webapp/src/main/less/popovers.less b/openid-connect-server-webapp/src/main/webapp/less/popovers.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/popovers.less
rename to openid-connect-server-webapp/src/main/webapp/less/popovers.less
diff --git a/openid-connect-server-webapp/src/main/less/progress-bars.less b/openid-connect-server-webapp/src/main/webapp/less/progress-bars.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/progress-bars.less
rename to openid-connect-server-webapp/src/main/webapp/less/progress-bars.less
diff --git a/openid-connect-server-webapp/src/main/less/reset.less b/openid-connect-server-webapp/src/main/webapp/less/reset.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/reset.less
rename to openid-connect-server-webapp/src/main/webapp/less/reset.less
diff --git a/openid-connect-server-webapp/src/main/less/responsive-1200px-min.less b/openid-connect-server-webapp/src/main/webapp/less/responsive-1200px-min.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/responsive-1200px-min.less
rename to openid-connect-server-webapp/src/main/webapp/less/responsive-1200px-min.less
diff --git a/openid-connect-server-webapp/src/main/less/responsive-767px-max.less b/openid-connect-server-webapp/src/main/webapp/less/responsive-767px-max.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/responsive-767px-max.less
rename to openid-connect-server-webapp/src/main/webapp/less/responsive-767px-max.less
diff --git a/openid-connect-server-webapp/src/main/less/responsive-768px-979px.less b/openid-connect-server-webapp/src/main/webapp/less/responsive-768px-979px.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/responsive-768px-979px.less
rename to openid-connect-server-webapp/src/main/webapp/less/responsive-768px-979px.less
diff --git a/openid-connect-server-webapp/src/main/less/responsive-navbar.less b/openid-connect-server-webapp/src/main/webapp/less/responsive-navbar.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/responsive-navbar.less
rename to openid-connect-server-webapp/src/main/webapp/less/responsive-navbar.less
diff --git a/openid-connect-server-webapp/src/main/less/responsive-utilities.less b/openid-connect-server-webapp/src/main/webapp/less/responsive-utilities.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/responsive-utilities.less
rename to openid-connect-server-webapp/src/main/webapp/less/responsive-utilities.less
diff --git a/openid-connect-server-webapp/src/main/less/scaffolding.less b/openid-connect-server-webapp/src/main/webapp/less/scaffolding.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/scaffolding.less
rename to openid-connect-server-webapp/src/main/webapp/less/scaffolding.less
diff --git a/openid-connect-server-webapp/src/main/less/sprites.less b/openid-connect-server-webapp/src/main/webapp/less/sprites.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/sprites.less
rename to openid-connect-server-webapp/src/main/webapp/less/sprites.less
diff --git a/openid-connect-server-webapp/src/main/less/tables.less b/openid-connect-server-webapp/src/main/webapp/less/tables.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/tables.less
rename to openid-connect-server-webapp/src/main/webapp/less/tables.less
diff --git a/openid-connect-server-webapp/src/main/less/thumbnails.less b/openid-connect-server-webapp/src/main/webapp/less/thumbnails.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/thumbnails.less
rename to openid-connect-server-webapp/src/main/webapp/less/thumbnails.less
diff --git a/openid-connect-server-webapp/src/main/less/tooltip.less b/openid-connect-server-webapp/src/main/webapp/less/tooltip.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/tooltip.less
rename to openid-connect-server-webapp/src/main/webapp/less/tooltip.less
diff --git a/openid-connect-server-webapp/src/main/less/type.less b/openid-connect-server-webapp/src/main/webapp/less/type.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/type.less
rename to openid-connect-server-webapp/src/main/webapp/less/type.less
diff --git a/openid-connect-server-webapp/src/main/less/utilities.less b/openid-connect-server-webapp/src/main/webapp/less/utilities.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/utilities.less
rename to openid-connect-server-webapp/src/main/webapp/less/utilities.less
diff --git a/openid-connect-server-webapp/src/main/less/variables.less b/openid-connect-server-webapp/src/main/webapp/less/variables.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/variables.less
rename to openid-connect-server-webapp/src/main/webapp/less/variables.less
diff --git a/openid-connect-server-webapp/src/main/less/wells.less b/openid-connect-server-webapp/src/main/webapp/less/wells.less
similarity index 100%
rename from openid-connect-server-webapp/src/main/less/wells.less
rename to openid-connect-server-webapp/src/main/webapp/less/wells.less