diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..3daa09fa69cc3d899e0042138b416b340d6fd85a
Binary files /dev/null and b/.DS_Store differ
diff --git a/.gitignore b/.gitignore
index f569c0d51139da45cea21ccc7cf2e8563e7722c3..3e3768d8ffb01515b5433ee00ce57583c564a5cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,4 @@
 *.vrb
 *.rej
 *.orig
-*.tmp
+*.tmp
\ No newline at end of file
diff --git a/article/Makefile b/article/Makefile
index 689f68122e9b694891f07e8bc4380d5d6ac88702..0f27d94d20011a29898ff06f68ab05495d178e98 100644
--- a/article/Makefile
+++ b/article/Makefile
@@ -4,6 +4,8 @@ PDFS=$(SRC:.md=.pdf)
 LATEX_TEMPLATE=./templates/default.latex
 LATEX_HEADER=./templates/header.tex
 
+MAINFONT='AR PL SungtiL GB'
+
 pdf: clean $(PDFS)
 
 all: clean $(PDFS)
@@ -13,6 +15,8 @@ all: clean $(PDFS)
 	  --latex-engine=xelatex \
 	  --template=$(LATEX_TEMPLATE) \
 	  -H $(LATEX_HEADER) \
+	  -V mainfont=$(MAINFONT)\
+	  -V CJKmainfont=$(MAINFONT)\
 	  -f markdown $< -o $@
 
 read: $(PDFS)
diff --git a/article/templates/header.tex b/article/templates/header.tex
index cefd8a7b57edf25ac4598401b7805b41d49a4a18..f38af8bbaecb0ae6a3fc4d96dfb8a8eb12a3827c 100644
--- a/article/templates/header.tex
+++ b/article/templates/header.tex
@@ -1,8 +1,8 @@
 \usepackage[top=1in, bottom=1in, left=1in, right=1in]{geometry}
 \ifxetex
   \usepackage{xeCJK}
-  \setCJKmainfont{AR PL KaitiM GB}   % 中文字体
-  \setmainfont[Mapping=tex-text]{AR PL SungtiL GB} % 英文字体
+  % \setCJKmainfont{AR PL KaitiM GB}   % 中文字体
+  % \setmainfont[Mapping=tex-text]{AR PL SungtiL GB} % 英文字体
 %  \setromanfont{Latin Modern Roman}
 %  \setmonofont{Ubuntu Mono}
   \renewcommand\contentsname{目 录}
diff --git a/book b/book
deleted file mode 160000
index d864ae275bdbf0a79e9962740fd5a1841ccf3441..0000000000000000000000000000000000000000
--- a/book
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d864ae275bdbf0a79e9962740fd5a1841ccf3441
diff --git a/book/.DS_Store b/book/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..cb3dae01fc1d39ab79f4377c322256012dfeb12b
Binary files /dev/null and b/book/.DS_Store differ
diff --git a/resume/Makefile b/resume/Makefile
index eca2156d9e2ec2fc94f6508d40fd68f1b99d26a6..ecc3ca8e98f207eddc5a5bf1c31d69f37b3fd83e 100755
--- a/resume/Makefile
+++ b/resume/Makefile
@@ -8,6 +8,8 @@ LATEX_TEMPLATE=./templates/default.latex
 LATEX_HEADER=./templates/header.tex
 HTML_CSS=./templates/resume.css
 
+MAINFONT='AR PL SungtiL GB'
+
 all:    clean $(PDFS) $(HTML)
 
 pdf:   clean $(PDFS)
@@ -20,6 +22,7 @@ html:  clean $(HTML)
 %.pdf:  %.md $(LATEX_TEMPLATE)
 	python resume.py tex < $< \
 	  | pandoc --latex-engine=xelatex \
+		  -V mainfont=$(MAINFONT)\
 	      --template=$(LATEX_TEMPLATE) \
 	      -H $(LATEX_HEADER) -o $@
 
diff --git a/resume/templates/header.tex b/resume/templates/header.tex
index 33401f76a5973d88a67b54ee67a8d83c6254a5ea..f54bed568943a9cb684115f944ce9a2f3a3e09c4 100644
--- a/resume/templates/header.tex
+++ b/resume/templates/header.tex
@@ -2,8 +2,8 @@
 %\usepackage{tgpagella}
 \ifxetex
   \usepackage{xeCJK}
-  \setCJKmainfont{AR PL KaitiM GB}   % 中文字体
-  \setmainfont[Mapping=tex-text]{AR PL SungtiL GB} % 英文字体
+%  \setCJKmainfont{AR PL KaitiM GB}   % 中文字体
+ \setmainfont[Mapping=tex-text]{AR PL SungtiL GB} % 英文字体
 %  \setromanfont{Latin Modern Roman}
 %  \setmonofont{Ubuntu Mono}
 \fi
diff --git a/slides/Makefile b/slides/Makefile
index f76f6400c62b4c01991abb256d9382ea48a0ed75..ca477835b41873d4c2b9235498a0e23bf8bfe6be 100644
--- a/slides/Makefile
+++ b/slides/Makefile
@@ -29,6 +29,8 @@ PDFS=$(SRC:.md=.pdf)
 HTML=$(SRC:.md=.html)
 IMGS=$(wildcard images/*.jpg)
 
+mainfont = AR PL SungtiL GB
+
 all: clean $(PDFS) $(HTML)
 
 pdf: $(PDFS)
@@ -51,6 +53,7 @@ html: $(HTML)
 	  -V colortheme:$(latex_colortheme) \
 	  -V theme:$(latex_theme) \
 	  -V fontsize:$(latex_fontsize) \
+	  -V mainfont='$(mainfont)'\
 	  $<.tmp -o $@
 	rm $<.tmp
 
diff --git a/slides/templates/zh_template.tex b/slides/templates/zh_template.tex
index fbc0e69301340dd8e4c89a089f02063600d2e70f..3ee9191304167dde39397972a30ea0aa41f88acf 100644
--- a/slides/templates/zh_template.tex
+++ b/slides/templates/zh_template.tex
@@ -6,6 +6,10 @@ $if(colortheme)$
 \usecolortheme{$colortheme$}
 $endif$
 
+\providecommand{\tightlist}{%
+  \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}}
+
+
 % Hide navigation bar
 \setbeamertemplate{navigation symbols}{}
 \useoutertheme{shadow}
@@ -40,8 +44,12 @@ $endif$
 \usepackage{fixltx2e} % provides \textsubscript
 \ifxetex
   \usepackage{xeCJK}                 % 设置中英文字体
-  \setCJKmainfont{AR PL KaitiM GB}   % 中文字体
-  \setmainfont{AR PL SungtiL GB}     % 英文字体
+  $if(mainfont)$
+  \setCJKmainfont{$mainfont$}   % 中文字体
+    \setmainfont{AR PL SungtiL GB}
+  $endif$
+  % \setCJKmainfont{AR PL KaitiM GB}   % 中文字体
+  % \setmainfont{AR PL SungtiL GB}     % 英文字体
 %  \setromanfont{Latin Modern Roman}
 %  \setmonofont{Ubuntu Mono}
   \linespread{1.2}\selectfont        % 行距