diff --git a/courses.php b/courses.php
index 405a024..bf955ff 100644
--- a/courses.php
+++ b/courses.php
@@ -22,14 +22,25 @@ include "includes/navbar.html";
 ?>
 </header>
 <section class="teaching">
+<article>
+  <header>
+    <h1>genap 2015/2016</h1>
+  </header>
+  <ol>
+    <li><a href="manpro-ti/index.php">Project Management</a></li>
+    <li><a href="kakom-ti/index.php">Computer Security</a></li>
+    <li><a href="kripto-ti/index.php">Cryptography</a></li>
+    <li><a href="os-ti/index.php">Operating System</a></li>
+  </ol>
+</article>
 <article>
   <header>
     <h1>Gasal 2015/2016</h1>
   </header>
   <ol>
-    <li><a href="adminjar-ti/index.php">Network Administration</a></li>
-    <li><a href="kakom-ti/index.php">Computer Security</a></li>
-    <li><a href="tekkom-ti/index.php">Computer Technology</a></li>
+    <li>Network Administration</li>
+    <li>Computer Security</li>
+    <li>Computer Technology</li>
   </ol>
 </article>
 <article>
diff --git a/includes/courses.php b/includes/courses.php
index 7d492af..8ae9fe2 100644
--- a/includes/courses.php
+++ b/includes/courses.php
@@ -4,9 +4,11 @@
     <li>|</li>
     <li><a href="../kakom-ti/">CompSec</a></li>
     <li>|</li>
-    <li><a href="../tekkom-ti/">CompTech</a></li>
+    <li><a href="../kripto-ti/">Crypto</a></li>
     <li>|</li>
-    <li><a href="../adminjar-ti/">NetAdmin</a></li>
+    <li><a href="../manpro-ti/">Proj Mngmt</a></li>
+    <li>|</li>
+    <li><a href="../os-ti/">OS</a></li>
   </ul>
 </nav>
 
diff --git a/index.php b/index.php
index 0cde906..454ab2f 100644
--- a/index.php
+++ b/index.php
@@ -24,7 +24,7 @@ include "includes/navbar.html";
 <section class="right">
 <section class="quotes">
 <?php
-include "includes/quotes.php";
+#include "includes/quotes.php";
 ?>
 </section>
 
@@ -50,19 +50,11 @@ include "includes/quotes.php";
   <article>
     <header>
       <h3>My classes next semester</h3>
-      <span><time datetime="2015-07-27">July 27, 2015</time></span>
+      <span><time datetime="2016-01-07">July 27, 2015</time></span>
     </header>
-    <p>I will be teaching Computer Technology, Computer Security, and Network Administration for regular program.</p>
+    <p>I will be teaching Computer Security, Cryptography, Operating System, and Project Management.</p>
   </article>
-  <article>
-    <header>
-      <h3>Thesis Topics</h3>
-      <span><time datetime="2013-04-26">April 26, 2013</time></span>
-    </header>
-    <p>I have added a link to Thesis topics that i'm interested in. Please have a look on the page if you are planning to take thesis course next semester.</p>
-  </article> 
-  <article>
-    <header>
+  <header>
       <h3>HTML5 and CSS 3 Compliance</h3>
       <span><time datetime="2012-06-14">June 14, 2012</time></span>
     </header>
diff --git a/kakom-ti/index.php b/kakom-ti/index.php
index 32081f8..98c6c2c 100644
--- a/kakom-ti/index.php
+++ b/kakom-ti/index.php
@@ -24,9 +24,7 @@ include "../includes/courses.php";
     <h3>Jadwal</h3>
   </header>
   <aside>
-    <p>Grup A<br/>Hari Selasa<br/>Jam 16.30<br/>Ruang </p>
-    <hr/>
-    <p>Grup B<br/>Hari Kamis<br/>Jam 13.30<br/>Ruang </p>
+    <p>Grup A<br/>Hari Senin<br/>Jam 11.30<br/>Ruang </p>
   </aside>
 </section>
 <section class="classinfo">
diff --git a/kripto-ti/index.php b/kripto-ti/index.php
index fd46e5f..cea582b 100644
--- a/kripto-ti/index.php
+++ b/kripto-ti/index.php
@@ -24,7 +24,7 @@ include "../includes/courses.php";
     <h3>Jadwal</h3>
   </header>
   <aside>
-    <p>Grup <br/>Hari <br/>Jam <br/>Ruang </p>    
+    <p>Grup A<br/>Hari Rabu<br/>Jam 16.30<br/>Ruang </p>    
   </aside>
 </section>
 <section class="classinfo">
@@ -70,7 +70,9 @@ include "../includes/courses.php";
   </header>
 <ol>
   <li>Introduction to Modern Cryptography (Jonathan Katz, Yehuda Lindell, Chapman &amp; Hall)</li>
-  <li>Handbook of Applied Cryptography (Alfred J. Menezes, Paul C. van Oorschot, Scott A. Vanstone, CRC Press)</li>
+  <li><a href="http://cacr.uwaterloo.ca/hac/">Handbook of Applied Cryptography</a> (Alfred J. Menezes, Paul C. van Oorschot, Scott A. Vanstone, CRC Press)</li>
+  <li>Coursera Course: <a href="https://www.coursera.org/course/crypto">Cryptography</a> (Dan Boneh - Stanford)</li>
+  <li>Coursera Course: <a href="https://www.coursera.org/course/cryptography">Cryptography</a> (Jonathan Katz - University of Maryland)</li>
 </section>
 <?php
 include "../includes/footer.php";
diff --git a/manpro-ti/index.php b/manpro-ti/index.php
index 2ed58fc..e39eae9 100644
--- a/manpro-ti/index.php
+++ b/manpro-ti/index.php
@@ -24,7 +24,7 @@ include "../includes/courses.php";
     <h3>Jadwal</h3>
   </header>
   <aside>
-    <p>Grup <br/>Hari <br/>Jam <br/>Ruang</p>
+    <p>Grup B<br/> Kamis<br/>Hari 07.30 - 10.20<br/>Jam <br/>Ruang</p>
   </aside>
 </section>
 <section class="classinfo">
diff --git a/os-ti/index.php b/os-ti/index.php
index c82732f..052ca08 100644
--- a/os-ti/index.php
+++ b/os-ti/index.php
@@ -24,7 +24,7 @@ include "../includes/courses.php";
     <h3>Jadwal</h3>
   </header>
   <aside>
-    <p>Hari Senin<br/>Jam 11.30<br/>Ruang H.2.5</p>
+    <p>Grup B<br/>Hari Kamis<br/>Jam 16.30<br/>Ruang </p>
   </aside>
 </section>
 <section class="classinfo">