diff --git a/Preparing/Sources/Preparing/Resources/syllable.txt b/Preparing/Sources/Preparing/Resources/syllable.txt
index f62a120..dd4b06e 100644
--- a/Preparing/Sources/Preparing/Resources/syllable.txt
+++ b/Preparing/Sources/Preparing/Resources/syllable.txt
@@ -643,6 +643,7 @@
 27202035	4227	haap	haap
 27202040	4228	haau	haau
 27203326	4264	hang	hang
+27243326	4364	heng	heng
 27243428	4364	heoi	heoi
 27243444	4369	heoy	heoi
 27244028	4384	heui	heoi
diff --git a/Preparing/Sources/Preparing/Resources/symbol.txt b/Preparing/Sources/Preparing/Resources/symbol.txt
index 15f7b13..7374bfc 100644
--- a/Preparing/Sources/Preparing/Resources/symbol.txt
+++ b/Preparing/Sources/Preparing/Resources/symbol.txt
@@ -149,20 +149,26 @@
 1	1F624	氣憤	hei3 fan5	794640	9346582893414065
 1	1F624	怒	nou6	1101	523960317
 1	1F624	惱	nou5	1101	523960317
+1	1F624	惱	nau1	1101	523927935
 1	1F624	嬲	nau1	1101	523927935
 1	1F624	激死	gik1 sei2	793420	9274844330244610
 1	1F620	憤怒	fan5 nou6	792110	9199704066334925
 1	1F620	氣憤	hei3 fan5	794640	9346582893414065
-1	1F620	嚴肅	jim4 suk1	797275	9493471741355225
 1	1F620	怒	nou6	1101	523960317
 1	1F620	惱	nou5	1101	523960317
+1	1F620	惱	nau1	1101	523927935
 1	1F620	嬲	nau1	1101	523927935
+1	1F620	好惱	hou2 nau1	794680	9349431773703190
 1	1F620	好嬲	hou2 nau1	794680	9349431773703190
 1	1F621	憤怒	fan5 nou6	792110	9199704066334925
 1	1F621	氣憤	hei3 fan5	794640	9346582893414065
+1	1F621	惱	nau1	1101	523927935
 1	1F621	嬲	nau1	1101	523927935
+1	1F621	好惱	hou2 nau1	794680	9349431773703190
 1	1F621	好嬲	hou2 nau1	794680	9349431773703190
+1	1F621	惱爆	nau1 baau3	802330	5137447841463122916
 1	1F621	嬲爆	nau1 baau3	802330	5137447841463122916
+1	1F621	惱爆爆	nau1 baau3 baau3	523930077	9216382443073165441
 1	1F621	嬲爆爆	nau1 baau3 baau3	523930077	9216382443073165441
 1	1F92C	詛咒	zo3 zau3	817870	20488219675902
 1	1F92C	鬧人	naau6 jan4	802370	5137436627970897765
@@ -298,10 +304,13 @@
 1	1F922	好核突	hou2 wat6 dat6	520412022	6569354988882324442
 1	1F922	想嘔	soeng2 au2	808750	5325311910236461689
 1	1F922	想嘔咁滯	soeng2 au2 gam3 zai6	37884907337	-4859368103250794632
+1	1F922	嘔	au2	1062	785720
+1	1F922	噁心	ok3 sam1	803700	18902387016480
 1	1F92E	嘔	au2	1062	785720
 1	1F92E	嘔吐	au2 tou3	785715	16892529605523
 1	1F92E	核突	wat6 dat6	813905	10438586800088395
 1	1F92E	好核突	hou2 wat6 dat6	520412022	6569354988882324442
+1	1F92E	噁心	ok3 sam1	803700	18902387016480
 1	1F927	乞嗤	hat1 ci1	794625	17889056934606
 1	1F927	打乞嗤	daa2 hat1 ci1	517999554	2034634415251353399
 1	1F637	戴口罩	daai3 hau2 zaau3	517999761	4478028235863472009
@@ -313,7 +322,7 @@
 1	1F915	繃帶	bang1 daai3	786920	1445731776255194927
 1	1F915	纏繃帶	cin4 bang1 daai2	517391244	5167252814110253420
 1	1F911	錢迷	cin2 mai4	788250	8983347342269495
