diff --git a/_config.yml b/_config.yml
index a89302b92c..10e5da84c1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -675,13 +675,16 @@ baidu_push: false
 #
 # API Documentation:
 # https://developers.google.com/google-apps/calendar/v3/reference/events/list
+# Enabled APIs and services
+# api_key: https://console.developers.google.com/
+# Create & manage a public Google calendar: https://support.google.com/calendar/answer/37083?hl=en
 calendar:
   enable: false
-  calendar_id: <required>
+  calendar_id: <required> # Your Google account E-Mail
   api_key: <required>
   orderBy: startTime
-  offsetMax: 24
-  offsetMin: 4
+  offsetMax: 24 # Time Range
+  offsetMin: 4 # Time Range
   timeZone:
   showDeleted: false
   singleEvents: true
diff --git a/layout/_layout.swig b/layout/_layout.swig
index 1c5bb3846e..823df861b3 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -109,6 +109,7 @@
   {% include '_third-party/analytics/lean-analytics.swig' %}
   {% include '_third-party/analytics/firestore.swig' %}
   {% include '_third-party/seo/baidu-push.swig' %}
+  {% include '_third-party/schedule.swig' %}
   {% include '_third-party/math/index.swig' %}
   {% include '_third-party/needsharebutton.swig' %}
   {% include '_third-party/rating.swig' %}
diff --git a/layout/page.swig b/layout/page.swig
index be968fd181..fba8c38922 100644
--- a/layout/page.swig
+++ b/layout/page.swig
@@ -8,6 +8,8 @@
     #}{{ __('title.category') + page_title_suffix }}{#
   #}{% elif page.type === "tags" and not page.title %}{#
     #}{{ __('title.tag') + page_title_suffix }}{#
+  #}{% elif page.type === "schedule" and not page.title %}{#
+    #}{{ __('title.schedule') + page_title_suffix }}{#
   #}{% else %}{#
     #}{{ page.title + page_title_suffix }}{#
   #}{% endif %}{#
@@ -58,6 +60,8 @@
               {{ list_categories() }}
             </div>
           </div>
+        {% elif page.type === 'schedule' %}
+          {% include 'schedule.swig' %}
         {% else %}
           {{ page.content }}
         {% endif %}
diff --git a/layout/schedule.swig b/layout/schedule.swig
index e1d3c04eee..9e7b747425 100644
--- a/layout/schedule.swig
+++ b/layout/schedule.swig
@@ -1,10 +1,3 @@
-{% extends '_layout.swig' %}
-{% import '_macro/sidebar.swig' as sidebar_template %}
-
-{% block title %}{{ __('title.schedule') }} | {{ title }}{% endblock %}
-
-{% block page_class %}page-post-detail page-calendar{% endblock %}
-
 {% block content %}
   {######################}
   {### SCHEDULE BLOCK ###}
@@ -19,7 +12,3 @@
   {### END SCHEDULE BLOCK ###}
   {##########################}
 {% endblock %}
-
-{% block sidebar %}
-  {{ sidebar_template.render(false) }}
-{% endblock %}
diff --git a/source/css/_common/components/pages/schedule.styl b/source/css/_common/components/pages/schedule.styl
index 18ec9334ad..5e64a6593e 100644
--- a/source/css/_common/components/pages/schedule.styl
+++ b/source/css/_common/components/pages/schedule.styl
@@ -71,8 +71,9 @@
     }
     li.event-past {
       background: #FCFCFC
+	  padding: 15px 0 15px 10px
       & > * {
-        opacity: .6
+        opacity: .9
       }
       h2.event-summary {
         color: #bbb
@@ -96,6 +97,22 @@
         color: #FFF!important
       }
     }
+	
+    li.event-future {
+      background: #222
+      color: #FFF
+      padding: 15px 0 15px 10px
+      h2.event-summary {
+        &:before {
+          transform: scale(1.2)
+          color: #FFF
+          animation: dot-flash 1s alternate infinite ease-in-out;
+        }
+      }
+      * {
+        color: #FFF!important
+      }
+    }
   }
 }