diff --git a/pom.xml b/pom.xml
index 8bb67c5..922a4e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,15 +14,15 @@
 		<jmh.version>1.11.2</jmh.version>
 		<uberjar.name>benchmarks</uberjar.name>
 
-		<pebble.version>2.2.0</pebble.version>
-		<mustache.version>0.9.1</mustache.version>
-		<freemarker.version>2.3.23</freemarker.version>
-		<velocity.version>1.7</velocity.version>
-		<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
+		<pebble.version>2.4.0</pebble.version>
+		<mustache.version>0.9.6</mustache.version>
+		<freemarker.version>2.3.30</freemarker.version>
+		<velocity.version>2.2</velocity.version>
+		<thymeleaf.version>3.0.11.RELEASE</thymeleaf.version>
 		<junit.version>4.12</junit.version>
-		<trimou.version>1.8.2.Final</trimou.version>
-		<hbs.version>4.0.1</hbs.version>
-		<rocker.version>0.10.3</rocker.version>
+		<trimou.version>2.5.0.Final</trimou.version>
+		<hbs.version>4.2.0</hbs.version>
+		<rocker.version>1.2.3</rocker.version>
 	</properties>
 
 	<licenses>
@@ -137,7 +137,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.velocity</groupId>
-			<artifactId>velocity</artifactId>
+			<artifactId>velocity-engine-core</artifactId>
 			<version>${velocity.version}</version>
 		</dependency>
 		<dependency>
diff --git a/results.csv b/results.csv
index 15c1737..8074d62 100644
--- a/results.csv
+++ b/results.csv
@@ -1,9 +1,9 @@
-"Benchmark","Mode","Threads","Samples","Score","Score Error (99.9%)","Unit"
-"com.mitchellbosecke.benchmark.Freemarker.benchmark","thrpt",1,50,15370.751504,496.200994,"ops/s"
-"com.mitchellbosecke.benchmark.Handlebars.benchmark","thrpt",1,50,17779.570147,552.411776,"ops/s"
-"com.mitchellbosecke.benchmark.Mustache.benchmark","thrpt",1,50,22164.070102,598.799830,"ops/s"
-"com.mitchellbosecke.benchmark.Pebble.benchmark","thrpt",1,50,32530.043940,849.278116,"ops/s"
-"com.mitchellbosecke.benchmark.Rocker.benchmark","thrpt",1,50,39739.408090,1152.244741,"ops/s"
-"com.mitchellbosecke.benchmark.Thymeleaf.benchmark","thrpt",1,50,1084.191177,33.698132,"ops/s"
-"com.mitchellbosecke.benchmark.Trimou.benchmark","thrpt",1,50,22787.431476,622.350790,"ops/s"
-"com.mitchellbosecke.benchmark.Velocity.benchmark","thrpt",1,50,20835.819309,526.312411,"ops/s"
+"Benchmark","Mode","Threads","Samples","Score","Score Error (99.9%)","Unit"
+"com.mitchellbosecke.benchmark.Freemarker.benchmark","thrpt",1,50,22037.745210,291.510056,"ops/s"
+"com.mitchellbosecke.benchmark.Handlebars.benchmark","thrpt",1,50,22889.607090,210.274057,"ops/s"
+"com.mitchellbosecke.benchmark.Mustache.benchmark","thrpt",1,50,25980.621300,255.784255,"ops/s"
+"com.mitchellbosecke.benchmark.Pebble.benchmark","thrpt",1,50,33721.095473,295.258803,"ops/s"
+"com.mitchellbosecke.benchmark.Rocker.benchmark","thrpt",1,50,46958.766357,410.564487,"ops/s"
+"com.mitchellbosecke.benchmark.Thymeleaf.benchmark","thrpt",1,50,6768.247670,135.785965,"ops/s"
+"com.mitchellbosecke.benchmark.Trimou.benchmark","thrpt",1,50,28549.573776,623.905767,"ops/s"
+"com.mitchellbosecke.benchmark.Velocity.benchmark","thrpt",1,50,24190.491198,656.844846,"ops/s"
diff --git a/results.png b/results.png
index 7ebb448..7ab6610 100644
Binary files a/results.png and b/results.png differ
diff --git a/src/main/resources/templates/stocks.thymeleaf.html b/src/main/resources/templates/stocks.thymeleaf.html
index a1667f6..ebf45a9 100755
--- a/src/main/resources/templates/stocks.thymeleaf.html
+++ b/src/main/resources/templates/stocks.thymeleaf.html
@@ -55,7 +55,7 @@ <h1>Stock Prices</h1>
 		<tbody>
 <!--/* Note that itemStat.odd works with index (starting with 0) whereas itemStat.count is starting with 1 */-->
 			<tr th:each="item: ${items}"
-				th:class="${itemStat.odd}? 'even' : 'odd'">
+				th:class="${itemStat.odd}? 'odd' : 'even'">
 				<td th:utext="${itemStat.count}"></td>
 				<td><a th:href="${'/stocks/' + item.symbol}"
 					th:utext="${item.symbol}"></a></td>
@@ -70,4 +70,4 @@ <h1>Stock Prices</h1>
 	</table>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/resources/templates/stocks.velocity.html b/src/main/resources/templates/stocks.velocity.html
index c3217ce..ab02f8a 100755
--- a/src/main/resources/templates/stocks.velocity.html
+++ b/src/main/resources/templates/stocks.velocity.html
@@ -54,9 +54,9 @@ <h1>Stock Prices</h1>
 		</thead>
 		<tbody>
 		#foreach($item in $items)
-			#if($velocityCount % 2 == 0) #set($klass = "even") #else #set($klass = "odd") #end
+			#if($foreach.count % 2 == 0) #set($klass = "even") #else #set($klass = "odd") #end
 			<tr class="${klass}">
-				<td>${velocityCount}</td>
+				<td>${foreach.count}</td>
 			    <td>
 			    	<a href="/stocks/${item.symbol}">${item.symbol}</a>
 			    </td>