diff --git a/yatexmth.el b/yatexmth.el
index e705a1d..a1402bd 100644
--- a/yatexmth.el
+++ b/yatexmth.el
@@ -1,7 +1,7 @@
 ;;; yatexmth.el --- YaTeX math-mode-specific functions -*- coding: sjis -*-
 ;;; 
 ;;; (c)1993-2017 by HIROSE Yuuji [yuuji@yatex.org]
-;;; Last modified Mon Mar  6 17:41:31 2017 on firestorm
+;;; Last modified Tue May 23 11:32:21 2017 on firestorm
 ;;; $Id$
 
 ;;; Commentary:
@@ -347,53 +347,72 @@
 ;;)
 
 (defvar YaTeX-greek-key-alist-default
-  '(
-    ("a"	"alpha"		("a" "��"))
-    ("b"	"beta"		("|>\n|>\n|" "��"))
-    ("g"	"gamma"		("~r" "��"))
-    ("G"	"Gamma"		("|~" "��"))
-    ("d"	"delta"		("<~\n<>" "��"))
-    ("D"	"Delta"		("/\\\n~~" "��"))
-    ("e"	"epsilon"	"<\n<~")
-    ("e-"	"varepsilon"	("(\n(~" "��"))
-    ("z"	"zeta"		("(~\n >" "��"))
-    ("et"	"eta"		("n\n/" "��"))
-    ("th"	"theta"		("8" "��"))
-    ("Th"	"Theta"		("(8)" "��"))
-    ("th-"	"vartheta"	("-8" "-��"))
-    ("i"	"iota"		("i\n\\_/" "��"))
-    ("k"	"kappa"		("k" "��"))
-    ("l"	"lambda"	("\\n/\\" "��"))
-    ("L"	"Lambda"	("/\\" "��"))
-    ("m"	"mu"		(" u_\n/" "��"))
-    ("n"	"nu"		("|/" "��"))
-    ("x"	"xi"		("E\n >" "��"))
-    ("X"	"Xi"		("---\n -\n---" "��"))
-    ("p"	"pi"		("__\n)(" "��"))
-    ("P"	"Pi"		("__\n||" "��"))
-    ("p-"	"varpi"		("_\nw" "__\n��"))
-    ("r"	"rho"		("/O" "��"))
-    ("r-"	"varrho"	("/O\n~~" "��\n~~"))
-    ("s"	"sigma"		("o~" "��"))
-    ("S"	"Sigma"		("\\-+\n >\n/-+" "��"))
-    ("s-"	"varsigma"	"(~~ \n>")
-    ("t"	"tau"		("__\n(" "��"))
-    ("u"	"upsilon"	("~v" "��"))
-    ("y"	"upsilon"	("~v" "��"))
-    ("U"	"Upsilon"	("~Y~" "��"))
-    ("Y"	"Upsilon"	("~Y~" "��"))
-    ("ph"	"phi"		("  /\n(/)\n/" "��"))
-    ("Ph"	"Phi"		(" _\n(|)\n ~" "��"))
-    ("ph-"	"varphi"	"\\O\n|")
-    ("c"	"chi"		("x" "��"))
-    ("ps"	"psi"		("\\|/\\n |" "��"))
-    ("Ps"	"Psi"		(" ~\n\\|/\\n |" "��"))
-    ("o"	"omega"		("w" "��"))
-    ("w"	"omega"		("w" "��"))
-    ("O"	"Omega"		("(~)\n~ ~" "��"))
-    ("W"	"Omega"		("(~)\n~ ~" "��"))
-    ("f" "foo")
-    )
+  (append
+   '(
+     ("a"	"alpha"		("a" "��"))
+     ("b"	"beta"		("|>\n|>\n|" "��"))
+     ("g"	"gamma"		("~r" "��"))
+     ("G"	"Gamma"		("|~" "��"))
+     ("d"	"delta"		("<~\n<>" "��"))
+     ("D"	"Delta"		("/\\\n~~" "��"))
+     ("e"	"epsilon"	"<\n<~")
+     ("e-"	"varepsilon"	" <\n<~")
+     ("e-"	"varepsilon"	("(\n(~" "��"))
+     ("z"	"zeta"		("(~\n >" "��"))
+     ("et"	"eta"		("n\n/" "��"))
+     ("th"	"theta"		("8" "��"))
+     ("th-"	"vartheta"	(" o\no" "��"))
+     ("Th"	"Theta"		("(8)" "��"))
+     ("th-"	"vartheta"	("-8" "-��"))
+     ("i"	"iota"		("i\n\\_/" "��"))
+     ("k"	"kappa"		("k" "��"))
+     ("l"	"lambda"	("\\n/\\" "��"))
+     ("L"	"Lambda"	("/\\" "��"))
+     ("m"	"mu"		(" u_\n/" "��"))
+     ("n"	"nu"		("|/" "��"))
+     ("x"	"xi"		("E\n >" "��"))
+     ("X"	"Xi"		("---\n -\n---" "��"))
+     ("p"	"pi"		("__\n)(" "��"))
+     ("p-"	"varpi"		(" __\n)(" "��"))
+     ("P"	"Pi"		("__\n||" "��"))
+     ("p-"	"varpi"		("_\nw" "__\n��"))
+     ("r"	"rho"		("/O" "��"))
+     ("r-"	"varrho"	("~O" "��"))
+     ("r-"	"varrho"	("/O\n~~" "��\n~~"))
+     ("s"	"sigma"		("o~" "��"))
+     ("s-"	"varsigma"	("o~~" "��"))
+     ("S"	"Sigma"		("\\-+\n >\n/-+" "��"))
+     ("s-"	"varsigma"	"(~~ \n>")
+     ("t"	"tau"		("__\n(" "��"))
+     ("u"	"upsilon"	("~v" "��"))
+     ("y"	"upsilon"	("~v" "��"))
+     ("U"	"Upsilon"	("~Y~" "��"))
+     ("Y"	"Upsilon"	("~Y~" "��"))
+     ("ph"	"phi"		("  /\n(/)\n/" "��"))
+     ("ph-"	"varphi"	("   /\n(/)\n/" "��"))
+     ("Ph"	"Phi"		(" _\n(|)\n ~" "��"))
+     ("ph-"	"varphi"	"\\O\n|")
+     ("c"	"chi"		("x" "��"))
+     ("ps"	"psi"		("\\|/\\n |" "��"))
+     ("Ps"	"Psi"		(" ~\n\\|/\\n |" "��"))
+     ("o"	"omega"		("w" "��"))
+     ("w"	"omega"		("w" "��"))
+     ("O"	"Omega"		("(~)\n~ ~" "��"))
+     ("W"	"Omega"		("(~)\n~ ~" "��"))
+     ("f" "foo")
+     )
+   (if YaTeX-use-AMS-LaTeX
+       '(
+	 ("G-"	"varGamma"	("/~" "_��"))
+	 ("D-"	"varDelta"	("/|\n~~" "_��"))
+	 ("Th-"	"varTheta"	("/8/" "_��"))
+	 ("L-"	"varLambda"	("/|" "_��"))
+	 ("X-"	"varXi"		(" --\n -\n-- " "_��"))
+	 ("S-"	"varSigma"	(" \\-+\n >\n/-+" "_��"))
+	 ("U-"	"varUpsilon"	("~~Y~" "_��"))
+	 ("Ph-"	"varPhi"	("  _\n(|)\n~" "_��"))
+	 ("Ps-"	"varPsi"	("  ~\n\\//\\n /" "��"))
+	 ("O-"	"varOmega"	("/~/\n~ ~" "_��")))))
   "Default LaTeX-math-command alist.")
 
 (defvar YaTeX-greek-key-alist-private nil
diff --git a/yatexpkg.el b/yatexpkg.el
index e0bd434..9de2073 100644
--- a/yatexpkg.el
+++ b/yatexpkg.el
@@ -1,7 +1,7 @@
 ;;; yatexpkg.el --- YaTeX package manager -*- coding: sjis -*-
 ;;; 
 ;;; (c)2003-2017 by HIROSE, Yuuji [yuuji@yatex.org]
-;;; Last modified Mon Mar  6 17:39:08 2017 on firestorm
+;;; Last modified Tue May 23 11:33:17 2017 on firestorm
 ;;; $Id$
 
 ;;; Code:
@@ -34,6 +34,8 @@
      		(section "tag" "tag*"))
     ("amssymb"	(maketitle "leqq" "geqq" "mathbb" "mathfrak"
 			   "fallingdotseq" "therefore" "because"
+			   "varDelta" "varTheta" "varLambda" "varXi" "varPi"
+			   "varSigma" "varUpsilon" "varPhi" "varPsi" "varOmega"
 			   "lll" "ggg")) ;very few.  Please tell us!
     ("mathrsfs"	(section "mathscr"))
     ("graphicx" (section "includegraphics"