diff --git a/profile/abstract.sty b/profile/abstract.sty
index 55f0e305c4b5a81aa508a01991828ab9f8a2c637..de69d9a286f642b2214728fb97ac70fcace72b8b 100644
--- a/profile/abstract.sty
+++ b/profile/abstract.sty
@@ -85,7 +85,7 @@
     \tl_set:Nn \tabcolsep {0pt}
     \tl_set:Nn \arraystretch {0.8}
     \noindent
-    姣曚笟璁烘枃棰樼洰锛歕 \CJKunderline{\nju_title\hfill} \\
+    姣曚笟璁烘枃棰樼洰锛歕 \nju_underline:n {\nju_title\hfill} \\
     \uline{\makebox[9em]{\nju_major}}涓撲笟\uline{\makebox[3em]{\nju_grade}}绾�
     \str_if_eq:eeTF {\nju_degree} { d } {鍗殅{纭晑
     澹敓濮撳悕锛歕uline{\hfill\nju_student_name\hfill} \\
diff --git a/profile/cover.sty b/profile/cover.sty
index c83c76a222e8de3c43245f331a958b87f254695c..1c3dae9c08c645262f59eef5f2cb6d559b96a65a 100644
--- a/profile/cover.sty
+++ b/profile/cover.sty
@@ -37,7 +37,7 @@
   % 灏侀潰涓嬪垝绾�
   \cs_new:Npn \nju_cover_underline_ug:nn #1 #2 
   {
-    \CJKunderline{\makebox[#1]{\rm\songti#2}}
+    \nju_underline:n {\makebox[#1]{\rm\songti#2}}
   }
  
   % 灏侀潰琛ㄦ牸杈规
@@ -53,7 +53,7 @@
   % 灏侀潰涓嬪垝绾�
   \cs_new:Npn \nju_cover_underline_g:n #1 
   {
-    \CJKunderline{\makebox[215pt]{\rm\kaishu#1}}
+    \nju_underline:n {\makebox[215pt]{\rm\kaishu#1}}
   }
 
   % 灏侀潰琛ㄦ牸杈规
@@ -74,7 +74,7 @@
       % 灏侀潰涓嬪垝绾�
       \cs_new:Npn \nju_cover_underline_nlc:nn #1 #2 
       {
-        \CJKunderline{\makebox[#1]{#2}}
+        \nju_underline:n {\makebox[#1]{#2}}
       }
     }
   }
@@ -82,8 +82,14 @@
 
 % 鍒ゆ柇绫诲瀷
 \str_if_eq:eeTF {\nju_type} {thesis} 
-{\tl_const:Nn \nju_type_name {\nju_degree_name 姣昞hfill 涓歕hfill 璁篭hfill 鏂噠}
-{\tl_const:Nn \nju_type_name {\nju_degree_name 姣昞hfill 涓歕hfill 璁綷hfill 璁}
+{
+  \tl_const:Nn \nju_type_name 
+    { \nju_degree_name 姣昞hfill 涓歕hfill 璁篭hfill 鏂� }
+}
+{
+  \tl_const:Nn \nju_type_name 
+    { \nju_degree_name 姣昞hfill 涓歕hfill 璁綷hfill 璁� }
+}
 
 % 灏侀潰淇℃伅鏍� 鏈
 \tl_new:N \nju_printcoverinfo_ug
@@ -95,7 +101,7 @@
     & \nju_cover_underline_ug:nn {250pt}{\nju_major}\\
 
     % 鏍囬鎹㈣
-    \int_case:nn {\nju_titlelength}
+    \int_case:nn { \nju_titlelength }
       {
         { 1 } { 
           \nju_coverbox_ug:n {棰榎hfill 鐩畗
@@ -130,14 +136,13 @@
     & \nju_cover_underline_ug:nn {90pt}{\nju_mentor_a_title}\\
 
     % 绗簩瀵煎笀
-    \bool_if:NTF \nju_second_mentor
+    \bool_if:NT \nju_second_mentor
     {
-    \nju_coverbox_ug:n {绗琝hfill 浜孿hfill 瀵糪hfill 甯坿
-    & \nju_cover_underline_ug:nn {90pt}{\nju_mentor_b}
-    & \nju_coverbox_ug:n {鑱孿hfill 绉皚
-    & \nju_cover_underline_ug:nn {90pt}{\nju_mentor_b_title}\\
+      \nju_coverbox_ug:n {绗琝hfill 浜孿hfill 瀵糪hfill 甯坿
+      & \nju_cover_underline_ug:nn {90pt}{\nju_mentor_b}
+      & \nju_coverbox_ug:n {鑱孿hfill 绉皚
+      & \nju_cover_underline_ug:nn {90pt}{\nju_mentor_b_title}\\
     }
-    {}
   \end{tabular}\\
 
   \begin{tabular}{p{4.2em}c}
@@ -180,10 +185,12 @@
 
 % 鍥藉鍥句功棣嗗皝闈紝淇敼鑷棫妯℃澘
 \tl_new:N \nju_printcoverinfo_nlc
-\tl_set:Nn \nju_printcoverinfo_nlc {
+\tl_set:Nn \nju_printcoverinfo_nlc 
+{
   \thispagestyle{empty}
   \pdfbookmark[0]{鍥藉鍥句功棣嗗皝闈{nlc}
   {
+    % 椤剁
     \hspace{0mm}
     \vskip -20mm \hskip -15mm
     \songti\zihao{-4}
@@ -196,6 +203,8 @@
     \makebox[40pt][l]{UDC}
     \nju_cover_underline_nlc:nn {150pt}{\nju_udc}
   }
+
+  % 涓儴
   \vskip\stretch{2}
   \begin{center}
     \def\ULthickness{1pt}
@@ -209,10 +218,12 @@
     \vskip \stretch{1}
     {\kaishu\zihao{4}锛堥鍚嶅拰鍓鍚嶏級}
     \vskip \stretch{1}
-    {\kaishu\zihao{1}\CJKunderline{\makebox{\nju_student_name}}}
+    {\kaishu\zihao{1}\nju_underline:n {\makebox{\nju_student_name}}}
     \vskip \stretch{1}
     {\kaishu\zihao{4}锛堜綔鑰呭鍚嶏級}
   \end{center}
+
+  % 搴曢儴
   \vskip\stretch{1}
   {\kaishu\zihao{4}
     \noindent 鎸囧鏁欏笀濮撳悕銆佽亴鍔°€佽亴绉般€佸浣嶃€佸崟浣嶅悕绉板強鍦板潃%
@@ -222,12 +233,12 @@
     \noindent 鐢宠瀛︿綅绾у埆%
     \nju_cover_underline_nlc:nn {8em}{\nju_degree_title}%
     \noindent 涓撲笟鍚嶇О%
-    \CJKunderline{\hfill\nju_major\hfill}\par% 闇€瑕佽皟鏁翠笅鍒掔嚎闀垮害
+    \nju_underline:n {\hfill\nju_major\hfill}\par% 闇€瑕佽皟鏁翠笅鍒掔嚎闀垮害
     \noindent 璁烘枃鎻愪氦鏃ユ湡%
     \nju_cover_underline_nlc:nn {8em}{\nju_submit_date}%
     璁烘枃绛旇京鏃ユ湡%
-    \CJKunderline{\hfill\nju_defend_date\hfill}\par% 闇€瑕佽皟鏁翠笅鍒掔嚎闀垮害
-    \noindent 瀛︿綅鎺堜簣鍗曚綅鍜屾棩鏈焅CJKunderline{\hfill}\par
+    \nju_underline:n {\hfill\nju_defend_date\hfill}\par% 闇€瑕佽皟鏁翠笅鍒掔嚎闀垮害
+    \noindent 瀛︿綅鎺堜簣鍗曚綅鍜屾棩鏈焅nju_underline:n {\hfill}\par
     \noindent\hfill 绛旇京濮斿憳浼氫富甯細%
     \nju_cover_underline_nlc:nn {9em}{\nju_reviewer_chairman}\par
     \noindent\hfill 璇勯槄浜猴細%
@@ -237,8 +248,9 @@
     \noindent\hfill\nju_cover_underline_nlc:nn {9em}{\nju_reviewer_d}\par
     
     \begin{center}
-      \kaishu\zihao{3}\ 骞碶 鏈圽 鏃�
+      \kaishu\zihao{3}\hspace{2em} 骞碶hspace{1em} 鏈圽hspace{1em} 鏃�
     \end{center}
+    \vskip -10mm
     }
   \cleardoublepage
 }
diff --git a/profile/packages.sty b/profile/packages.sty
index aa7c75be1d8e16eed1b9b4273a49e2f6468ccb89..ef06df0d01a350ab59029f70540c0fdc56ed4ec9 100644
--- a/profile/packages.sty
+++ b/profile/packages.sty
@@ -1,20 +1,18 @@
 \ProvidesExplPackage{profile/packages}{2021-09-11}{0.6.0}{NJU Thesis packages used} 
 
 \RequirePackage{expl3}
-\RequirePackage{ifxetex}
 \RequirePackage{fontspec}
-\RequirePackage{CJKfntef} % 鍔犱腑鏂囦笅鍒掔嚎锛岄伩鍏峹eCJKfntef浣縧ualatex澶辨晥
 \RequirePackage[    
     top=2.5cm,
     bottom=2.5cm,
     left=3.2cm,
     right=3.2cm
 ]{geometry}
-\RequirePackage{ifthen}
+% \RequirePackage{ifthen}
 \RequirePackage{xparse}
 % \RequirePackage{etoolbox}
-\RequirePackage{titlesec} % 淇敼绔犺妭鏍囬鍔熻兘鐢盋TeX鎻愪緵
-\RequirePackage{titletoc}
+% \RequirePackage{titlesec} % 淇敼绔犺妭鏍囬鍔熻兘鐢盋TeX鎻愪緵
+\RequirePackage{titletoc} % 淇敼鐩綍鍐呮爣棰樻牸寮�
 % \RequirePackage{appendix} % 瀹氫箟闄勫綍鏍峰紡
 \RequirePackage{fancyhdr} % 璋冩暣椤电湁椤佃剼
 \RequirePackage[hyphens]{url} % generate better linebreaks in the url
@@ -25,6 +23,7 @@
 \RequirePackage{setspace}
 \RequirePackage{lastpage}
 \RequirePackage{emptypage} % 娓呴櫎绌虹櫧椤电殑椤电爜
+
 \RequirePackage{listings} % 浠ｇ爜鐜
 \RequirePackage{enumitem} % 鐢ㄤ簬淇敼鍒楄〃鐜
 \RequirePackage{caption}
@@ -37,15 +36,27 @@
 \RequirePackage{hologo} % 鐢ㄤ簬鐢熸垚鍙互琚彃鍏ヤ功绛剧殑LaTeX logo
 % \RequirePackage{needspace} % Required to prevent page break right after a sectioning command
 % \RequirePackage{xspace} % Better print trailing whitespace
-\sys_if_engine_xetex:T{
-    \RequirePackage{microtype}}
-% \sys_if_engine_luatex:T{ 
-%     \RequirePackage{emoji} 
-%     \setemojifont{Segoe UI Emoji} % For windows. 
-%                                   % Shipped with the best `grinning-face-with-sweat' support.
-%                                   % Use `Apple Color Emoji' for macos 
-%                                   % or `Noto Color Emoji' if you prefer.
-% }
+\sys_if_engine_xetex:T
+{
+    \RequirePackage{microtype}
+
+    % 鍔犱腑鏂囦笅鍒掔嚎锛屼笉鑳界敤浜巐ualatex
+    \RequirePackage{xeCJKfntef} 
+    \cs_new:Npn \nju_underline:n #1 {\CJKunderline{#1}}
+}
+\sys_if_engine_luatex:T{
+    % 鍔犱腑鏂囦笅鍒掔嚎
+    \RequirePackage{lua-ul}
+    \cs_new:Npn \nju_underline:n #1 {\underLine{#1}}
+
+    % emoji鏀寔
+    % \RequirePackage{emoji}
+    % \setemojifont{Segoe~UI~Emoji} % windows
+    % \setemojifont{Apple~Color~Emoji} % macos
+    % \setemojifont{Noto~Color~Emoji}
+    % For windows. 
+    % Shipped with the best `grinning-face-with-sweat' support.
+}
 
 \RequirePackage{blindtext} % 鐢熸垚鐢ㄤ簬娴嬭瘯鐨勫ぇ娈垫棤鎰忎箟鑻辨枃鏂囧瓧
 \RequirePackage{zhlipsum} % 鐢熸垚鐢ㄤ簬娴嬭瘯鐨勫ぇ娈垫棤鎰忎箟涓枃鏂囧瓧