diff --git a/yatexmth.el b/yatexmth.el
index a1402bd..14c3bd4 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 Tue May 23 11:32:21 2017 on firestorm
+;;; Last modified Tue May 23 11:41:17 2017 on firestorm
 ;;; $Id$
 
 ;;; Commentary:
@@ -348,22 +348,19 @@
 
 (defvar YaTeX-greek-key-alist-default
   (append
-   '(
-     ("a"	"alpha"		("a" "��"))
+   '(("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(~" "��"))
+     ("e-"	"varepsilon"	("(\n(~" "_��"))
      ("z"	"zeta"		("(~\n >" "��"))
      ("et"	"eta"		("n\n/" "��"))
      ("th"	"theta"		("8" "��"))
-     ("th-"	"vartheta"	(" o\no" "��"))
      ("Th"	"Theta"		("(8)" "��"))
-     ("th-"	"vartheta"	("-8" "-��"))
+     ("th-"	"vartheta"	("-8" "_��"))
      ("i"	"iota"		("i\n\\_/" "��"))
      ("k"	"kappa"		("k" "��"))
      ("l"	"lambda"	("\\n/\\" "��"))
@@ -373,23 +370,19 @@
      ("x"	"xi"		("E\n >" "��"))
      ("X"	"Xi"		("---\n -\n---" "��"))
      ("p"	"pi"		("__\n)(" "��"))
-     ("p-"	"varpi"		(" __\n)(" "��"))
      ("P"	"Pi"		("__\n||" "��"))
-     ("p-"	"varpi"		("_\nw" "__\n��"))
+     ("p-"	"varpi"		("__\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>")
+     ("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" "��"))
@@ -399,8 +392,7 @@
      ("w"	"omega"		("w" "��"))
      ("O"	"Omega"		("(~)\n~ ~" "��"))
      ("W"	"Omega"		("(~)\n~ ~" "��"))
-     ("f" "foo")
-     )
+     ("f" "foo"))
    (if YaTeX-use-AMS-LaTeX
        '(
 	 ("G-"	"varGamma"	("/~" "_��"))