-1	1F920	戴帽	daai3 mou2	789535	4765740120025066599
+1	1F920	戴帽	daai3 mou6	789535	4765740120025066599
 1	1F608	惡魔	ok3 mo1	803670	36741889370
 1	1F47F	惡魔	ok3 mo1	803670	36741889370
 1	1F479	惡鬼	ok3 gwai2	803640	9858407599498120
@@ -617,7 +626,7 @@
 1	1F474	老阿伯	lou5 aa3 baak3	522738882	2100175154902172074
 1	1F474	阿伯	aa3 baak3	785625	8835315429862935
 1	1F474	外公	ngoi6 gung1	802355	4986374879750943078
-1	1F472	瓜皮帽	gwaa1 pei4 mou2	519801471	4659515102384347193
+1	1F472	瓜皮帽	gwaa1 pei4 mou6	519801471	4659515102384347193
 1	1F473.200D.2640.FE0F	頭巾女	tau4 gan1 neoi5	527508396	98985062903911733
 1	1F473.200D.2640.FE0F	戴頭巾	daai3 tau4 gan1	518027346	8703908015856470809
 1	1F473.200D.2640.FE0F	頭巾	tau4 gan1	810065	10219962712169990
@@ -846,36 +855,24 @@
 1	1F481.200D.2640.FE0F	女服務員	neoi5 fuk6 mou6 jyun4	36447707039	-3132110212004325354
 1	1F481	服務員	fuk6 mou6 jyun4	519200064	-1844234662805479065
 1	1F481.200D.2642.FE0F	男服務員	naam4 fuk6 mou6 jyun4	36447707039	-2516415329693747704
-1	1F645.200D.2640.FE0F	否決	fau2 kyut3	792095	4840090676019626256
 1	1F645.200D.2640.FE0F	否定	fau2 ding6	792060	4840090660555009893
 1	1F645.200D.2640.FE0F	反對	faan2 deoi3	792060	2623595127250916415
 1	1F645.200D.2640.FE0F	不可	bat1 ho2	786940	17025287837811
-1	1F645.200D.2640.FE0F	唔得	m4 dak1	801055	36156840881
 1	1F645.200D.2640.FE0F	唔可以	m4 ho2 ji5	523349586	18612774843036
-1	1F645	否決	fau2 kyut3	792095	4840090676019626256
 1	1F645	否定	fau2 ding6	792060	4840090660555009893
 1	1F645	反對	faan2 deoi3	792060	2623595127250916415
 1	1F645	不可	bat1 ho2	786940	17025287837811
-1	1F645	唔得	m4 dak1	801055	36156840881
 1	1F645	唔可以	m4 ho2 ji5	523349586	18612774843036
-1	1F645.200D.2642.FE0F	否決	fau2 kyut3	792095	4840090676019626256
 1	1F645.200D.2642.FE0F	否定	fau2 ding6	792060	4840090660555009893
 1	1F645.200D.2642.FE0F	反對	faan2 deoi3	792060	2623595127250916415
 1	1F645.200D.2642.FE0F	不可	bat1 ho2	786940	17025287837811
-1	1F645.200D.2642.FE0F	唔得	m4 dak1	801055	36156840881
 1	1F645.200D.2642.FE0F	唔可以	m4 ho2 ji5	523349586	18612774843036
 1	1F646.200D.2640.FE0F	同意	tung4 ji3	810080	10225626200401495
 1	1F646.200D.2640.FE0F	准許	zeon2 heoi2	817780	8517846865573295209
-1	1F646.200D.2640.FE0F	肯定	hang2 ding6	794630	3212613561620420424
-1	1F646.200D.2640.FE0F	可以	ho2 ji5	794660	34726390926
 1	1F646	同意	tung4 ji3	810080	10225626200401495
 1	1F646	准許	zeon2 heoi2	817780	8517846865573295209
