diff --git a/adminjar-ti/index.php b/adminsis-ti/index.php
similarity index 74%
rename from adminjar-ti/index.php
rename to adminsis-ti/index.php
index 7f2a6e7..85e3e4e 100644
--- a/adminjar-ti/index.php
+++ b/adminsis-ti/index.php
@@ -1,8 +1,8 @@
 <!DOCTYPE html> 
 <head>
 <title>Willy Sudiarto Raharjo - Network Administration</title>
-<meta name="keywords" content="Willy, Willy Sudiarto Raharjo, Willy SR, WillySR, UKDW, Dosen, Universitas Kristen Duta Wacana, Administrasi Jaringan, Teknik Informatika" />
-<meta name="description" content="Situs ini berisi halaman materi untuk kelas Administrasi Jaringan Universitas Kristen Duta Wacana" />
+<meta name="keywords" content="Willy, Willy Sudiarto Raharjo, Willy SR, WillySR, UKDW, Dosen, Universitas Kristen Duta Wacana, Administrasi Sistem, Teknik Informatika" />
+<meta name="description" content="Situs ini berisi halaman materi untuk kelas Administrasi Sistem Universitas Kristen Duta Wacana" />
 <link rel="icon" href="../images/favicon.ico" type="image/ico" />
 <style type="text/css">
 @import "../includes/index.css";
@@ -18,13 +18,13 @@ include "../includes/functions.php";
 include "../includes/courses.php";
 ?>
 </header>
-<section class="title">Network Administration</section>
+<section class="title">System Administration</section>
 <section class="sidebar">
   <header>
     <h3>Jadwal</h3>
   </header>
   <aside>
-    <p>Grup A<br/>Hari Selasa<br/>Jam 13.30<br/>Ruang Lab H</p>
+    <p>Grup A<br/>Hari Senin<br/>Jam 14.30<br/>Ruang Lab A</p>
   </aside>
 </section>
 <section class="classinfo">
@@ -38,7 +38,7 @@ include "../includes/courses.php";
     <header>
       <h1>PENGANTAR</h1>
     </header>
-    <p>Matakuliah disajikan untuk membangun basis pengetahuan dan ketrampilan di bidang administrasi jaringan, terutama pada server berbasis LINUX.</p>
+    <p>Matakuliah disajikan untuk membangun basis pengetahuan dan ketrampilan di bidang administrasi sistem, terutama pada server berbasis LINUX.</p>
   </section>
 </section>
 
@@ -48,13 +48,14 @@ include "../includes/courses.php";
   </header>
   <ol>
     <li>Syllabus</li>
-    <li>Introduction to Linux</li>
-    <li>Shell and Shell Scripting</li>
-    <li>Software Installation and Package Management</li>
+    <li>Introduction to Server Operating System</li>
+    <li>Bash Shell and Shell Scripting</li>
     <li>Single Host Administration</li>
-    <li>Internet Services (HTTP, FTP, DNS, DHCP, SSH, etc)</li>
-    <li>Intranet Services (NFS, NIS, Samba, etc)</li>
-    <li>Firewall</li>
+    <li>Software Installation and Package Management</li>
+    <li>System Automation</li>
+    <li>Internet Services</li>
+    <li>Intranet Services</li>
+    <li>Database Tuning</li>
   </ol>
 </section>
 <section class="references">
