diff --git a/icons/CMakeLists.txt b/icons/CMakeLists.txt
index 513eed6..616fd49 100644
--- a/icons/CMakeLists.txt
+++ b/icons/CMakeLists.txt
@@ -1,9 +1,18 @@
+set(ICON48
+    fcitx-cantonhk.png fcitx-jyutping.png
+    fcitx-quick3.png fcitx-quick5.png fcitx-quick-classic.png fcitx-scj6.png fcitx-wu.png
+    fcitx-zhengma.png)
+set(ICON64 fcitx-boshiamy.png fcitx-cantonese.png fcitx-easy-big.png fcitx-array30.png fcitx-array30-big.png fcitx-stroke5.png)
+
 install(FILES
-    fcitx-boshiamy.png fcitx-cantonese.png fcitx-easy-big.png fcitx-array30.png fcitx-array30-big.png fcitx-stroke5.png
+    ${ICON64}
     DESTINATION share/icons/hicolor/64x64/apps)
 
 install(FILES
-    fcitx-cantonhk.png fcitx-jyutping.png
-    fcitx-quick3.png fcitx-quick5.png fcitx-quick-classic.png fcitx-scj6.png fcitx-wu.png
-    fcitx-zhengma.png
+    ${ICON48}
     DESTINATION share/icons/hicolor/48x48/apps)
+
+foreach(icon ${ICON48} ${ICON64})
+    string(REPLACE "fcitx-" "" icon_new ${icon})
+    install(FILES ${icon} RENAME ${icon_new} DESTINATION share/fcitx/imicon)
+endforeach()
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7ce21e4..d74b997 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,21 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
+# Translators:
+# Christopher Meng <cickumqt@gmail.com>, 2012.
 # Weng Xuetian <wengxt@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
-"Project-Id-Version: \n"
+"Project-Id-Version: fcitx\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-07-10 22:27+0800\n"
-"PO-Revision-Date: 2012-07-10 22:28+0800\n"
-"Last-Translator: Weng Xuetian <wengxt@gmail.com>\n"
-"Language-Team: Chinese Simplified <kde-i18n-doc@kde.org>\n"
+"PO-Revision-Date: 2012-07-26 10:40+0000\n"
+"Last-Translator: Christopher Meng <cickumqt@gmail.com>\n"
+"Language-Team: Chinese (China) <fcitx-dev@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.5\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=1; plural=0\n"
 
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/array30.conf.in.h:1
 msgid "Array30"
@@ -35,11 +37,11 @@
 
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/cangjie3.conf.in.h:1
 msgid "Cangjie3"
-msgstr "仓颉第三代"
+msgstr "第三代仓颉"
 
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/cangjie5.conf.in.h:1
 msgid "Cangjie5"
-msgstr "仓颉第五代"
+msgstr "第五代仓颉"
 
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/cantonhk.conf.in.h:1
 msgid "CantonHK"
@@ -59,11 +61,11 @@
 
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/quick3.conf.in.h:1
 msgid "Quick3"
-msgstr "速成第三代"
+msgstr "第三代速成"
 
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/quick5.conf.in.h:1
 msgid "Quick5"
-msgstr "速成第五代"
+msgstr "第五代速成"
 
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/quick-classic.conf.in.h:1
 msgid "QuickClassic"
@@ -71,7 +73,7 @@
 
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/scj6.conf.in.h:1
 msgid "SmartCangJie6"
-msgstr "快速仓颉第六代"
+msgstr "第六代快速仓颉"
 
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/stroke5.conf.in.h:1
 msgid "Stroke5"
@@ -92,4 +94,3 @@
 #: /home/saber/Develop/fcitx-table-extra/build/po/tmp/zhengma-large.conf.in.h:1
 msgid "Zhengma (Large)"
 msgstr "郑码大字集"
-
diff --git a/tables/boshiamy.conf.in b/tables/boshiamy.conf.in
index 96186da..8a543b7 100644
--- a/tables/boshiamy.conf.in
+++ b/tables/boshiamy.conf.in
@@ -17,4 +17,5 @@
 PromptTableCode=False
 Symbol=
 Enabled=True
+IgnorePunc=True
 LangCode=zh_TW
diff --git a/tables/cangjie-big.conf.in b/tables/cangjie-big.conf.in
index a4f55f9..c22c051 100644
--- a/tables/cangjie-big.conf.in
+++ b/tables/cangjie-big.conf.in
@@ -5,7 +5,7 @@
 File=cangjie-big.mb
 AdjustOrder=AdjustNo
 UsePY=True
-PYKey=[
+PYKey=`
 AutoSend=-1
 NoneMatchAutoSend=0
 UseMatchingKey=True
@@ -15,4 +15,4 @@
 PromptTableCode=False
 UseCustomPrompt=True
 LangCode=zh_TW
-Priority=30
\ No newline at end of file
+Priority=30
diff --git a/tables/cangjie3.conf.in b/tables/cangjie3.conf.in
index b077733..55fc764 100644
--- a/tables/cangjie3.conf.in
+++ b/tables/cangjie3.conf.in
@@ -5,7 +5,7 @@
 File=cangjie3.mb
 AdjustOrder=AdjustFreq
 UsePY=True
-PYKey=[
+PYKey=`
 AutoSend=-1
 NoneMatchAutoSend=0
 UseMatchingKey=True
diff --git a/tables/cangjie5.conf.in b/tables/cangjie5.conf.in
index 873abf0..c6f3ff3 100644
--- a/tables/cangjie5.conf.in
+++ b/tables/cangjie5.conf.in
@@ -5,7 +5,7 @@
 File=cangjie5.mb
 AdjustOrder=AdjustFreq
 UsePY=True
-PYKey=[
+PYKey=`
 AutoSend=-1
 NoneMatchAutoSend=0
 UseMatchingKey=True