-1	1F646	肯定	hang2 ding6	794630	3212613561620420424
-1	1F646	可以	ho2 ji5	794660	34726390926
 1	1F646.200D.2642.FE0F	同意	tung4 ji3	810080	10225626200401495
 1	1F646.200D.2642.FE0F	准許	zeon2 heoi2	817780	8517846865573295209
-1	1F646.200D.2642.FE0F	肯定	hang2 ding6	794630	3212613561620420424
-1	1F646.200D.2642.FE0F	可以	ho2 ji5	794660	34726390926
 1	1F64B.200D.2640.FE0F	舉手女	geoi2 sau2 neoi5	519808419	-3592794267356664413
 1	1F64B.200D.2640.FE0F	舉手	geoi2 sau2	793420	4877835459130642164
 1	1F64B	舉手	geoi2 sau2	793420	4877835459130642164
@@ -1116,20 +1113,21 @@
 1	1F9E6	襪	maat6	1098	36153472535
 1	1F9E4	手套	sau2 tou3	808845	10147087700167015
 1	1F9E3	圍巾	wai4 gan1	813920	10438574676133565
-1	1F3A9	南帽	naam4 mou6	802385	5137436610479143797
-1	1F3A9	高帽	gou1 mou2	793390	9276556701595170
+1	1F3A9	男帽	naam4 mou6	802385	5137436610479143797
+1	1F3A9	高帽	gou1 mou6	793390	9276556701595170
 1	1F3A9	魔術帽	mo1 seot6 mou6	523375056	5590107855480992753
-1	1F9E2	㡌	mou6	1098	523365876
-1	1F9E2	太陽㡌	taai3 joeng4 mou6	527515326	-4760534623717905649
-1	1F9E2	運動㡌	wan6 dung6 mou6	529284771	6627520024225035343
-1	1F9E2	鴨舌㡌	aap3 sit3 mou6	516241764	-7685841651364207652
+1	1F3A9	帽	mou6	1098	523365876
+1	1F9E2	帽	mou6	1098	523365876
+1	1F9E2	太陽帽	taai3 joeng4 mou6	527515326	-4760534623717905649
+1	1F9E2	運動帽	wan6 dung6 mou6	529284771	6627520024225035343
+1	1F9E2	鴨舌帽	aap3 sit3 mou6	516241764	-7685841651364207652
+1	1F9E2	棒球帽	paang5 kau4 mou6	525139875	1075359629692640676
 1	1F452	女帽	neoi5 mou6	802385	5138022996266615427
-1	1F452	禮帽	lai5 mou2	799815	9636948953591245
 1	1F452	禮帽	lai5 mou6	799815	9636948953591245
-1	1F452	草㡌	cou2 mou6	788250	8985056429400350
+1	1F452	草帽	cou2 mou6	788250	8985056429400350
+1	1F452	帽	mou6	1098	523365876
 1	1F393	學士帽	hok6 si6 mou6	520402851	3228642144413127543
 1	1F393	畢業	bat1 jip6	786950	8908210396958080
-1	26D1.FE0F	安全帽	on1 cyun4 mou2	524526930	-6491974983139208970
 1	26D1.FE0F	安全帽	on1 cyun4 mou6	524526930	-6491974983139208970
 1	1FA96	頭盔	tau4 kwai1	810085	5360465750375183229
 1	1FA96	盔	kwai1	1092	35601038512
@@ -1169,6 +1167,7 @@
 2	1F431	貓頭	maau1 tau4	801135	5100266979886583157
 2	1F431	貓	maau1	1098	36153472552
 2	1F431	貓貓	maau1 maau1	801100	4684957370649081680
+2	1F431	貓仔	maau1 zai2	801165	5100266979937703535
 2	1F42D	老鼠	lou5 syu2	799845	9640932067764855
 2	1F42D	鼠	syu2	1116	526955652
 2	1F439	倉鼠	cong1 syu2	788280	4730602589127279759
@@ -1384,13 +1383,19 @@
 2	1F429	貴賓狗	gwai3 ban1 gau2	519769035	4679968533298823968
 2	1F9AE	導盲犬	dou6 maang4 hyun2	518011164	-866311145319839204
 2	1F9AE	導盲狗	dou6 maang4 gau2	518011155	-4701804512724199788
