diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4a1b405
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+_gen/
diff --git a/config.toml b/config.toml
index b2fc817..cb0cdcb 100644
--- a/config.toml
+++ b/config.toml
@@ -1,11 +1,20 @@
-languageCode = "en-us"
+baseurl = "https://ericxliu.me"
+languageCode = "en"
 title = "Eric's Personal Page"
 
+paginate = 20
+canonifyurls = true
+
+pygmentsstyle = "b2"
+pygmentscodefences = true
+pygmentscodefencesguesssyntax = true
+
 [params] # theme parameters
     author = "Eric Liu"
     info = "Platform Software & Performance Engineer @Google"
     description = "Eric Liu's personal website"
     keywords = "blog,developer,personal" 
+    avatarurl = "images/avatar.jpg"
 
     # wether you want to hide copyright and credits in the footer
     hideCredits = true
@@ -13,49 +22,30 @@ title = "Eric's Personal Page"
     
 # Social links
 [[params.social]]
-    name = "instagram"
+    name = "Git"
+    icon = "fab fa-github"
     weight = 1
-    url = "https://www.instagram.com/eric_x_liu/"
+    url = "https://git.ericxliu.me"
 [[params.social]]
     name = "linkedin"
+    icon = "fab fa-linkedin"
     weight = 2
     url = "https://www.linkedin.com/in/eric-liu-46648b93/"
-[[params.social]]
-    name = "Reading"
-    weight = 3
-    url = "https://www.goodreads.com/user/show/56889391-eric-liu"
 
 # Menu links
 [[menu.main]]
-    name = "Blog"
-    weight = 1
-    url  = "/posts/"
-[[menu.main]]
-    name = "Plex"
+    name = "PLEX"
     weight = 2
     url  = "https://plex.ericxliu.me"
 [[menu.main]]
-    name = "Git"
-    weight = 3
-    url  = "https://git.ericxliu.me"
-[[menu.main]]
-    name = "Console"
+    name = "CONSOLE"
     weight = 4
     url  = "https://console.ericxliu.me"
 [[menu.main]]
-    name = "Notebook"
+    name = "NOTEBOOK"
     weight = 5
     url  = "https://notebook.ericxliu.me"
 [[menu.main]]
-    name = "Rstudio"
+    name = "RSTUDIO"
     weight = 6
     url  = "https://r.ericxliu.me"
-[[menu.main]]
-    name = "Pihole"
-    weight = 7
-    url  = "https://pihole.ericxliu.me/admin/"
-[[menu.main]]
-    name = "About"
-    weight = 8
-    url = "/about/"
-
diff --git a/run.sh b/run.sh
new file mode 100755
index 0000000..3f5276a
--- /dev/null
+++ b/run.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+WATCH="${HUGO_WATCH:=false}"
+SLEEP="${HUGO_REFRESH_TIME:=-1}"
+HUGO_DESTINATION="${HUGO_DESTINATION:=/output}"
+echo "HUGO_WATCH:" $WATCH
+echo "HUGO_REFRESH_TIME:" $HUGO_REFRESH_TIME
+echo "HUGO_THEME:" $HUGO_THEME
+echo "HUGO_BASEURL" $HUGO_BASEURL
+echo "ARGS" $@
+
+HUGO=/usr/local/sbin/hugo
+echo "Hugo path: $HUGO"
+
+while [ true ]
+do
+    if [[ $HUGO_WATCH != 'false' ]]; then
+	    echo "Watching..."
+        $HUGO server --watch=true --source="/src" --theme="$HUGO_THEME" --destination="$HUGO_DESTINATION" --baseURL="$HUGO_BASEURL" --port=443 --bind="0.0.0.0" "$@" || exit 1
+    else
+	    echo "Building one time..."
+        $HUGO --source="/src" --theme="$HUGO_THEME" --destination="$HUGO_DESTINATION" --baseURL="$HUGO_BASEURL" "$@" || exit 1
+    fi
+
+    if [[ $HUGO_REFRESH_TIME == -1 ]]; then
+        exit 0
+    fi
+    echo "Sleeping for $HUGO_REFRESH_TIME seconds..."
+    sleep $SLEEP
+done