diff --git a/src/sig/modules/BandoriModule.java b/src/sig/modules/BandoriModule.java
index 71cb82e..6756665 100644
--- a/src/sig/modules/BandoriModule.java
+++ b/src/sig/modules/BandoriModule.java
@@ -113,59 +113,59 @@ public class BandoriModule extends Module{
 		
 		stamp_map.put("kasumi_gogo",Arrays.asList("gogo"));
 		stamp_map.put("tae_letsplay",Arrays.asList("playtogether","wanttoplay","multilive","letsplay"));
-		stamp_map.put("rimi_choco",Arrays.asList("choco","cornet"));
-		stamp_map.put("saya_bread",Arrays.asList("bread"));
-		stamp_map.put("arisa_doki",Arrays.asList("doki","chomama","baka"));
-		stamp_map.put("ran_same",Arrays.asList("sameasalways","alwayssame","alwaysthesame","itsum"));
-		stamp_map.put("moca_youdidit",Arrays.asList("youdidit","congratulations","buns","mocatastic"));
-		stamp_map.put("himari_heyheyhoh",Arrays.asList("heyo","heyhey","hihi","hiyo"));
-		stamp_map.put("tomoe_letsdothis",Arrays.asList("letsdothis","letsdoit"));
-		stamp_map.put("tsugumi_wecandoit",Arrays.asList("wegotthis","wegotit","wecan"));
-		stamp_map.put("kokoro_happylucky",Arrays.asList("happy!","lucky"));
-		stamp_map.put("kaoru_fleeting",Arrays.asList("fleeting"));
-		stamp_map.put("aya_fever",Arrays.asList("fever","ayay"));
-		stamp_map.put("hagumi_smileyay",Arrays.asList("smileyay","yay!"));
-		stamp_map.put("kanon_fuee",Arrays.asList("fuu","fue","waa","reee"));
-		stamp_map.put("misaki_ready",Arrays.asList("amready","beenready","ready!"));
-		stamp_map.put("hina_fullcombo",Arrays.asList("fcd","fullcombo","nomiss","allperfect","notasinglemiss","thefc","anfc","fullperfect","easyfc","ezfc"));
-		stamp_map.put("chisato_planned",Arrays.asList("justasplanned","allplanned","calculated","thatcoming"));
-		stamp_map.put("maya_huhehe",Arrays.asList("hehe","huehe","huehue","shuwashuwa"));
-		stamp_map.put("eve_bushido",Arrays.asList("bushido"));
-		stamp_map.put("yukina_notbad",Arrays.asList("notbad","veryclose"));
-		stamp_map.put("sayo_goodwork",Arrays.asList("goodwork","goodjob","nicejob","welldone","greatwork","greatjob"));
-		stamp_map.put("lisa_nextonelastone",Arrays.asList("lastone","mylast"));
-		stamp_map.put("ako_onemoretime",Arrays.asList("onemore","goagain","keepplaying","dontstop","runit"));
-		stamp_map.put("rinko_jam",Arrays.asList("lovethissong","jam"/*,"happybirthday"*/));
-		stamp_map.put("marina_yeahyeah",Arrays.asList("yeahyeah","letsgo"));
-		stamp_map.put("kokoro_moremore",Arrays.asList("moremore","iwantmore"));
-		stamp_map.put("arisa_huh",Arrays.asList("huh?","hh?","yy?","aat?","aa?","tt?","nani","nand"));
-		stamp_map.put("yukina_followmylead",Arrays.asList("followmylead","takethelead","guideyou","fullydevoted"));
+		stamp_map.put("rimi_choco",Arrays.asList("choco","cornet","ちょこ","ころね","チョコ","コロネ"));
+		stamp_map.put("saya_bread",Arrays.asList("bread","pan","ぱん","パン"));
+		stamp_map.put("arisa_doki",Arrays.asList("doki","chomama","baka","ばか","バカ","馬鹿","どき","ドキ"));
+		stamp_map.put("ran_same",Arrays.asList("sameasalways","alwayssame","alwaysthesame","itsumodoori","いつも"));
+		stamp_map.put("moca_youdidit",Arrays.asList("youdidit","congratulations","buns","mocatastic","やった","yatta","しゃーしたー"));
+		stamp_map.put("himari_heyheyhoh",Arrays.asList("heyo","heyhey","hihi","hiyo","えい","おー"));
+		stamp_map.put("tomoe_letsdothis",Arrays.asList("letsdothis","letsdoit","やるよ","yarimasyou","やりましょう","yaruyo"));
+		stamp_map.put("tsugumi_wecandoit",Arrays.asList("wegotthis","wegotit","wecan","ganbare","がんばれ"));
+		stamp_map.put("kokoro_happylucky",Arrays.asList("happy!","lucky","ハッピー","ラッキー","こころん"));
+		stamp_map.put("kaoru_fleeting",Arrays.asList("fleeting","はかない","hakanai","儚い"));
+		stamp_map.put("aya_fever",Arrays.asList("fever","ayay","あやや","ru","る","ナイス","フィーバー","jinglebells"));
+		stamp_map.put("hagumi_smileyay",Arrays.asList("smileyay","yay!","スマイル","イエーイ"));
+		stamp_map.put("kanon_fuee",Arrays.asList("fuu","fue","waa","reee","ふええ","わああ"));
+		stamp_map.put("misaki_ready",Arrays.asList("amready","beenready","ready!","redii","準備完了"));
+		stamp_map.put("hina_fullcombo",Arrays.asList("fcd","fullcombo","nomiss","allperfect","notasinglemiss","thefc","anfc","fullperfect","easyfc","ezfc","フルコンボよゆーでしょ","efsii"));
+		stamp_map.put("chisato_planned",Arrays.asList("justasplanned","allplanned","calculated","thatcoming","keikakudoori","計画通り","けいかく","accordingtokeikaku"));
+		stamp_map.put("maya_huhehe",Arrays.asList("hehe","huehe","huehue","shuwashuwa","フヘへ","しゅわしゅわ"));
+		stamp_map.put("eve_bushido",Arrays.asList("bushido","ブシドー","ぶしど"));
+		stamp_map.put("yukina_notbad",Arrays.asList("notbad","veryclose","やるわね","おしい","おしかった","悪くはない"));
+		stamp_map.put("sayo_goodwork",Arrays.asList("goodwork","goodjob","nicejob","welldone","greatwork","greatjob","よくやった","お疲れ様でした","おつかれ","otsukare"));
+		stamp_map.put("lisa_nextonelastone",Arrays.asList("lastone","mylast","さいご","次はさいご","次はラストねん"));
+		stamp_map.put("ako_onemoretime",Arrays.asList("onemore","goagain","keepplaying","dontstop","runit","もういっかい","mouikkai","もう一回"));
+		stamp_map.put("rinko_jam",Arrays.asList("lovethissong","jam"/*,"happybirthday"*/),"この歌好き");
+		stamp_map.put("marina_yeahyeah",Arrays.asList("yeahyeah","letsgo","運営"));
+		stamp_map.put("kokoro_moremore",Arrays.asList("moremore","iwantmore","もっと","motto","もっと欲しい"));
+		stamp_map.put("arisa_huh",Arrays.asList("huh?","hh?","yy?","aat?","aa?","tt?","nani","nand","なに","何","はあ","wat"));
+		stamp_map.put("yukina_followmylead",Arrays.asList("followmylead","takethelead","guideyou","fullydevoted","私についてきて"));
 		stamp_map.put("kaoru_suchalovelyevening",Arrays.asList("goodevening","lovelyevening","beautifulnight","grandnight","wonderfulevening"));
-		stamp_map.put("rimi_congrats",Arrays.asList("grats"));
-		stamp_map.put("ran_somethingbigiscoming",Arrays.asList("somethingbig","iscoming","thatishowiroll","truecolor"));
-		stamp_map.put("tsugumi_comeon",Arrays.asList("comeon","dontbeafraid","dontbeshy"));
-		stamp_map.put("tae_fufusocute",Arrays.asList("socute","kawaii","fufu","adorable","cute"));
-		stamp_map.put("eve_marchintobattle",Arrays.asList("marchintobattle","chargeintobattle"));
-		stamp_map.put("saya_illtry",Arrays.asList("illtry","itachance","itatry","atleastonce"));
-		stamp_map.put("lisa_imsohappy",Arrays.asList("ecstatic","sohappy","toohappy"));
-		stamp_map.put("sayo_ohwell",Arrays.asList("ohwell","ahwell","youtried"));
-		stamp_map.put("ako_areyouokay",Arrays.asList("youok","beok","daijo"));
-		stamp_map.put("chisato_thisissomuchfun",Arrays.asList("muchfun","veryfun","reallyfun","extremelyfun","offun"));
-		stamp_map.put("rinko_theresnoway",Arrays.asList("noway"));
-		stamp_map.put("tae_thisisgreat",Arrays.asList("thisisgreat","thisisawesome","thisiswonderful"));
-		stamp_map.put("moca_thisisgettinginteresting",Arrays.asList("gettinginteresting","thingsaregetting","thisisgetting"));
-		stamp_map.put("kaoru_takemyhand",Arrays.asList("takemyhand","allowmeto","demonstrate","romeo"));
-		stamp_map.put("kokoro_letsmaketheworldsmile",Arrays.asList("hhw","happyworld","hellohappy","worldsmile"));
-		stamp_map.put("hina_nowwereboppin",Arrays.asList("bop","nowwere","zap"));
-		stamp_map.put("kokoro_what_a_great_idea",Arrays.asList("greatidea","goodidea","greatthinking","goodthinking"));
-		stamp_map.put("sayo_im_sorry",Arrays.asList("sorry","gomen","apologize","somethingwrong","forgive"));
-		stamp_map.put("hagumi_hooray",Arrays.asList("hooray","hiphip","whoo","yahoo"));
-		stamp_map.put("tsugumi_amazing",Arrays.asList("amazing","wow","sugoi","wooo","cool!","tsugurific"));
-		stamp_map.put("eve_thefruits",Arrays.asList("fruits","labor","hardwork","effort"));
-		stamp_map.put("lisa_imnotready",Arrays.asList("notready","notprep","stopit","holdon","onemin","onemom","noread","wontberead","notrdy","nottime","notime","waitam","waitforme"));
-		stamp_map.put("arisa_okayhereigo",Arrays.asList("hereigo","okayilltry","alrightilltry","domybest","trymybest","alrighty","itashot","myturn","domybest"));
-		stamp_map.put("tomoe_giveityourall",Arrays.asList("giveiteverything","allyougot","everythingyougot","tryyourbest","giveityourall","youreverything","yourall"));
-		stamp_map.put("kanon_keepgoing",Arrays.asList("keepgoing","dontstop","youcandoit","makeit","gaja","petan","pettan","pengu"));
+		stamp_map.put("rimi_congrats",Arrays.asList("grats","omedetou","gratz","おめでとう"));
+		stamp_map.put("ran_somethingbigiscoming",Arrays.asList("somethingbig","iscoming","thatishowiroll","truecolor","Hajimaru","Hajimeru","何かが始まる"));
+		stamp_map.put("tsugumi_comeon",Arrays.asList("comeon","dontbeafraid","dontbeshy","やろうよっ","やるよ","yarouyo","yaruyo"));
+		stamp_map.put("tae_fufusocute",Arrays.asList("socute","kawaii","fufu","adorable","cute","ふふ","可愛い","かわいい"));
+		stamp_map.put("eve_marchintobattle",Arrays.asList("marchintobattle","chargeintobattle","イクサへ"));
+		stamp_map.put("saya_illtry",Arrays.asList("illtry","itachance","itatry","atleastonce","私やってみます"));
+		stamp_map.put("lisa_imsohappy",Arrays.asList("ecstatic","sohappy","toohappy","うれしい","嬉しい","ureshii"));
+		stamp_map.put("sayo_ohwell",Arrays.asList("ohwell","ahwell","youtried","shikatanai","仕方ないわね"));
+		stamp_map.put("ako_areyouokay",Arrays.asList("youok","beok","daijoubu","大丈夫"));
+		stamp_map.put("chisato_thisissomuchfun",Arrays.asList("muchfun","veryfun","reallyfun","extremelyfun","offun","楽しいわね","tanoshii"));
+		stamp_map.put("rinko_theresnoway",Arrays.asList("noway","絶対ムリ","無理よ"));
+		stamp_map.put("tae_thisisgreat",Arrays.asList("thisisgreat","thisisawesome","thisiswonderful","最高だね","saikou"));
+		stamp_map.put("moca_thisisgettinginteresting",Arrays.asList("gettinginteresting","thingsaregetting","thisisgetting","omoshiroi","面白くなってきた"));
+		stamp_map.put("kaoru_takemyhand",Arrays.asList("takemyhand","allowmeto","demonstrate","romeo","手をとって"));
+		stamp_map.put("kokoro_letsmaketheworldsmile",Arrays.asList("hhw","happyworld","hellohappy","worldsmile","世界を笑顔に"));
+		stamp_map.put("hina_nowwereboppin",Arrays.asList("bop","nowwere","zap","run","るん","るんってきた"));
+		stamp_map.put("kokoro_what_a_great_idea",Arrays.asList("greatidea","goodidea","greatthinking","goodthinking","素敵なアイディアね"));
+		stamp_map.put("sayo_im_sorry",Arrays.asList("sorry","gomen","apologize","somethingwrong","forgive","ごめんなさい","gomennasai"));
+		stamp_map.put("hagumi_hooray",Arrays.asList("hooray","hiphip","whoo","yahoo","バンザイ","banzai"));
+		stamp_map.put("tsugumi_amazing",Arrays.asList("amazing","wow","sugoi","wooo","cool!","tsugurific","すごいですっ","すごい"));
+		stamp_map.put("eve_thefruits",Arrays.asList("fruits","labor","hardwork","effort","トックンの成果"));
+		stamp_map.put("lisa_imnotready",Arrays.asList("notready","notprep","stopit","holdon","onemin","onemom","noread","wontberead","notrdy","nottime","notime","waitam","waitforme","心の準備が"));
+		stamp_map.put("arisa_okayhereigo",Arrays.asList("hereigo","okayilltry","alrightilltry","domybest","trymybest","alrighty","itashot","myturn","domybest","yoshi","よし行くぞ"));
+		stamp_map.put("tomoe_giveityourall",Arrays.asList("giveiteverything","allyougot","everythingyougot","tryyourbest","giveityourall","youreverything","yourall","全力で行くぜ"));
+		stamp_map.put("kanon_keepgoing",Arrays.asList("keepgoing","dontstop","youcandoit","makeit","gaja","petan","pettan","pengu","susumou","nagaja","進もう","間に合って"));
 		
 		/*for (String s : image_map.keySet()) {
 			ImageScheme scheme = image_map.get(s);
@@ -383,4 +383,4 @@ class ImageScheme{
 		this.base=base;
 		this.stamp_index=index;
 	}
-}
\ No newline at end of file
+}