@@ -64,6 +65,7 @@ include "../includes/courses.php";
   <ol>
     <li>Linux Administration : A Beginner's Guide 6/E (Wale Soyinka - McGraw-Hill)</li>
     <li>Unix and Linux System Administration Handbook 4/E (Evi Nemeth et all - Prentice Hal</li>
+    <li>Mastering Unix Shell Scripting (Michael - Wiley)</li>
   </ol>
 </section>
 <?php
diff --git a/courses.php b/courses.php
index 4545fad..f76e5d3 100644
--- a/courses.php
+++ b/courses.php
@@ -22,14 +22,25 @@ include "includes/navbar.html";
 ?>
 </header>
 <section class="teaching">
+<article>
+  <header>
+    <h1>Gasal 2017/2018</h1>
+  </header>
+  <ol>
+    <li><a href="adminsis-ti/index.php">System Administration</a></li>
+    <li><a href="os-ti/index.php">Operating System</a></li>
+    <li>Computer Network</li>
+    <li><a href="kakom-ti/index.php">Computer Security</a></li>
+  </ol>
+</article>
 <article>
   <header>
     <h1>Genap 2016/2017</h1>
   </header>
   <ol>
-    <li><a href="techno-ti/index.php">Technopreneurship</a></li>
-    <li><a href="os-ti/index.php">Operating System</a></li>
-    <li><a href="manpro-ti/index.php">Project Management</a></li>
+    <li>Technopreneurship</li>
+    <li>Operating System</li>
+    <li>Project Management</li>
   </ol>
 </article>
 <article>
diff --git a/includes/courses.php b/includes/courses.php
index 6f84d6c..55cac60 100644
--- a/includes/courses.php
+++ b/includes/courses.php
@@ -4,9 +4,9 @@
     <li>|</li>
     <li><a href="../os-ti/">OpSys</a></li>
     <li>|</li>
-    <li><a href="../techno-ti/">Techno</a></li>
+    <li><a href="../adminsis-ti/">SysAdmin</a></li>
     <li>|</li>
-    <li><a href="../manpro-ti/">Proj Mngmt</a></li>
+    <li><a href="../kakom-ti/">CompSec</a></li>
   </ul>
 </nav>
 
diff --git a/index.php b/index.php
index b9b9eaf..82c684f 100644
--- a/index.php
+++ b/index.php
@@ -50,16 +50,9 @@ include "includes/quotes.php";
   <article>
     <header>
       <h3>My classes next semester</h3>
-      <span><time datetime="2017-06-21">January 21, 2017</time></span>
+      <span><time datetime="2017-08-20">August 20, 2017</time></span>
     </header>
-    <p>I will be teaching Operating System, Technopreneurship, and Project Management.</p>
-  </article>
-  <article>
-    <header>
-      <h3>HTML5 and CSS 3 Compliance</h3>
-      <span><time datetime="2012-06-14">June 14, 2012</time></span>
-    </header>
-    <p>I have migrated this simple web page to be <a href="http://html5.org/">HTML5</a> and <a href="http://www.w3.org/Style/CSS/current-work.en.html">CSS 3</a> compliance. If for some reason you experienced difficulties viewing this page properly, then i suggest you to update your browser to the latest version.</p>
+    <p>I will be teaching Operating System, Computer Network, System Administration, and Computer Security.</p>
   </article>
 </section>
 <?php
diff --git a/kakom-ti/index.php b/kakom-ti/index.php
index c72dfcf..b555252 100644
--- a/kakom-ti/index.php
+++ b/kakom-ti/index.php
@@ -1,4 +1,4 @@
-<!DOCTYPE html> 
+<!DOCTYPE html>
 <head>
 <title>Willy Sudiarto Raharjo - Computer Security</title>
 <meta name="keywords" content="Willy, Willy Sudiarto Raharjo, Willy SR, WillySR, UKDW, Dosen, Universitas Kristen Duta Wacana, Keamanan Komputer, Teknik Informatika" />
@@ -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 10:30 - 13:20<br/>Ruang </p>
   </aside>
 </section>
 <section class="classinfo">
@@ -48,23 +48,30 @@ include "../includes/courses.php";
   </header>
   <ol>
     <li>Syllabus</li>
-    <li>Introduction to Computer Security</li>
-    <li>Low Level Security</li>
-    <li>Attacks on Low Level Security</li>
-    <li>Introduction to Web</li>
-    <li>Attacks on the Web Platform</li>
-    <li>Web 2.0 Attacks</li>
+    <li>Introduction to Security</li>
+    <li>People, Operational, and Organizational Security</li>
+    <li>Access Control Models</li>
+    <li>Access Control Mechanism (Authentication)</li>
+    <li>Access Control Mechanism (Authorization)</li>
+    <li>Personal Security</li>
     <li>Malware</li>
-    <li>Introduction to Cryptography</li>
-    <li>Modern Cryptography</li>
-    <li>Cryptography Applications</li>
-    <li>Networking Basics</li>
-    <li>Network Attacks</li>
+    <li>Secure Software Development</li>
+    <li>Low Level Attacks</li>
+    <li>Web Concepts</li>
+    <li>Web Security</li>
     <li>Network Security</li>
     <li>Wireless Security</li>
   </ol>
 </section>
 <section class="references">
+ <header>
+  <h1>REFERENSI</h1>
+ </header>
+ <ol>
+  <li>Principles of Computer Security,4th Edition. Official Comptia Guide. (Conklin, White - McGraw-Hill)</li>
+  <li>Information Security (Mark Stamp - Wiley)</li>
+  <li>Guide to Computer Network Security (Kizza - Springer)</li>
+ </ol>
 </section>
 <?php
 include "../includes/footer.php";