+2	1F9AE	狗	gau2	1080	519766848
+2	1F9AE	犬	hyun2	1083	34737667400
+2	1F9AE	狗仔	gau2 zai2	793455	9272586909107015
+2	1F9AE	狗狗	gau2 gau2	793360	9272586827537280
 2	1F415.200D.1F9BA	服務犬	fuk6 mou6 hyun2	519200046	-1844234697603394715
 2	1F408	貓	maau1	1098	36153472552
 2	1F408	貓貓	maau1 maau1	801100	4684957370649081680
 2	1F408	橘貓	gwat1 maau1	793390	2943283998211660895
+2	1F408	貓仔	maau1 zai2	801165	5100266979937703535
 2	1F408.200D.2B1B	黑貓	hak1 maau1	794675	4914424348946140767
 2	1F408.200D.2B1B	貓	maau1	1098	36153472552
 2	1F408.200D.2B1B	貓貓	maau1 maau1	801100	4684957370649081680
+2	1F408.200D.2B1B	貓仔	maau1 zai2	801165	5100266979937703535
 2	1FAB6	羽毛	jyu5 mou4	797245	9498017511501935
 2	1FAB6	羽	jyu5	1089	521605683
 2	1FABD	翼	jik6	1089	521568585
@@ -1851,6 +1856,9 @@
 3	1F359	飯團	faan6 tyun4	792140	2623595197390332270
 3	1F35A	米飯	mai5 faan6	801065	5100271448948312532
 3	1F35A	飯	faan6	1077	34133495866
+3	1F35A	食飯	sik6 faan6	808775	5324447495332423140
+3	1F35A	喫飯	hek3 faan6	794640	4915002849542899797
+3	1F35A	喫飯	jaak3 faan6	797210	3801516274014521909
 3	1F358	米餅	mai5 beng2	801045	5100271440223933914
 3	1F365	魚餅	jyu4 beng2	797190	4992240344368462971
 3	1F960	幸運餅乾	hang6 wan6 beng2 gon1	34735338604	-7565901518969141806
@@ -1900,10 +1908,14 @@
 3	1F95B	奶	naai5	1101	36442040429
 3	1FAD7	傾倒	king1 dou2	798485	5027092000468067064
 3	1F37C	奶樽	naai5 zeon1	802450	4979437516788537437
-3	1FAD6	茶壺	caa4 wu2	788300	17169208075734
+3	1FAD6	茶壺	caa4 wu4	788300	17169208075734
+3	1FAD6	茶	caa4	1068	517388904
+3	1FAD6	飲茶	jam2 caa4	797195	9491203187720995
 3	2615.FE0F	熱飲	jit6 jam2	797230	9493479425822405
 3	1F375	茶杯	caa4 bui1	788195	8981064467238955
 3	1F375	杯茶	bui1 caa4	786915	8913869441458475
+3	1F375	茶	caa4	1068	517388904
+3	1F375	飲茶	jam2 caa4	797195	9491203187720995
 3	1F9C3	果汁	gwo2 zap1	793455	9278818621689630
 3	1F964	外帶杯	ngoi6 daai3 bui1	523934703	-3547957045725221753
 3	1F964	外賣杯	ngoi6 maai6 bui1	523955520	1765573821670861456
@@ -1994,8 +2006,8 @@
 4	1F6FC	輪滑鞋	leon4 waat6 haai4	522789822	-3215223119444068102
 4	1F6F7	雪橇	syut3 hiu1	808785	5326767217334533410
 4	26F8	冰鞋	bing1 haai4	786940	1454898495573966651
-4	1F94C	冰壺石	bing1 wu2 sek6	516845511	506466564883484888
-4	1F94C	冰壺	bing1 wu2	787015	8910472248829970
+4	1F94C	冰壺石	bing1 wu4 sek6	516845511	506466564883484888
+4	1F94C	冰壺	bing1 wu4	787015	8910472248829970
 4	1F3BF	滑雪屐	waat6 syut3 kek6	529319448	-3131782137842861368
 4	1F3BF	滑雪板	waat6 syut3 baan2	529319367	5900809327813321248
 4	26F7	滑雪	waat6 syut3	813980	7629760355265268106
