diff --git a/cv.css b/cv.css
index d7ce1b7..542206e 100644
--- a/cv.css
+++ b/cv.css
@@ -153,6 +153,11 @@ a {
     margin-bottom: 8px;
 }
 
+#skills h3 {
+	font-size: 0.80em;
+	padding-top: 5px;
+}
+
 /* -------------------------------------------------- */
 /*  Generic */
 /* -------------------------------------------------- */
diff --git a/index.html b/index.html
index 77ef466..03b208a 100644
--- a/index.html
+++ b/index.html
@@ -282,6 +282,11 @@
                     <div class="columns small-2">great</div>
                 </div>
 
+				<h3>
+					<i class="fa fa-angle-right blue" aria-hidden="true"></i>
+					Programming Languages
+				</h3>
+
                 <div class="row">
                     <div class="columns small-6">C</div>
                     <div class="columns small-6 end expertise">&nbsp;</div>
@@ -303,64 +308,82 @@
                 </div>
 
                 <div class="row">
-                    <div class="columns small-6">Django</div>
-                    <div class="columns small-4 end expertise">&nbsp;</div>
+                    <div class="columns small-6">Java</div>
+                    <div class="columns small-2 end expertise">&nbsp;</div>
                 </div>
 
                 <div class="row">
-                    <div class="columns small-6">Flask</div>
-                    <div class="columns small-6 end expertise">&nbsp;</div>
+                    <div class="columns small-6">JavaScript</div>
+                    <div class="columns small-4 end expertise">&nbsp;</div>
                 </div>
 
                 <div class="row">
-                    <div class="columns small-6">Git</div>
-                    <div class="columns small-4 end expertise">&nbsp;</div>
+                    <div class="columns small-6">Lua</div>
+                    <div class="columns small-2 end expertise">&nbsp;</div>
                 </div>
 
                 <div class="row">
-                    <div class="columns small-6">Java</div>
-                    <div class="columns small-2 end expertise">&nbsp;</div>
+                    <div class="columns small-6">Objective-C</div>
+                    <div class="columns small-6 end expertise">&nbsp;</div>
                 </div>
 
                 <div class="row">
-                    <div class="columns small-6">JavaScript</div>
+                    <div class="columns small-6">PHP</div>
                     <div class="columns small-4 end expertise">&nbsp;</div>
                 </div>
 
                 <div class="row">
-                    <div class="columns small-6">Lua</div>
-                    <div class="columns small-2 end expertise">&nbsp;</div>
+                    <div class="columns small-6">Python</div>
+                    <div class="columns small-6 expertise">&nbsp;</div>
                 </div>
 
+
+				<!-- -->
+				<h3>
+					<i class="fa fa-angle-right blue" aria-hidden="true"></i>
+					Libraries and Frameworks
+				</h3>
+
                 <div class="row">
-                    <div class="columns small-6">MongoDB</div>
-                    <div class="columns small-6 end expertise">&nbsp;</div>
+                    <div class="columns small-6">Django</div>
+                    <div class="columns small-4 end expertise">&nbsp;</div>
                 </div>
 
                 <div class="row">
-                    <div class="columns small-6">Objective-C</div>
+                    <div class="columns small-6">Flask</div>
                     <div class="columns small-6 end expertise">&nbsp;</div>
                 </div>
 
+				<h3>
+					<i class="fa fa-angle-right blue" aria-hidden="true"></i>
+					Version Control
+				</h3>
+
                 <div class="row">
-                    <div class="columns small-6">PHP</div>
+                    <div class="columns small-6">Git</div>
                     <div class="columns small-4 end expertise">&nbsp;</div>
                 </div>
 
                 <div class="row">
-                    <div class="columns small-6">Python</div>
-                    <div class="columns small-6 expertise">&nbsp;</div>
+                    <div class="columns small-6">Subversion</div>
+                    <div class="columns small-4 end expertise">&nbsp;</div>
                 </div>
 
+				<h3>
+					<i class="fa fa-angle-right blue" aria-hidden="true"></i>
+					Databases
+				</h3>
+
                 <div class="row">
                     <div class="columns small-6">SQL</div>
                     <div class="columns small-6 end expertise">&nbsp;</div>
                 </div>
 
                 <div class="row">
-                    <div class="columns small-6">Subversion</div>
-                    <div class="columns small-4 end expertise">&nbsp;</div>
+                    <div class="columns small-6">MongoDB</div>
+                    <div class="columns small-6 end expertise">&nbsp;</div>
                 </div>
+
             </div> <!-- skills -->
         </div>
 
@@ -503,5 +526,32 @@
                 </ul>
             </div>
         </div>
+
+        <div class="row">
+            <div class="columns medium-12">
+                <h2>
+                    <i class="fa fa-angle-right blue" aria-hidden="true"></i>
+                    Events and Meetups
+                </h2>
+            </div>
+        </div>
+
+        <div class="row" id="events">
+			<div class="columns small-12">
+				<h3>
+					<i class="fa fa-angle-right blue" aria-hidden='true'></i>
+					2016
+				</h3>
+
+				<ul>
+					<li><a href="https://braziljs.org/conf">BrazilJS 2016</a></li>
+					<li><a href="http://softwarelivre.org/fisl17">FISL 17</a></li>
+					<li><a href="http://www.cnqs.com.br/">Congresso Nacional de Qualidade de Software</a></li>
+					<li><a href="https://www.devopsdays.org/events/2016-portoalegre/welcome/">DevOpsDays Porto Alegre</a></li>
+					<li><a href="http://poa.tchelinux.org/">Tchê Linux 2016</a></li>
+					<li><a href="http://rsjs.org/2016/">RSJS 2016</a></li>
+				</ul>
+			</div>
+		</div>
     </body>
 </html>