@@ -2176,6 +2188,7 @@
 5	1F3CD	摩托車	mo1 tok3 ce1	523377279	5102302464823443321
 5	1F3CD	摩托	mo1 tok3	801135	18616706914575
 5	1F3CD	電單車	din6 daan1 ce1	517990302	7495270551415685536
+5	1F3CD	機車	gei1 ce1	793340	17747312081730
 5	1F6FA	三輪車	saam1 leon4 ce1	526925421	8629271295268647970
 5	1F6DE	車轆	ce1 luk1	788245	17171472680505
 5	1F6DE	轆	luk1	1095	522785223
@@ -2575,6 +2588,7 @@
 6	1F6AC	食支菸	sik6 zi1 jin1	526957866	6461050512317270131
 6	26B0.FE0F	棺材	gun1 coi4	793340	9278250298679115
 6	1FAA6	墓碑	mou6 bei1	801045	9713807062494535
+6	1FAA6	墓	mou6	1098	523365876
 6	26B1.FE0F	骨灰盒	gwat1 fui1 hap2	519778296	4734924341440169018
 6	1F3FA	雙耳瓶	soeng1 ji5 ping4	526920912	8678158210065693864
 6	1F52E	水晶球	seoi2 zing1 kau4	526957875	4430833808114879668
@@ -2975,10 +2989,6 @@
 7	1F4AF	滿分	mun5 fan1	801065	9715500719617355
 7	1F4A2	憤怒	fan5 nou6	792110	9199704066334925
 7	1F4A2	氣憤	hei3 fan5	794640	9346582893414065
-7	1F4A2	嬲	nau1	1101	523927935
-7	1F4A2	好嬲	hou2 nau1	794680	9349431773703190
-7	1F4A2	嬲爆	nau1 baau3	802330	5137447841463122916
-7	1F4A2	嬲爆爆	nau1 baau3 baau3	523930077	9216382443073165441
 7	2668.FE0F	溫泉	wan1 cyun4	813900	5471970738072891660
 7	1F6B7	行人禁止通行	hang4 jan4 gam3 zi2 tung1 hang4	9347998575778005	7837842967675658591
 7	1F6B7	行人禁止	hang4 jan4 gam3 zi2	34720763943	5866893027579724283
diff --git a/Preparing/Sources/Preparing/Resources/t2s.txt b/Preparing/Sources/Preparing/Resources/t2s.txt
index a225a68..90524e2 100644
--- a/Preparing/Sources/Preparing/Resources/t2s.txt
+++ b/Preparing/Sources/Preparing/Resources/t2s.txt
@@ -828,6 +828,7 @@
 25818	据
 25823	𪭧
 25824	挤
+25825	抬
 25827	捣
 25835	𢬍
 25836	拟
diff --git a/TypeDuck.xcodeproj/project.pbxproj b/TypeDuck.xcodeproj/project.pbxproj
index 367d5f0..222b2e1 100644
--- a/TypeDuck.xcodeproj/project.pbxproj
+++ b/TypeDuck.xcodeproj/project.pbxproj
@@ -674,7 +674,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"TypeDuck/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -692,7 +692,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = hk.eduhk.inputmethod.TypeDuck;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -711,7 +711,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"TypeDuck/Preview Content\"";
 				DEVELOPMENT_TEAM = "";
@@ -729,7 +729,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 12.0;
-				MARKETING_VERSION = 1.2.1;
+				MARKETING_VERSION = 1.3.0;
 				PRODUCT_BUNDLE_IDENTIFIER = hk.eduhk.inputmethod.TypeDuck;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = YES;
diff --git a/packaging/pack.sh b/packaging/pack.sh
index 790474b..631522b 100755
--- a/packaging/pack.sh
+++ b/packaging/pack.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 BUNDLE_IDENTIFIER='hk.eduhk.inputmethod.TypeDuck'
-APP_VERSION='1.2.1'
+APP_VERSION='1.3.0'
 INSTALL_LOCATION='/Library/Input Methods'
 
 pkgbuild \