diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
index 1334f50..b53ff45 100644
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -7,6 +7,8 @@
       <option name="block" value="false" />
       <option name="separateBefore" value="true" />
       <option name="separateAfter" value="true" />
+      <option name="lenBefore" value="90" />
+      <option name="lenAfter" value="90" />
       <option name="box" value="true" />
     </LanguageOptions>
   </settings>
diff --git a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml
index 456e2c3..ee63bdc 100644
--- a/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml
+++ b/.idea/dataSources/bcae6d7f-dd17-487e-ab3f-743f9b393d89.xml
@@ -369,1015 +369,1037 @@
     <package id="167" parent="1" name="json_tree"/>
     <package id="168" parent="1" name="rtree"/>
     <package id="169" parent="1" name="rtree_i32"/>
-    <table id="170" parent="2" name="settings"/>
-    <table id="171" parent="2" name="sqlite_master">
+    <table id="170" parent="2" name="Dictionary"/>
+    <table id="171" parent="2" name="settings"/>
+    <table id="172" parent="2" name="sqlite_master">
       <System>1</System>
     </table>
-    <argument id="172" parent="6">
+    <table id="173" parent="2" name="sqlite_sequence">
+      <System>1</System>
+    </table>
+    <argument id="174" parent="6">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="173" parent="6">
+    <argument id="175" parent="6">
       <Position>1</Position>
     </argument>
-    <argument id="174" parent="7">
+    <argument id="176" parent="7">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="175" parent="7">
+    <argument id="177" parent="7">
       <Position>1</Position>
     </argument>
-    <argument id="176" parent="8">
+    <argument id="178" parent="8">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="177" parent="8">
+    <argument id="179" parent="8">
       <Position>1</Position>
     </argument>
-    <argument id="178" parent="9">
+    <argument id="180" parent="9">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="179" parent="9">
+    <argument id="181" parent="9">
       <Position>1</Position>
     </argument>
-    <argument id="180" parent="10">
+    <argument id="182" parent="10">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="181" parent="10">
+    <argument id="183" parent="10">
       <Position>1</Position>
     </argument>
-    <argument id="182" parent="11">
+    <argument id="184" parent="11">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="183" parent="11">
+    <argument id="185" parent="11">
       <Position>1</Position>
     </argument>
-    <argument id="184" parent="12">
+    <argument id="186" parent="12">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="185" parent="12">
+    <argument id="187" parent="12">
       <Position>1</Position>
     </argument>
-    <argument id="186" parent="12">
+    <argument id="188" parent="12">
       <Position>2</Position>
     </argument>
-    <argument id="187" parent="13">
+    <argument id="189" parent="13">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="188" parent="13">
+    <argument id="190" parent="13">
       <Position>1</Position>
     </argument>
-    <argument id="189" parent="14">
+    <argument id="191" parent="14">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="190" parent="14">
+    <argument id="192" parent="14">
       <Position>1</Position>
     </argument>
-    <argument id="191" parent="14">
+    <argument id="193" parent="14">
       <Position>2</Position>
     </argument>
-    <argument id="192" parent="15">
+    <argument id="194" parent="15">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="193" parent="15">
+    <argument id="195" parent="15">
       <Position>1</Position>
     </argument>
-    <argument id="194" parent="16">
+    <argument id="196" parent="16">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="195" parent="17">
+    <argument id="197" parent="17">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="196" parent="17">
+    <argument id="198" parent="17">
       <Position>1</Position>
     </argument>
-    <argument id="197" parent="18">
+    <argument id="199" parent="18">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="198" parent="19">
+    <argument id="200" parent="19">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="199" parent="20">
+    <argument id="201" parent="20">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="200" parent="20">
+    <argument id="202" parent="20">
       <Position>1</Position>
     </argument>
-    <argument id="201" parent="20">
+    <argument id="203" parent="20">
       <Position>2</Position>
     </argument>
-    <argument id="202" parent="21">
+    <argument id="204" parent="21">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="203" parent="21">
+    <argument id="205" parent="21">
       <Position>1</Position>
     </argument>
-    <argument id="204" parent="21">
+    <argument id="206" parent="21">
       <Position>2</Position>
     </argument>
-    <argument id="205" parent="21">
+    <argument id="207" parent="21">
       <Position>3</Position>
     </argument>
-    <argument id="206" parent="22">
+    <argument id="208" parent="22">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="207" parent="23">
+    <argument id="209" parent="23">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="208" parent="23">
+    <argument id="210" parent="23">
       <Position>1</Position>
     </argument>
-    <argument id="209" parent="24">
+    <argument id="211" parent="24">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="210" parent="24">
+    <argument id="212" parent="24">
       <Position>1</Position>
     </argument>
-    <argument id="211" parent="25">
+    <argument id="213" parent="25">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="212" parent="25">
+    <argument id="214" parent="25">
       <Position>1</Position>
     </argument>
-    <argument id="213" parent="26">
+    <argument id="215" parent="26">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="214" parent="26">
+    <argument id="216" parent="26">
       <Position>1</Position>
     </argument>
-    <argument id="215" parent="27">
+    <argument id="217" parent="27">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="216" parent="27">
+    <argument id="218" parent="27">
       <Position>1</Position>
     </argument>
-    <argument id="217" parent="28">
+    <argument id="219" parent="28">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="218" parent="29">
+    <argument id="220" parent="29">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="219" parent="30">
+    <argument id="221" parent="30">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="220" parent="31">
+    <argument id="222" parent="31">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="221" parent="32">
+    <argument id="223" parent="32">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="222" parent="33">
+    <argument id="224" parent="33">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="223" parent="34">
+    <argument id="225" parent="34">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="224" parent="34">
+    <argument id="226" parent="34">
       <Position>1</Position>
     </argument>
-    <argument id="225" parent="35">
+    <argument id="227" parent="35">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="226" parent="36">
+    <argument id="228" parent="36">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="227" parent="36">
+    <argument id="229" parent="36">
       <Position>1</Position>
     </argument>
-    <argument id="228" parent="36">
+    <argument id="230" parent="36">
       <Position>2</Position>
     </argument>
-    <argument id="229" parent="37">
+    <argument id="231" parent="37">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="230" parent="37">
+    <argument id="232" parent="37">
       <Position>1</Position>
     </argument>
-    <argument id="231" parent="38">
+    <argument id="233" parent="38">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="232" parent="38">
+    <argument id="234" parent="38">
       <Position>1</Position>
     </argument>
-    <argument id="233" parent="39">
+    <argument id="235" parent="39">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="234" parent="39">
+    <argument id="236" parent="39">
       <Position>1</Position>
     </argument>
-    <argument id="235" parent="40">
+    <argument id="237" parent="40">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="236" parent="40">
+    <argument id="238" parent="40">
       <Position>1</Position>
     </argument>
-    <argument id="237" parent="41">
+    <argument id="239" parent="41">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="238" parent="41">
+    <argument id="240" parent="41">
       <Position>1</Position>
     </argument>
-    <argument id="239" parent="41">
+    <argument id="241" parent="41">
       <Position>2</Position>
     </argument>
-    <argument id="240" parent="42">
+    <argument id="242" parent="42">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="241" parent="42">
+    <argument id="243" parent="42">
       <Position>1</Position>
     </argument>
-    <argument id="242" parent="43">
+    <argument id="244" parent="43">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="243" parent="43">
+    <argument id="245" parent="43">
       <Position>1</Position>
     </argument>
-    <argument id="244" parent="43">
+    <argument id="246" parent="43">
       <Position>2</Position>
     </argument>
-    <argument id="245" parent="44">
+    <argument id="247" parent="44">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="246" parent="44">
+    <argument id="248" parent="44">
       <Position>1</Position>
     </argument>
-    <argument id="247" parent="44">
+    <argument id="249" parent="44">
       <Position>2</Position>
     </argument>
-    <argument id="248" parent="45">
+    <argument id="250" parent="45">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="249" parent="46">
+    <argument id="251" parent="46">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="250" parent="47">
+    <argument id="252" parent="47">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="251" parent="48">
+    <argument id="253" parent="48">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="252" parent="49">
+    <argument id="254" parent="49">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="253" parent="50">
+    <argument id="255" parent="50">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="254" parent="51">
+    <argument id="256" parent="51">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="255" parent="51">
+    <argument id="257" parent="51">
       <Position>1</Position>
     </argument>
-    <argument id="256" parent="51">
+    <argument id="258" parent="51">
       <Position>2</Position>
     </argument>
-    <argument id="257" parent="52">
+    <argument id="259" parent="52">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="258" parent="52">
+    <argument id="260" parent="52">
       <Position>1</Position>
     </argument>
-    <argument id="259" parent="52">
+    <argument id="261" parent="52">
       <Position>2</Position>
     </argument>
-    <argument id="260" parent="53">
+    <argument id="262" parent="53">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="261" parent="53">
+    <argument id="263" parent="53">
       <Position>1</Position>
     </argument>
-    <argument id="262" parent="54">
+    <argument id="264" parent="54">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="263" parent="55">
+    <argument id="265" parent="55">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="264" parent="55">
+    <argument id="266" parent="55">
       <Position>1</Position>
     </argument>
-    <argument id="265" parent="55">
+    <argument id="267" parent="55">
       <Position>2</Position>
     </argument>
-    <argument id="266" parent="56">
+    <argument id="268" parent="56">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="267" parent="56">
+    <argument id="269" parent="56">
       <Position>1</Position>
     </argument>
-    <argument id="268" parent="56">
+    <argument id="270" parent="56">
       <Position>2</Position>
     </argument>
-    <argument id="269" parent="56">
+    <argument id="271" parent="56">
       <Position>3</Position>
     </argument>
-    <argument id="270" parent="57">
+    <argument id="272" parent="57">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="271" parent="57">
+    <argument id="273" parent="57">
       <Position>1</Position>
     </argument>
-    <argument id="272" parent="57">
+    <argument id="274" parent="57">
       <Position>2</Position>
     </argument>
-    <argument id="273" parent="58">
+    <argument id="275" parent="58">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="274" parent="58">
+    <argument id="276" parent="58">
       <Position>1</Position>
     </argument>
-    <argument id="275" parent="59">
+    <argument id="277" parent="59">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="276" parent="60">
+    <argument id="278" parent="60">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="277" parent="60">
+    <argument id="279" parent="60">
       <Position>1</Position>
     </argument>
-    <argument id="278" parent="61">
+    <argument id="280" parent="61">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="279" parent="61">
+    <argument id="281" parent="61">
       <Position>1</Position>
     </argument>
-    <argument id="280" parent="61">
+    <argument id="282" parent="61">
       <Position>2</Position>
     </argument>
-    <argument id="281" parent="62">
+    <argument id="283" parent="62">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="282" parent="63">
+    <argument id="284" parent="63">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="283" parent="63">
+    <argument id="285" parent="63">
       <Position>1</Position>
     </argument>
-    <argument id="284" parent="64">
+    <argument id="286" parent="64">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="285" parent="64">
+    <argument id="287" parent="64">
       <Position>1</Position>
     </argument>
-    <argument id="286" parent="64">
+    <argument id="288" parent="64">
       <Position>2</Position>
     </argument>
-    <argument id="287" parent="65">
+    <argument id="289" parent="65">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="288" parent="66">
+    <argument id="290" parent="66">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="289" parent="67">
+    <argument id="291" parent="67">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="290" parent="67">
+    <argument id="292" parent="67">
       <Position>1</Position>
     </argument>
-    <argument id="291" parent="67">
+    <argument id="293" parent="67">
       <Position>2</Position>
     </argument>
-    <argument id="292" parent="68">
+    <argument id="294" parent="68">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="293" parent="68">
+    <argument id="295" parent="68">
       <Position>1</Position>
     </argument>
-    <argument id="294" parent="69">
+    <argument id="296" parent="69">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="295" parent="70">
+    <argument id="297" parent="70">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="296" parent="71">
+    <argument id="298" parent="71">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="297" parent="72">
+    <argument id="299" parent="72">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="298" parent="72">
+    <argument id="300" parent="72">
       <Position>1</Position>
     </argument>
-    <argument id="299" parent="73">
+    <argument id="301" parent="73">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="300" parent="73">
+    <argument id="302" parent="73">
       <Position>1</Position>
     </argument>
-    <argument id="301" parent="73">
+    <argument id="303" parent="73">
       <Position>2</Position>
     </argument>
-    <argument id="302" parent="74">
+    <argument id="304" parent="74">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="303" parent="74">
+    <argument id="305" parent="74">
       <Position>1</Position>
     </argument>
-    <argument id="304" parent="75">
+    <argument id="306" parent="75">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="305" parent="76">
+    <argument id="307" parent="76">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="306" parent="76">
+    <argument id="308" parent="76">
       <Position>1</Position>
     </argument>
-    <argument id="307" parent="76">
+    <argument id="309" parent="76">
       <Position>2</Position>
     </argument>
-    <argument id="308" parent="77">
+    <argument id="310" parent="77">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="309" parent="77">
+    <argument id="311" parent="77">
       <Position>1</Position>
     </argument>
-    <argument id="310" parent="77">
+    <argument id="312" parent="77">
       <Position>2</Position>
     </argument>
-    <argument id="311" parent="77">
+    <argument id="313" parent="77">
       <Position>3</Position>
     </argument>
-    <argument id="312" parent="78">
+    <argument id="314" parent="78">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="313" parent="79">
+    <argument id="315" parent="79">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="314" parent="79">
+    <argument id="316" parent="79">
       <Position>1</Position>
     </argument>
-    <argument id="315" parent="80">
+    <argument id="317" parent="80">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="316" parent="80">
+    <argument id="318" parent="80">
       <Position>1</Position>
     </argument>
-    <argument id="317" parent="80">
+    <argument id="319" parent="80">
       <Position>2</Position>
     </argument>
-    <argument id="318" parent="81">
+    <argument id="320" parent="81">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="319" parent="81">
+    <argument id="321" parent="81">
       <Position>1</Position>
     </argument>
-    <argument id="320" parent="81">
+    <argument id="322" parent="81">
       <Position>2</Position>
     </argument>
-    <argument id="321" parent="81">
+    <argument id="323" parent="81">
       <Position>3</Position>
     </argument>
-    <argument id="322" parent="82">
+    <argument id="324" parent="82">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="323" parent="82">
+    <argument id="325" parent="82">
       <Position>1</Position>
     </argument>
-    <argument id="324" parent="82">
+    <argument id="326" parent="82">
       <Position>2</Position>
     </argument>
-    <argument id="325" parent="83">
+    <argument id="327" parent="83">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="326" parent="83">
+    <argument id="328" parent="83">
       <Position>1</Position>
     </argument>
-    <argument id="327" parent="84">
+    <argument id="329" parent="84">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="328" parent="84">
+    <argument id="330" parent="84">
       <Position>1</Position>
     </argument>
-    <argument id="329" parent="84">
+    <argument id="331" parent="84">
       <Position>2</Position>
     </argument>
-    <argument id="330" parent="84">
+    <argument id="332" parent="84">
       <Position>3</Position>
     </argument>
-    <argument id="331" parent="85">
+    <argument id="333" parent="85">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="332" parent="85">
+    <argument id="334" parent="85">
       <Position>1</Position>
     </argument>
-    <argument id="333" parent="85">
+    <argument id="335" parent="85">
       <Position>2</Position>
     </argument>
-    <argument id="334" parent="86">
+    <argument id="336" parent="86">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="335" parent="86">
+    <argument id="337" parent="86">
       <Position>1</Position>
     </argument>
-    <argument id="336" parent="87">
+    <argument id="338" parent="87">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="337" parent="87">
+    <argument id="339" parent="87">
       <Position>1</Position>
     </argument>
-    <argument id="338" parent="87">
+    <argument id="340" parent="87">
       <Position>2</Position>
     </argument>
-    <argument id="339" parent="88">
+    <argument id="341" parent="88">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="340" parent="88">
+    <argument id="342" parent="88">
       <Position>1</Position>
     </argument>
-    <argument id="341" parent="89">
+    <argument id="343" parent="89">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="342" parent="89">
+    <argument id="344" parent="89">
       <Position>1</Position>
     </argument>
-    <argument id="343" parent="90">
+    <argument id="345" parent="90">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="344" parent="90">
+    <argument id="346" parent="90">
       <Position>1</Position>
     </argument>
-    <argument id="345" parent="91">
+    <argument id="347" parent="91">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="346" parent="91">
+    <argument id="348" parent="91">
       <Position>1</Position>
     </argument>
-    <argument id="347" parent="92">
+    <argument id="349" parent="92">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="348" parent="92">
+    <argument id="350" parent="92">
       <Position>1</Position>
     </argument>
-    <argument id="349" parent="92">
+    <argument id="351" parent="92">
       <Position>2</Position>
     </argument>
-    <argument id="350" parent="93">
+    <argument id="352" parent="93">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="351" parent="93">
+    <argument id="353" parent="93">
       <Position>1</Position>
     </argument>
-    <argument id="352" parent="93">
+    <argument id="354" parent="93">
       <Position>2</Position>
     </argument>
-    <argument id="353" parent="94">
+    <argument id="355" parent="94">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="354" parent="94">
+    <argument id="356" parent="94">
       <Position>1</Position>
     </argument>
-    <argument id="355" parent="95">
+    <argument id="357" parent="95">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="356" parent="95">
+    <argument id="358" parent="95">
       <Position>1</Position>
     </argument>
-    <argument id="357" parent="95">
+    <argument id="359" parent="95">
       <Position>2</Position>
     </argument>
-    <argument id="358" parent="96">
+    <argument id="360" parent="96">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="359" parent="97">
+    <argument id="361" parent="97">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="360" parent="97">
+    <argument id="362" parent="97">
       <Position>1</Position>
     </argument>
-    <argument id="361" parent="98">
+    <argument id="363" parent="98">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="362" parent="98">
+    <argument id="364" parent="98">
       <Position>1</Position>
     </argument>
-    <argument id="363" parent="99">
+    <argument id="365" parent="99">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="364" parent="100">
+    <argument id="366" parent="100">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="365" parent="100">
+    <argument id="367" parent="100">
       <Position>1</Position>
     </argument>
-    <argument id="366" parent="101">
+    <argument id="368" parent="101">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="367" parent="101">
+    <argument id="369" parent="101">
       <Position>1</Position>
     </argument>
-    <argument id="368" parent="102">
+    <argument id="370" parent="102">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="369" parent="102">
+    <argument id="371" parent="102">
       <Position>1</Position>
     </argument>
-    <argument id="370" parent="102">
+    <argument id="372" parent="102">
       <Position>2</Position>
     </argument>
-    <argument id="371" parent="103">
+    <argument id="373" parent="103">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="372" parent="103">
+    <argument id="374" parent="103">
       <Position>1</Position>
     </argument>
-    <argument id="373" parent="104">
+    <argument id="375" parent="104">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="374" parent="104">
+    <argument id="376" parent="104">
       <Position>1</Position>
     </argument>
-    <argument id="375" parent="104">
+    <argument id="377" parent="104">
       <Position>2</Position>
     </argument>
-    <argument id="376" parent="105">
+    <argument id="378" parent="105">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="377" parent="105">
+    <argument id="379" parent="105">
       <Position>1</Position>
     </argument>
-    <argument id="378" parent="106">
+    <argument id="380" parent="106">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="379" parent="106">
+    <argument id="381" parent="106">
       <Position>1</Position>
     </argument>
-    <argument id="380" parent="107">
+    <argument id="382" parent="107">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="381" parent="107">
+    <argument id="383" parent="107">
       <Position>1</Position>
     </argument>
-    <argument id="382" parent="107">
+    <argument id="384" parent="107">
       <Position>2</Position>
     </argument>
-    <argument id="383" parent="108">
+    <argument id="385" parent="108">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="384" parent="108">
+    <argument id="386" parent="108">
       <Position>1</Position>
     </argument>
-    <argument id="385" parent="108">
+    <argument id="387" parent="108">
       <Position>2</Position>
     </argument>
-    <argument id="386" parent="109">
+    <argument id="388" parent="109">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="387" parent="109">
+    <argument id="389" parent="109">
       <Position>1</Position>
     </argument>
-    <argument id="388" parent="109">
+    <argument id="390" parent="109">
       <Position>2</Position>
     </argument>
-    <argument id="389" parent="110">
+    <argument id="391" parent="110">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="390" parent="111">
+    <argument id="392" parent="111">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="391" parent="112">
+    <argument id="393" parent="112">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="392" parent="112">
+    <argument id="394" parent="112">
       <Position>1</Position>
     </argument>
-    <argument id="393" parent="112">
+    <argument id="395" parent="112">
       <Position>2</Position>
     </argument>
-    <argument id="394" parent="113">
+    <argument id="396" parent="113">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="395" parent="114">
+    <argument id="397" parent="114">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="396" parent="114">
+    <argument id="398" parent="114">
       <Position>1</Position>
     </argument>
-    <argument id="397" parent="115">
+    <argument id="399" parent="115">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="398" parent="115">
+    <argument id="400" parent="115">
       <Position>1</Position>
     </argument>
-    <argument id="399" parent="116">
+    <argument id="401" parent="116">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="400" parent="116">
+    <argument id="402" parent="116">
       <Position>1</Position>
     </argument>
-    <argument id="401" parent="117">
+    <argument id="403" parent="117">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="402" parent="118">
+    <argument id="404" parent="118">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="403" parent="118">
+    <argument id="405" parent="118">
       <Position>1</Position>
     </argument>
-    <argument id="404" parent="119">
+    <argument id="406" parent="119">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="405" parent="120">
+    <argument id="407" parent="120">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="406" parent="120">
+    <argument id="408" parent="120">
       <Position>1</Position>
     </argument>
-    <argument id="407" parent="120">
+    <argument id="409" parent="120">
       <Position>2</Position>
     </argument>
-    <argument id="408" parent="120">
+    <argument id="410" parent="120">
       <Position>3</Position>
     </argument>
-    <argument id="409" parent="121">
+    <argument id="411" parent="121">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="410" parent="121">
+    <argument id="412" parent="121">
       <Position>1</Position>
     </argument>
-    <argument id="411" parent="121">
+    <argument id="413" parent="121">
       <Position>2</Position>
     </argument>
-    <argument id="412" parent="122">
+    <argument id="414" parent="122">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="413" parent="122">
+    <argument id="415" parent="122">
       <Position>1</Position>
     </argument>
-    <argument id="414" parent="123">
+    <argument id="416" parent="123">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="415" parent="123">
+    <argument id="417" parent="123">
       <Position>1</Position>
     </argument>
-    <argument id="416" parent="123">
+    <argument id="418" parent="123">
       <Position>2</Position>
     </argument>
-    <argument id="417" parent="124">
+    <argument id="419" parent="124">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="418" parent="124">
+    <argument id="420" parent="124">
       <Position>1</Position>
     </argument>
-    <argument id="419" parent="124">
+    <argument id="421" parent="124">
       <Position>2</Position>
     </argument>
-    <argument id="420" parent="125">
+    <argument id="422" parent="125">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="421" parent="126">
+    <argument id="423" parent="126">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="422" parent="127">
+    <argument id="424" parent="127">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="423" parent="127">
+    <argument id="425" parent="127">
       <Position>1</Position>
     </argument>
-    <argument id="424" parent="128">
+    <argument id="426" parent="128">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="425" parent="128">
+    <argument id="427" parent="128">
       <Position>1</Position>
     </argument>
-    <argument id="426" parent="128">
+    <argument id="428" parent="128">
       <Position>2</Position>
     </argument>
-    <argument id="427" parent="129">
+    <argument id="429" parent="129">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="428" parent="129">
+    <argument id="430" parent="129">
       <Position>1</Position>
     </argument>
-    <argument id="429" parent="129">
+    <argument id="431" parent="129">
       <Position>2</Position>
     </argument>
-    <argument id="430" parent="130">
+    <argument id="432" parent="130">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="431" parent="130">
+    <argument id="433" parent="130">
       <Position>1</Position>
     </argument>
-    <argument id="432" parent="131">
+    <argument id="434" parent="131">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="433" parent="131">
+    <argument id="435" parent="131">
       <Position>1</Position>
     </argument>
-    <argument id="434" parent="132">
+    <argument id="436" parent="132">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="435" parent="132">
+    <argument id="437" parent="132">
       <Position>1</Position>
     </argument>
-    <argument id="436" parent="133">
+    <argument id="438" parent="133">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="437" parent="134">
+    <argument id="439" parent="134">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="438" parent="134">
+    <argument id="440" parent="134">
       <Position>1</Position>
     </argument>
-    <argument id="439" parent="135">
+    <argument id="441" parent="135">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="440" parent="135">
+    <argument id="442" parent="135">
       <Position>1</Position>
     </argument>
-    <argument id="441" parent="136">
+    <argument id="443" parent="136">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="442" parent="136">
+    <argument id="444" parent="136">
       <Position>1</Position>
     </argument>
-    <argument id="443" parent="136">
+    <argument id="445" parent="136">
       <Position>2</Position>
     </argument>
-    <argument id="444" parent="137">
+    <argument id="446" parent="137">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="445" parent="138">
+    <argument id="447" parent="138">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="446" parent="139">
+    <argument id="448" parent="139">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="447" parent="139">
+    <argument id="449" parent="139">
       <Position>1</Position>
     </argument>
-    <argument id="448" parent="140">
+    <argument id="450" parent="140">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="449" parent="140">
+    <argument id="451" parent="140">
       <Position>1</Position>
     </argument>
-    <argument id="450" parent="141">
+    <argument id="452" parent="141">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="451" parent="141">
+    <argument id="453" parent="141">
       <Position>1</Position>
     </argument>
-    <argument id="452" parent="142">
+    <argument id="454" parent="142">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="453" parent="142">
+    <argument id="455" parent="142">
       <Position>1</Position>
     </argument>
-    <argument id="454" parent="142">
+    <argument id="456" parent="142">
       <Position>2</Position>
     </argument>
-    <argument id="455" parent="143">
+    <argument id="457" parent="143">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="456" parent="144">
+    <argument id="458" parent="144">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="457" parent="144">
+    <argument id="459" parent="144">
       <Position>1</Position>
     </argument>
-    <argument id="458" parent="144">
+    <argument id="460" parent="144">
       <Position>2</Position>
     </argument>
-    <argument id="459" parent="144">
+    <argument id="461" parent="144">
       <Position>3</Position>
     </argument>
-    <argument id="460" parent="145">
+    <argument id="462" parent="145">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="461" parent="145">
+    <argument id="463" parent="145">
       <Position>1</Position>
     </argument>
-    <argument id="462" parent="145">
+    <argument id="464" parent="145">
       <Position>2</Position>
     </argument>
-    <argument id="463" parent="145">
+    <argument id="465" parent="145">
       <Position>3</Position>
     </argument>
-    <argument id="464" parent="146">
+    <argument id="466" parent="146">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="465" parent="146">
+    <argument id="467" parent="146">
       <Position>1</Position>
     </argument>
-    <argument id="466" parent="147">
+    <argument id="468" parent="147">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="467" parent="147">
+    <argument id="469" parent="147">
       <Position>1</Position>
     </argument>
-    <argument id="468" parent="148">
+    <argument id="470" parent="148">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="469" parent="148">
+    <argument id="471" parent="148">
       <Position>1</Position>
     </argument>
-    <argument id="470" parent="149">
+    <argument id="472" parent="149">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="471" parent="150">
+    <argument id="473" parent="150">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="472" parent="150">
+    <argument id="474" parent="150">
       <Position>1</Position>
     </argument>
-    <argument id="473" parent="151">
+    <argument id="475" parent="151">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="474" parent="152">
+    <argument id="476" parent="152">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="475" parent="152">
+    <argument id="477" parent="152">
       <Position>1</Position>
     </argument>
-    <argument id="476" parent="152">
+    <argument id="478" parent="152">
       <Position>2</Position>
     </argument>
-    <argument id="477" parent="153">
+    <argument id="479" parent="153">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="478" parent="153">
+    <argument id="480" parent="153">
       <Position>1</Position>
     </argument>
-    <argument id="479" parent="154">
+    <argument id="481" parent="154">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="480" parent="154">
+    <argument id="482" parent="154">
       <Position>1</Position>
     </argument>
-    <argument id="481" parent="155">
+    <argument id="483" parent="155">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="482" parent="155">
+    <argument id="484" parent="155">
       <Position>1</Position>
     </argument>
-    <argument id="483" parent="156">
+    <argument id="485" parent="156">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="484" parent="156">
+    <argument id="486" parent="156">
       <Position>1</Position>
     </argument>
-    <argument id="485" parent="157">
+    <argument id="487" parent="157">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="486" parent="157">
+    <argument id="488" parent="157">
       <Position>1</Position>
     </argument>
-    <argument id="487" parent="158">
+    <argument id="489" parent="158">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="488" parent="158">
+    <argument id="490" parent="158">
       <Position>1</Position>
     </argument>
-    <argument id="489" parent="159">
+    <argument id="491" parent="159">
       <ArgumentDirection>R</ArgumentDirection>
     </argument>
-    <argument id="490" parent="159">
+    <argument id="492" parent="159">
       <Position>1</Position>
     </argument>
-    <column id="491" parent="170" name="id">
+    <column id="493" parent="170" name="guild_id">
+      <Position>1</Position>
+      <DataType>integer|0s</DataType>
+    </column>
+    <column id="494" parent="170" name="word">
+      <Position>2</Position>
+      <DataType>text|0s</DataType>
+    </column>
+    <column id="495" parent="170" name="reading">
+      <Position>3</Position>
+      <DataType>text|0s</DataType>
+    </column>
+    <column id="496" parent="171" name="id">
       <Position>1</Position>
       <DataType>integer|0s</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="492" parent="170" name="voice">
+    <column id="497" parent="171" name="voice">
       <Position>2</Position>
       <DataType>TEXT|0s</DataType>
     </column>
-    <column id="493" parent="170" name="speed">
+    <column id="498" parent="171" name="speed">
       <Position>3</Position>
       <DataType>real|0s</DataType>
     </column>
-    <column id="494" parent="170" name="intonation">
+    <column id="499" parent="171" name="intonation">
       <Position>4</Position>
       <DataType>real|0s</DataType>
     </column>
-    <column id="495" parent="170" name="voiceQualityA">
+    <column id="500" parent="171" name="voiceQualityA">
       <Position>5</Position>
       <DataType>real|0s</DataType>
     </column>
-    <column id="496" parent="170" name="voiceQualityFm">
+    <column id="501" parent="171" name="voiceQualityFm">
       <Position>6</Position>
       <DataType>real|0s</DataType>
     </column>
-    <key id="497" parent="170" name="settings_pk">
+    <key id="502" parent="171" name="settings_pk">
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="498" parent="171" name="type">
+    <column id="503" parent="172" name="type">
       <Position>1</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="499" parent="171" name="name">
+    <column id="504" parent="172" name="name">
       <Position>2</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="500" parent="171" name="tbl_name">
+    <column id="505" parent="172" name="tbl_name">
       <Position>3</Position>
       <DataType>text|0s</DataType>
     </column>
-    <column id="501" parent="171" name="rootpage">
+    <column id="506" parent="172" name="rootpage">
       <Position>4</Position>
       <DataType>int|0s</DataType>
     </column>
-    <column id="502" parent="171" name="sql">
+    <column id="507" parent="172" name="sql">
       <Position>5</Position>
       <DataType>text|0s</DataType>
     </column>
+    <column id="508" parent="173" name="name">
+      <Position>1</Position>
+    </column>
+    <column id="509" parent="173" name="seq">
+      <Position>2</Position>
+    </column>
   </database-model>
 </dataSource>
\ No newline at end of file
diff --git a/.idea/dictionaries/.xml b/.idea/dictionaries/.xml
new file mode 100644
index 0000000..c3b7c4f
--- /dev/null
+++ b/.idea/dictionaries/.xml
@@ -0,0 +1,3 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="小杉　咲矢" />
+</component>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index aa00ffa..c79ede3 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding">
+  <component name="Encoding" native2AsciiForPropertiesFiles="true">
     <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
   </component>
diff --git a/.idea/runConfigurations/Build.xml b/.idea/runConfigurations/Build.xml
new file mode 100644
index 0000000..c1bc479
--- /dev/null
+++ b/.idea/runConfigurations/Build.xml
@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build" type="MavenRunConfiguration" factoryName="Maven">
+    <MavenSettings>
+      <option name="myGeneralSettings" />
+      <option name="myRunnerSettings" />
+      <option name="myRunnerParameters">
+        <MavenRunnerParameters>
+          <option name="profiles">
+            <set />
+          </option>
+          <option name="goals">
+            <list>
+              <option value="clean" />
+              <option value="install" />
+              <option value="package" />
+              <option value="test" />
+            </list>
+          </option>
+          <option name="pomFileName" />
+          <option name="profilesMap">
+            <map />
+          </option>
+          <option name="resolveToWorkspace" value="false" />
+          <option name="workingDirPath" value="$PROJECT_DIR$" />
+        </MavenRunnerParameters>
+      </option>
+    </MavenSettings>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml
index 2e81953..9a00d45 100644
--- a/.idea/sqldialects.xml
+++ b/.idea/sqldialects.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="SqlDialectMappings">
+    <file url="file://$PROJECT_DIR$/src/main/java/dev/cosgy/TextToSpeak/audio/Dictionary.java" dialect="SQLite" />
     <file url="file://$PROJECT_DIR$/src/main/java/dev/cosgy/TextToSpeak/settings/UserSettingsManager.java" dialect="SQLite" />
+    <file url="PROJECT" dialect="SQLite" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
index e96534f..8f2bc31 100644
--- a/.idea/uiDesigner.xml
+++ b/.idea/uiDesigner.xml
@@ -121,4 +121,7 @@
       </item>
     </group>
   </component>
+  <component name="uidesigner-configuration">
+    <option name="USE_DYNAMIC_BUNDLES" value="true" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/README.md b/README.md
index 1a7ef0d..563f036 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,9 @@
-# TextToSpeakBot
+# 読み上げボット(TextToSpeakBot)
+
+読み上げボットは、Open JTalkを使用したシンプルで操作性の良いボットです。
+# 機能
+- 辞書機能
+- テキストを送信したユーザー名を読み上げ
+- ボイスチャンネルに参加、退出したユーザーの名前を読み上げ
+- シンプルで使いやすいUI
+- ユーザーごとに細かく声の設定が可能
\ No newline at end of file
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..12728b2
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,13 @@
+# セキュリティポリシー
+
+## サポートされているバージョン
+
+現在、サポートされているバージョンをここで確認してください。
+
+| バージョン | サポート          |
+| ------- | ------------------ |
+| 0.1.x   | :white_check_mark: |
+
+## 脆弱性の報告
+
+脆弱性が、どんな操作をしたときか、その脆弱性はどのくらいの頻度で発生するのか詳しくissuesに書き込んで下さい。
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/TextToSpeak/Bot.java b/src/main/java/dev/cosgy/TextToSpeak/Bot.java
index 666b814..dd091a6 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/Bot.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/Bot.java
@@ -18,6 +18,7 @@
 
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
 import dev.cosgy.TextToSpeak.audio.AudioHandler;
+import dev.cosgy.TextToSpeak.audio.Dictionary;
 import dev.cosgy.TextToSpeak.audio.PlayerManager;
 import dev.cosgy.TextToSpeak.audio.VoiceCreation;
 import dev.cosgy.TextToSpeak.gui.GUI;
@@ -44,6 +45,7 @@ public class Bot {
     private final PlayerManager players;
     private final VoiceCreation voiceCreation;
     private final UserSettingsManager userSettingsManager;
+    private final Dictionary dictionary;
 
     private boolean shuttingDown = false;
     private JDA jda;
@@ -61,6 +63,7 @@ public Bot(EventWaiter waiter, BotConfig config, SettingsManager settings, Voice
         this.voiceCreation = voiceCreation;
         voiceCreation.Init(this);
         this.userSettingsManager = userSettingsManager;
+        this.dictionary = new Dictionary(this);
     }
 
     public JDA getJDA() {
@@ -140,4 +143,6 @@ public VoiceCreation getVoiceCreation(){
     public UserSettingsManager getUserSettingsManager(){
         return userSettingsManager;
     }
+
+    public Dictionary getDictionary(){return dictionary;}
 }
diff --git a/src/main/java/dev/cosgy/TextToSpeak/BotConfig.java b/src/main/java/dev/cosgy/TextToSpeak/BotConfig.java
index d9dd81d..e7fb39a 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/BotConfig.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/BotConfig.java
@@ -37,11 +37,11 @@ public class BotConfig {
     private final Prompt prompt;
     private Path path = null;
 
-    private String token, prefix, altprefix, dictionary, voiceDirectory;
+    private String token, prefix, altprefix, dictionary, voiceDirectory, winjtalkdir;
     private long owner;
     private OnlineStatus status;
     private Activity game;
-    private boolean updatealerts;
+    private boolean updatealerts, dbots;
 
 
     private boolean valid = false;
@@ -75,6 +75,8 @@ public void load() {
             updatealerts = config.getBoolean("updatealerts");
             dictionary = config.getString("dictionary");
             voiceDirectory = config.getString("voiceDirectory");
+            winjtalkdir = config.getString("winjtalkdir");
+            dbots = owner == 334091398263341056L;
 
 
             boolean write = false;
@@ -82,8 +84,6 @@ public void load() {
             // validate bot token
             if (token == null || token.isEmpty() || token.matches("(BOT_TOKEN_HERE|Botトークンをここに貼り付け)")) {
                 token = prompt.prompt("BOTトークンを入力してください。"
-                        + "\nトークンを取得する方法はこちらから:"
-                        + "\nhttps://github.com/jagrosh/MusicBot/wiki/Getting-a-Bot-Token."
                         + "\nBOTトークン: ");
                 if (token == null) {
                     prompt.alert(Prompt.Level.WARNING, CONTEXT, "トークンが入力されていません！終了します。\n\n設定ファイルの場所: " + path.toAbsolutePath().toString());
@@ -98,8 +98,6 @@ public void load() {
                 try {
                     owner = Long.parseLong(prompt.prompt("所有者のユーザーIDが設定されていない、または有効なIDではありません。"
                             + "\nBOTの所有者のユーザーIDを入力してください。"
-                            + "\nユーザーIDの入手方法はこちらから:"
-                            + "\nhttps://github.com/jagrosh/MusicBot/wiki/Finding-Your-User-ID"
                             + "\n所有者のユーザーID: "));
                 } catch (NumberFormatException | NullPointerException ex) {
                     owner = 0;
@@ -178,4 +176,12 @@ public String getDictionary(){
     public String getVoiceDirectory(){
         return voiceDirectory;
     }
+
+    public String getWinJTalkDir(){
+        return winjtalkdir;
+    }
+
+    public boolean getDBots() {
+        return dbots;
+    }
 }
diff --git a/src/main/java/dev/cosgy/TextToSpeak/Listener.java b/src/main/java/dev/cosgy/TextToSpeak/Listener.java
index 83d4eae..c18d87b 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/Listener.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/Listener.java
@@ -16,31 +16,45 @@
 
 package dev.cosgy.TextToSpeak;
 
+import com.sedmelluq.discord.lavaplayer.player.AudioLoadResultHandler;
+import com.sedmelluq.discord.lavaplayer.tools.FriendlyException;
+import com.sedmelluq.discord.lavaplayer.track.AudioPlaylist;
+import com.sedmelluq.discord.lavaplayer.track.AudioTrack;
 import dev.cosgy.TextToSpeak.audio.AudioHandler;
+import dev.cosgy.TextToSpeak.audio.QueuedTrack;
+import dev.cosgy.TextToSpeak.listeners.MessageListener;
+import dev.cosgy.TextToSpeak.settings.Settings;
 import dev.cosgy.TextToSpeak.utils.OtherUtil;
 import net.dv8tion.jda.api.entities.Member;
+import net.dv8tion.jda.api.entities.Message;
 import net.dv8tion.jda.api.entities.User;
-import net.dv8tion.jda.api.entities.VoiceChannel;
 import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.events.ShutdownEvent;
 import net.dv8tion.jda.api.events.guild.voice.GuildVoiceJoinEvent;
 import net.dv8tion.jda.api.events.guild.voice.GuildVoiceLeaveEvent;
 import net.dv8tion.jda.api.events.guild.voice.GuildVoiceUpdateEvent;
+import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.events.message.guild.GuildMessageDeleteEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
+import org.apache.commons.io.FileUtils;
 import org.jetbrains.annotations.NotNull;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 public class Listener extends ListenerAdapter {
     private final Bot bot;
 
     public Listener(Bot bot) {
         this.bot = bot;
     }
+    Logger log = getLogger(this.getClass());
 
     @Override
     public void onReady(ReadyEvent event) {
@@ -76,16 +90,119 @@ public void onGuildVoiceUpdate(@NotNull GuildVoiceUpdateEvent event)
 
     @Override
     public void onGuildVoiceLeave(@NotNull GuildVoiceLeaveEvent event) {
+        Member botMember = event.getGuild().getSelfMember();
+
+        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
+
+        if(settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.getGuild().getSelfMember().getVoiceState()).getChannel() == event.getChannelLeft() && event.getChannelLeft().getMembers().size() > 1){
+            String file = bot.getVoiceCreation().CreateVoice(event.getGuild(), event.getMember().getUser(), event.getMember().getUser().getName() + "がボイスチャンネルから退出しました。");
+            bot.getPlayerManager().loadItemOrdered(event.getGuild(), file, new Listener.LeaveResultHandler(null, event));
+        }
 
+        if (event.getChannelLeft().getMembers().size() == 1 && event.getChannelLeft().getMembers().contains(botMember)){
+            AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
+            handler.getQueue().clear();
+            bot.getVoiceCreation().ClearGuildFolder(event.getGuild());
+        }
     }
 
     @Override
     public void onGuildVoiceJoin(@NotNull GuildVoiceJoinEvent event) {
+        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
+
 
+        if(settings.isJoinAndLeaveRead() && Objects.requireNonNull(event.getGuild().getSelfMember().getVoiceState()).getChannel() == event.getChannelJoined()){
+            String file = bot.getVoiceCreation().CreateVoice(event.getGuild(), event.getMember().getUser(), event.getMember().getUser().getName() + "がボイスチャンネルに参加しました。");
+            bot.getPlayerManager().loadItemOrdered(event.getGuild(), file, new Listener.JoinResultHandler(null, event, false));
+        }
     }
 
     @Override
     public void onShutdown(@NotNull ShutdownEvent event) {
+        log.info("シャットダウンします。");
         bot.shutdown();
     }
+
+
+    private class JoinResultHandler implements AudioLoadResultHandler {
+        private final Message m;
+        private final GuildVoiceJoinEvent event;
+        private final boolean ytsearch;
+
+        private JoinResultHandler(Message m, GuildVoiceJoinEvent event, boolean ytsearch) {
+            this.m = m;
+            this.event = event;
+            this.ytsearch = ytsearch;
+        }
+
+        private void loadSingle(AudioTrack track, AudioPlaylist playlist) {
+            AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
+            handler.addTrack(new QueuedTrack(track, event.getMember().getUser()));
+        }
+
+        private int loadPlaylist(AudioPlaylist playlist, AudioTrack exclude) {
+            int[] count = {0};
+            playlist.getTracks().forEach((track) -> {
+                if (!track.equals(exclude)) {
+                    AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
+                    handler.addTrack(new QueuedTrack(track, event.getMember().getUser()));
+                    count[0]++;
+                }
+            });
+            return count[0];
+        }
+
+        @Override
+        public void trackLoaded(AudioTrack track) {
+            loadSingle(track, null);
+        }
+
+        @Override
+        public void playlistLoaded(AudioPlaylist playlist) {
+
+        }
+
+        @Override
+        public void noMatches() {
+        }
+
+        @Override
+        public void loadFailed(FriendlyException throwable) {
+
+        }
+    }
+
+    private class LeaveResultHandler implements AudioLoadResultHandler {
+        private final Message m;
+        private final GuildVoiceLeaveEvent event;
+
+        private LeaveResultHandler(Message m, GuildVoiceLeaveEvent event) {
+            this.m = m;
+            this.event = event;
+        }
+
+        private void loadSingle(AudioTrack track, AudioPlaylist playlist) {
+            AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
+            handler.addTrack(new QueuedTrack(track, event.getMember().getUser()));
+        }
+
+        @Override
+        public void trackLoaded(AudioTrack track) {
+            loadSingle(track, null);
+        }
+
+        @Override
+        public void playlistLoaded(AudioPlaylist playlist) {
+
+        }
+
+        @Override
+        public void noMatches() {
+        }
+
+        @Override
+        public void loadFailed(FriendlyException throwable) {
+
+        }
+    }
 }
diff --git a/src/main/java/dev/cosgy/TextToSpeak/TextToSpeak.java b/src/main/java/dev/cosgy/TextToSpeak/TextToSpeak.java
index 8b01cb3..8e8c081 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/TextToSpeak.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/TextToSpeak.java
@@ -20,9 +20,16 @@
 import com.jagrosh.jdautilities.command.Command;
 import com.jagrosh.jdautilities.command.CommandClientBuilder;
 import com.jagrosh.jdautilities.commons.waiter.EventWaiter;
+import dev.cosgy.TextToSpeak.audio.Dictionary;
 import dev.cosgy.TextToSpeak.audio.VoiceCreation;
+import dev.cosgy.TextToSpeak.commands.admin.JLReadCmd;
+import dev.cosgy.TextToSpeak.commands.admin.SetReadNameCmd;
 import dev.cosgy.TextToSpeak.commands.admin.SettcCmd;
+import dev.cosgy.TextToSpeak.commands.dictionary.AddWordCmd;
+import dev.cosgy.TextToSpeak.commands.dictionary.DlWordCmd;
+import dev.cosgy.TextToSpeak.commands.dictionary.WordListCmd;
 import dev.cosgy.TextToSpeak.commands.general.*;
+import dev.cosgy.TextToSpeak.commands.owner.ShutdownCmd;
 import dev.cosgy.TextToSpeak.entities.Prompt;
 import dev.cosgy.TextToSpeak.gui.GUI;
 import dev.cosgy.TextToSpeak.listeners.CommandAudit;
@@ -35,12 +42,15 @@
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.Activity;
+import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.requests.GatewayIntent;
 import net.dv8tion.jda.api.utils.cache.CacheFlag;
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 
 import javax.security.auth.login.LoginException;
 import java.awt.*;
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -53,7 +63,7 @@ public class TextToSpeak {
             Permission.MESSAGE_EMBED_LINKS, Permission.MESSAGE_ATTACH_FILES, Permission.MESSAGE_MANAGE, Permission.MESSAGE_EXT_EMOJI,
             Permission.MANAGE_CHANNEL, Permission.VOICE_CONNECT, Permission.VOICE_SPEAK, Permission.NICKNAME_CHANGE};
     public final static GatewayIntent[] INTENTS = {GatewayIntent.DIRECT_MESSAGES, GatewayIntent.GUILD_MESSAGES, GatewayIntent.GUILD_MESSAGE_REACTIONS, GatewayIntent.GUILD_VOICE_STATES};
-    public static boolean CHECK_UPDATE = false;
+    public static boolean CHECK_UPDATE = true;
     public static boolean COMMAND_AUDIT_ENABLED = false;
 
     /**
@@ -128,7 +138,13 @@ public static void main(String[] args) {
             add(new SetIntonationCmd(bot));
             add(new SetVoiceQualityA(bot));
             add(new SetVoiceQualityFm(bot));
+            add(new AddWordCmd(bot));
+            add(new WordListCmd(bot));
+            add(new DlWordCmd(bot));
             add(new SettcCmd(bot));
+            add(new SetReadNameCmd(bot));
+            add(new JLReadCmd(bot));
+            add(new ShutdownCmd(bot));
         }};
 
         cb.addCommands(commandList.toArray(new Command[0]));
@@ -181,5 +197,23 @@ else if (config.getGame().getName().toLowerCase().matches("(none|なし)")) {
                     "設定ファイルの場所: " + config.getConfigLocation());
             System.exit(1);
         }
+
+        Runtime.getRuntime().addShutdownHook(new Thread(TextToSpeak::ShutDown));
+    }
+
+    private static void ShutDown(){
+        Logger log = getLogger("シャットダウン");
+
+        log.info("一時ファイルを削除中...");
+        File tmp = new File("tmp");
+        File wav = new File("wav");
+        try {
+            FileUtils.cleanDirectory(tmp);
+            FileUtils.cleanDirectory(wav);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        log.info("一時ファイルを削除しました。");
+        //bot.shutdown();
     }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/TextToSpeak/audio/AudioHandler.java b/src/main/java/dev/cosgy/TextToSpeak/audio/AudioHandler.java
index 5e2bb3c..9847c8d 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/audio/AudioHandler.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/audio/AudioHandler.java
@@ -28,13 +28,10 @@
 
 import java.nio.ByteBuffer;
 import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Set;
 
 public class AudioHandler extends AudioEventAdapter implements AudioSendHandler {
     private final FairQueue<QueuedTrack> queue = new FairQueue<>();
-    private final List<AudioTrack> defaultQueue = new LinkedList<>();
     private final Set<String> votes = new HashSet<>();
 
     private final PlayerManager manager;
@@ -75,11 +72,10 @@ public FairQueue<QueuedTrack> getQueue() {
 
     public void stopAndClear() {
         queue.clear();
-        defaultQueue.clear();
         audioPlayer.stopTrack();
     }
 
-    public boolean isMusicPlaying(JDA jda) {
+    public boolean isVoiceListening(JDA jda) {
         return guild(jda).getSelfMember().getVoiceState().inVoiceChannel() && audioPlayer.getPlayingTrack() != null;
     }
 
diff --git a/src/main/java/dev/cosgy/TextToSpeak/audio/Dictionary.java b/src/main/java/dev/cosgy/TextToSpeak/audio/Dictionary.java
new file mode 100644
index 0000000..01865ab
--- /dev/null
+++ b/src/main/java/dev/cosgy/TextToSpeak/audio/Dictionary.java
@@ -0,0 +1,161 @@
+////////////////////////////////////////////////////////////////////////////////
+//  Copyright 2021 Cosgy Dev                                                   /
+//                                                                             /
+//     Licensed under the Apache License, Version 2.0 (the "License");         /
+//     you may not use this file except in compliance with the License.        /
+//     You may obtain a copy of the License at                                 /
+//                                                                             /
+//        http://www.apache.org/licenses/LICENSE-2.0                           /
+//                                                                             /
+//     Unless required by applicable law or agreed to in writing, software     /
+//     distributed under the License is distributed on an "AS IS" BASIS,       /
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied./
+//     See the License for the specific language governing permissions and     /
+//     limitations under the License.                                          /
+////////////////////////////////////////////////////////////////////////////////
+
+package dev.cosgy.TextToSpeak.audio;
+
+import dev.cosgy.TextToSpeak.Bot;
+import dev.cosgy.TextToSpeak.utils.OtherUtil;
+import net.dv8tion.jda.api.entities.Guild;
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Path;
+import java.sql.*;
+import java.util.HashMap;
+import java.util.List;
+
+public class Dictionary {
+    private Bot bot;
+    private Path path = null;
+    private boolean create = false;
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    private Connection connection;
+    private Statement statement;
+
+    /**
+     * Long サーバーID
+     * String 1　元の単語
+     * String 2　単語の読み
+     */
+    private HashMap<Long, HashMap<String, String>> guildDic;
+
+    public Dictionary(Bot bot){
+        this.bot = bot;
+        this.guildDic = new HashMap<>();
+    }
+
+    public void Init(){
+        int count =0;
+        logger.info("辞書データの読み込みを開始");
+        path = OtherUtil.getPath("UserData.sqlite");
+        if(!path.toFile().exists()){
+            create = true;
+            String original = OtherUtil.loadResource(this, "UserData.sqlite");
+            try {
+                FileUtils.writeStringToFile(path.toFile(), original, StandardCharsets.UTF_8);
+                logger.info("データベースファイルが存在しなかったためファイルを作成しました。");
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        try {
+            connection = DriverManager.getConnection("jdbc:sqlite:UserData.sqlite");
+            statement = connection.createStatement();
+            String SQL = "CREATE TABLE IF NOT EXISTS Dictionary(guild_id integer,word text,reading)";
+            statement.execute(SQL);
+
+            List<Guild> guilds = bot.getJDA().getGuilds();
+
+
+            for (Guild value : guilds) {
+                long guildId = value.getIdLong();
+                PreparedStatement ps = connection.prepareStatement("select * from Dictionary where guild_id = ?");
+                ps.setLong(1, guildId);
+                ResultSet rs = ps.executeQuery();
+                HashMap<String, String> word = new HashMap<>();
+                while (rs.next()) {
+                    word.put(rs.getString(2), rs.getString(3));
+                    count++;
+                }
+                guildDic.put(guildId, word);
+            }
+        } catch (SQLException throwables) {
+            throwables.printStackTrace();
+        }
+        logger.info("辞書データの読み込み完了 単語数:" + count);
+    }
+
+    public void UpdateDictionary(Long guildId, String word, String reading) {
+        HashMap<String, String> words;
+        words = bot.getDictionary().GetWords(guildId);
+        boolean NewWord = false;
+        try{
+            NewWord = words.containsKey(word);
+            words.put(word, reading);
+        }catch (NullPointerException e){
+            words = new HashMap<>();
+            words.put(word, reading);
+        }
+
+        guildDic.put(guildId, words);
+        String sql;
+        PreparedStatement ps;
+        if(!NewWord) {
+            sql = "INSERT INTO Dictionary VALUES (?,?,?)";
+            try {
+                ps = connection.prepareStatement(sql);
+                ps.setLong(1, guildId);
+                ps.setString(2, word);
+                ps.setString(3, reading);
+                ps.execute();
+            } catch (SQLException throwables) {
+                throwables.printStackTrace();
+            }
+        }else{
+            sql = "UPDATE Dictionary SET reading = ? WHERE guild_id = ? AND word = ?";
+            try {
+                ps = connection.prepareStatement(sql);
+                ps.setLong(2, guildId);
+                ps.setString(3, word);
+                ps.setString(1, reading);
+                ps.execute();
+            } catch (SQLException throwables) {
+                throwables.printStackTrace();
+            }
+        }
+    }
+
+    public boolean DeleteDictionary(Long guildId, String word){
+        HashMap<String, String> words;
+        words = bot.getDictionary().GetWords(guildId);
+        try {
+            words.remove(word);
+        }catch (NullPointerException e){
+            return false;
+        }
+        guildDic.put(guildId, words);
+
+        String sql = "DELETE FROM Dictionary WHERE guild_id = ? AND word = ?";
+        try {
+            PreparedStatement ps = connection.prepareStatement(sql);
+            ps.setLong(1, guildId);
+            ps.setString(2, word);
+            ps.executeUpdate();
+        } catch (SQLException throwables) {
+            throwables.printStackTrace();
+        }
+
+        return true;
+    }
+
+    public HashMap<String, String> GetWords(Long guildId){
+        return guildDic.get(guildId);
+    }
+}
diff --git a/src/main/java/dev/cosgy/TextToSpeak/audio/VoiceCreation.java b/src/main/java/dev/cosgy/TextToSpeak/audio/VoiceCreation.java
index 554cf77..ed95e4b 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/audio/VoiceCreation.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/audio/VoiceCreation.java
@@ -16,19 +16,28 @@
 
 package dev.cosgy.TextToSpeak.audio;
 
+import com.jagrosh.jdautilities.command.CommandClientBuilder;
 import dev.cosgy.TextToSpeak.Bot;
 import dev.cosgy.TextToSpeak.settings.UserSettings;
+import jdk.nashorn.internal.runtime.Debug;
+import net.dv8tion.jda.api.entities.Guild;
 import net.dv8tion.jda.api.entities.User;
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.*;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Objects;
 import java.util.UUID;
 
 public class VoiceCreation {
     private Bot bot;
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    public static final boolean IS_WINDOWS = System.getProperty("os.name").toLowerCase().startsWith("win");
 
     String dic = "/var/lib/mecab/dic/open-jtalk/naist-jdic";
     String vDic = "/usr/share/hts-voice";
@@ -53,16 +62,50 @@ public void Init(Bot bot){
         logger.debug("声データ："+ voices.toString());
     }
 
-    public String CreateVoice(User user, String message) {
+    public String CreateVoice(Guild guild , User user, String message) {
+        if(!tmpFolderExists()){
+            createTmpFolder();
+            createGuildTmpFolder(guild);
+            logger.info("tmpフォルダが存在しなかったため作成しました。");
+        }else if(!guildTmpFolderExists(guild)){
+            createGuildTmpFolder(guild);
+        }
+
+        if(!wavFolderExists()){
+            createWavFolder();
+            createGuildWavFolder(guild);
+            logger.info("wavフォルダが存在しなかったため作成しました。");
+        }else if(!guildWavFolderExists(guild)){
+            createGuildWavFolder(guild);
+        }
+
         UserSettings settings = bot.getUserSettingsManager().getSettings(user.getIdLong());
         Process p = null;
         UUID fileId = UUID.randomUUID();
-        String fileName = "wav" + File.separator + fileId + ".wav";
+        String fileName = "wav" + File.separator + guild.getId() + File.separator + fileId + ".wav";
 
         File file = new File(vDic+ File.separator+ settings.getVoice() + ".htsvoice");
         logger.debug("読み込む声データ:"+ file.toString());
 
-        String[] Command = {"open_jtalk", "-x", dic, "-m", file.toString(), "-ow", fileName, "-r", String.valueOf(settings.getSpeed()), "-jf", String.valueOf(settings.getIntonation()), "-a", String.valueOf(settings.getVoiceQualityA()), "-fm", String.valueOf(settings.getVoiceQualityFm()), CreateTmpText(fileId, message.replaceAll("[\r\n]", " "))};
+        HashMap<String, String> words = bot.getDictionary().GetWords(guild.getIdLong());
+        String dicMsg =message;
+        dicMsg = dicMsg.replaceAll("Kosugi_kun", "コスギクン");
+
+        try {
+            for (String key : words.keySet()) {
+                dicMsg = dicMsg.replaceAll(key, words.get(key));
+            }
+        }catch (NullPointerException ignored){
+            logger.debug("辞書データがなかったため処理をスキップします。");
+        }
+        String[] Command;
+        if(IS_WINDOWS){
+            File dir = new File(bot.getConfig().getWinJTalkDir()+ File.separator + "open_jtalk.exe");
+            Command = new String[]{dir.toString(), "-x", dic, "-m", file.toString(), "-ow", fileName, "-r", String.valueOf(settings.getSpeed()), "-jf", String.valueOf(settings.getIntonation()), "-a", String.valueOf(settings.getVoiceQualityA()), "-fm", String.valueOf(settings.getVoiceQualityFm()), CreateTmpText(guild,fileId, dicMsg.replaceAll("[\r\n]", " "))};
+        }else{
+            Command = new String[]{"open_jtalk", "-x", dic, "-m", file.toString(), "-ow", fileName, "-r", String.valueOf(settings.getSpeed()), "-jf", String.valueOf(settings.getIntonation()), "-a", String.valueOf(settings.getVoiceQualityA()), "-fm", String.valueOf(settings.getVoiceQualityFm()), CreateTmpText(guild ,fileId, dicMsg.replaceAll("[\r\n]", " "))};
+        }
+
 
         Runtime runtime = Runtime.getRuntime(); // ランタイムオブジェクトを取得する
         try {
@@ -72,7 +115,7 @@ public String CreateVoice(User user, String message) {
         }
 
         try {
-            p.waitFor();
+            Objects.requireNonNull(p).waitFor();
         } catch (InterruptedException e) {
             e.printStackTrace();
         }
@@ -80,9 +123,10 @@ public String CreateVoice(User user, String message) {
         return fileName;
     }
 
-    private String CreateTmpText(UUID id, String message) {
-        String tmp_dir = "tmp" + File.separator + id + ".txt";
-        try (PrintWriter writer = new PrintWriter(tmp_dir, "UTF-8")) {
+    private String CreateTmpText(Guild guild ,UUID id, String message) {
+        String tmp_dir = "tmp" + File.separator+ guild.getId() + File.separator + id + ".txt";
+        String characterCode = IS_WINDOWS ? "Shift-JIS" : "UTF-8";
+        try (PrintWriter writer = new PrintWriter(tmp_dir, characterCode)) {
             writer.write(message);
         } catch (FileNotFoundException | UnsupportedEncodingException e) {
             e.printStackTrace();
@@ -90,7 +134,63 @@ private String CreateTmpText(UUID id, String message) {
         return tmp_dir;
     }
 
+    public void ClearGuildFolder(Guild guild){
+        File tmp = new File("tmp" + File.separator + guild.getId());
+        File wav = new File("wav" + File.separator + guild.getId());
+
+        try {
+            FileUtils.cleanDirectory(tmp);
+            FileUtils.cleanDirectory(wav);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
     public ArrayList<String> getVoices(){
         return voices;
     }
+
+    public void createTmpFolder() {
+        try {
+            Files.createDirectory(Paths.get("tmp"));
+        } catch (IOException ignore) {
+        }
+    }
+
+    public boolean tmpFolderExists() {
+        return Files.exists(Paths.get("tmp"));
+    }
+
+    public void createWavFolder() {
+        try {
+            Files.createDirectory(Paths.get("wav"));
+        } catch (IOException ignore) {
+        }
+    }
+
+    public boolean wavFolderExists() {
+        return Files.exists(Paths.get("wav"));
+    }
+
+    public boolean guildWavFolderExists(Guild guild){
+        return Files.exists(Paths.get("wav"+ File.separator + guild.getId()));
+    }
+
+    public void createGuildWavFolder(Guild guild){
+        try {
+            Files.createDirectory(Paths.get("wav"+File.separator + guild.getId()));
+        } catch (IOException ignore) {
+        }
+    }
+
+    public boolean guildTmpFolderExists(Guild guild){
+        return Files.exists(Paths.get("tmp"+ File.separator + guild.getId()));
+    }
+
+    public void createGuildTmpFolder(Guild guild){
+        try {
+            Files.createDirectory(Paths.get("tmp"+File.separator + guild.getId()));
+        } catch (IOException ignore) {
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/AdminCommand.java b/src/main/java/dev/cosgy/TextToSpeak/commands/AdminCommand.java
index fb87042..7226084 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/commands/AdminCommand.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/AdminCommand.java
@@ -21,7 +21,7 @@
 
 public abstract class AdminCommand extends Command {
     public AdminCommand() {
-        this.category = new Category("Admin", event ->
+        this.category = new Category("管理", event ->
         {
             if (event.isOwner() || event.getMember().isOwner())
                 return true;
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/OwnerCommand.java b/src/main/java/dev/cosgy/TextToSpeak/commands/OwnerCommand.java
new file mode 100644
index 0000000..370e41b
--- /dev/null
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/OwnerCommand.java
@@ -0,0 +1,26 @@
+//////////////////////////////////////////////////////////////////////////////////////////
+//  Copyright 2021 Cosgy Dev                                                             /
+//                                                                                       /
+//     Licensed under the Apache License, Version 2.0 (the "License");                   /
+//     you may not use this file except in compliance with the License.                  /
+//     You may obtain a copy of the License at                                           /
+//                                                                                       /
+//        http://www.apache.org/licenses/LICENSE-2.0                                     /
+//                                                                                       /
+//     Unless required by applicable law or agreed to in writing, software               /
+//     distributed under the License is distributed on an "AS IS" BASIS,                 /
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.          /
+//     See the License for the specific language governing permissions and               /
+//     limitations under the License.                                                    /
+//////////////////////////////////////////////////////////////////////////////////////////
+
+package dev.cosgy.TextToSpeak.commands;
+
+import com.jagrosh.jdautilities.command.Command;
+
+public abstract class OwnerCommand extends Command {
+    public OwnerCommand() {
+        this.category = new Category("Owner");
+        this.ownerCommand = true;
+    }
+}
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/admin/JLReadCmd.java b/src/main/java/dev/cosgy/TextToSpeak/commands/admin/JLReadCmd.java
new file mode 100644
index 0000000..6d224b6
--- /dev/null
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/admin/JLReadCmd.java
@@ -0,0 +1,48 @@
+//////////////////////////////////////////////////////////////////////////////////////////
+//  Copyright 2021 Cosgy Dev                                                             /
+//                                                                                       /
+//     Licensed under the Apache License, Version 2.0 (the "License");                   /
+//     you may not use this file except in compliance with the License.                  /
+//     You may obtain a copy of the License at                                           /
+//                                                                                       /
+//        http://www.apache.org/licenses/LICENSE-2.0                                     /
+//                                                                                       /
+//     Unless required by applicable law or agreed to in writing, software               /
+//     distributed under the License is distributed on an "AS IS" BASIS,                 /
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.          /
+//     See the License for the specific language governing permissions and               /
+//     limitations under the License.                                                    /
+//////////////////////////////////////////////////////////////////////////////////////////
+
+package dev.cosgy.TextToSpeak.commands.admin;
+
+import com.jagrosh.jdautilities.command.CommandEvent;
+import dev.cosgy.TextToSpeak.Bot;
+import dev.cosgy.TextToSpeak.commands.AdminCommand;
+import dev.cosgy.TextToSpeak.settings.Settings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class JLReadCmd extends AdminCommand {
+    Logger log = LoggerFactory.getLogger(this.getClass());
+    private final Bot bot;
+
+    public JLReadCmd(Bot bot) {
+        this.bot = bot;
+        this.name = "jlread";
+        this.help = "ボイスチャンネルにユーザーが参加または退出した時にユーザー名を読み上げるか否かを設定します。";
+    }
+
+    @Override
+    protected void execute(CommandEvent event) {
+        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
+
+        if(settings.isJoinAndLeaveRead()){
+            settings.setJoinAndLeaveRead(false);
+            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを無効にしました。");
+        }else{
+            settings.setJoinAndLeaveRead(true);
+            event.reply("ボイスチャンネルにユーザーが参加、退出した際の読み上げを有効にしました。");
+        }
+    }
+}
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/admin/SetReadNameCmd.java b/src/main/java/dev/cosgy/TextToSpeak/commands/admin/SetReadNameCmd.java
new file mode 100644
index 0000000..f28046c
--- /dev/null
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/admin/SetReadNameCmd.java
@@ -0,0 +1,49 @@
+////////////////////////////////////////////////////////////////////////////////
+//  Copyright 2021 Cosgy Dev                                                   /
+//                                                                             /
+//     Licensed under the Apache License, Version 2.0 (the "License");         /
+//     you may not use this file except in compliance with the License.        /
+//     You may obtain a copy of the License at                                 /
+//                                                                             /
+//        http://www.apache.org/licenses/LICENSE-2.0                           /
+//                                                                             /
+//     Unless required by applicable law or agreed to in writing, software     /
+//     distributed under the License is distributed on an "AS IS" BASIS,       /
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied./
+//     See the License for the specific language governing permissions and     /
+//     limitations under the License.                                          /
+////////////////////////////////////////////////////////////////////////////////
+
+package dev.cosgy.TextToSpeak.commands.admin;
+
+import com.jagrosh.jdautilities.command.CommandEvent;
+import dev.cosgy.TextToSpeak.Bot;
+import dev.cosgy.TextToSpeak.commands.AdminCommand;
+import dev.cosgy.TextToSpeak.settings.Settings;
+import dev.cosgy.TextToSpeak.settings.SettingsManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class SetReadNameCmd extends AdminCommand {
+    Logger log = LoggerFactory.getLogger(this.getClass());
+    private Bot bot;
+
+    public SetReadNameCmd(Bot bot) {
+        this.bot = bot;
+        this.name = "setreadname";
+        this.help = "テキストを読み上げる際にユーザー名も読み上げるかを設定します。";
+    }
+
+    @Override
+    protected void execute(CommandEvent event) {
+        Settings settings = bot.getSettingsManager().getSettings(event.getGuild());
+
+        if(settings.isReadName()){
+            settings.setReadName(false);
+            event.reply("ユーザー名の読み上げを無効にしました。");
+        }else{
+            settings.setReadName(true);
+            event.reply("ユーザー名の読み上げを有効にしました。");
+        }
+    }
+}
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/AddWordCmd.java b/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/AddWordCmd.java
new file mode 100644
index 0000000..f2db7ed
--- /dev/null
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/AddWordCmd.java
@@ -0,0 +1,78 @@
+////////////////////////////////////////////////////////////////////////////////
+//  Copyright 2021 Cosgy Dev                                                   /
+//                                                                             /
+//     Licensed under the Apache License, Version 2.0 (the "License");         /
+//     you may not use this file except in compliance with the License.        /
+//     You may obtain a copy of the License at                                 /
+//                                                                             /
+//        http://www.apache.org/licenses/LICENSE-2.0                           /
+//                                                                             /
+//     Unless required by applicable law or agreed to in writing, software     /
+//     distributed under the License is distributed on an "AS IS" BASIS,       /
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied./
+//     See the License for the specific language governing permissions and     /
+//     limitations under the License.                                          /
+////////////////////////////////////////////////////////////////////////////////
+
+package dev.cosgy.TextToSpeak.commands.dictionary;
+
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import dev.cosgy.TextToSpeak.Bot;
+import dev.cosgy.TextToSpeak.TextToSpeak;
+import dev.cosgy.TextToSpeak.audio.Dictionary;
+import net.dv8tion.jda.api.EmbedBuilder;
+import org.slf4j.Logger;
+
+import java.awt.*;
+import java.util.regex.Pattern;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+public class AddWordCmd extends Command {
+    private final Bot bot;
+    Logger log = getLogger(this.getClass());
+
+    public AddWordCmd(Bot bot){
+        this.bot = bot;
+        this.name = "addwd";
+        this.help = "辞書に、単語を追加します。辞書に単語が存在している場合は上書きされます。";
+        this.category = new Category("辞書");
+    }
+
+    @Override
+    protected void execute(CommandEvent event){
+        String[] parts = event.getArgs().split("\\s+", 2);
+        String word = null;
+        String reading = null;
+
+        if(parts.length < 2){
+            EmbedBuilder builder = new EmbedBuilder()
+                    .setColor(Color.red)
+                    .setTitle("AddWordコマンド")
+                    .addField("コマンドが無効です。", "単語と読み方の２つを入力して実行して下さい。", false)
+                    .addField("使用方法:",name +" <単語> <読み方>", false);
+
+            event.reply(builder.build());
+            return;
+        }
+
+        word = parts[0];
+        reading = parts[1];
+
+        if(!isFullKana(reading)){
+            event.reply("読み方はすべてカタカナで入力して下さい。");
+            return;
+        }
+
+        log.debug("単語追加:"+word +"-"+reading);
+
+        Dictionary dic = bot.getDictionary();
+        dic.UpdateDictionary(event.getGuild().getIdLong(), word,reading);
+        event.reply("これから"+ bot.getJDA().getSelfUser().getName() + "は、`"+ word + "`を`"+ reading +"`と読みます。");
+    }
+
+    public static boolean isFullKana(String str) {
+        return Pattern.matches("^[ァ-ヶー]*$", str);
+    }
+}
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/DlWordCmd.java b/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/DlWordCmd.java
new file mode 100644
index 0000000..f5567fb
--- /dev/null
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/DlWordCmd.java
@@ -0,0 +1,72 @@
+////////////////////////////////////////////////////////////////////////////////
+//  Copyright 2021 Cosgy Dev                                                   /
+//                                                                             /
+//     Licensed under the Apache License, Version 2.0 (the "License");         /
+//     you may not use this file except in compliance with the License.        /
+//     You may obtain a copy of the License at                                 /
+//                                                                             /
+//        http://www.apache.org/licenses/LICENSE-2.0                           /
+//                                                                             /
+//     Unless required by applicable law or agreed to in writing, software     /
+//     distributed under the License is distributed on an "AS IS" BASIS,       /
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied./
+//     See the License for the specific language governing permissions and     /
+//     limitations under the License.                                          /
+////////////////////////////////////////////////////////////////////////////////
+
+package dev.cosgy.TextToSpeak.commands.dictionary;
+
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import dev.cosgy.TextToSpeak.Bot;
+import net.dv8tion.jda.api.EmbedBuilder;
+import org.slf4j.Logger;
+
+import java.util.HashMap;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+public class DlWordCmd extends Command {
+    private final Bot bot;
+    Logger log = getLogger(this.getClass());
+
+    public DlWordCmd(Bot bot){
+        this.bot = bot;
+        this.name = "dlwd";
+        this.help = "辞書に登録されている単語を削除します。";
+        this.category = new Category("辞書");
+    }
+
+    @Override
+    protected void execute(CommandEvent event){
+        if (event.getArgs().isEmpty() && event.getMessage().getAttachments().isEmpty()) {
+            EmbedBuilder ebuilder = new EmbedBuilder()
+                    .setTitle("dlwordコマンド")
+                    .addField("使用方法:", name+" <単語>", false)
+                    .addField("説明:",help,false);
+            event.reply(ebuilder.build());
+            return;
+        }
+
+        HashMap<String, String> words = bot.getDictionary().GetWords(event.getGuild().getIdLong());
+
+        String args = event.getArgs();
+
+        try {
+            if (!words.containsKey(args)) {
+                event.reply(args + "は、辞書に登録されていません。");
+                return;
+            }
+        }catch (NullPointerException e){
+            return;
+        }
+
+        boolean result = bot.getDictionary().DeleteDictionary(event.getGuild().getIdLong(), args);
+
+        if(result){
+            event.reply("単語を削除しました。");
+        }else{
+            event.reply("削除中に問題が発生しました。");
+        }
+    }
+}
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/WordListCmd.java b/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/WordListCmd.java
new file mode 100644
index 0000000..c5e660d
--- /dev/null
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/dictionary/WordListCmd.java
@@ -0,0 +1,96 @@
+////////////////////////////////////////////////////////////////////////////////
+//  Copyright 2021 Cosgy Dev                                                   /
+//                                                                             /
+//     Licensed under the Apache License, Version 2.0 (the "License");         /
+//     you may not use this file except in compliance with the License.        /
+//     You may obtain a copy of the License at                                 /
+//                                                                             /
+//        http://www.apache.org/licenses/LICENSE-2.0                           /
+//                                                                             /
+//     Unless required by applicable law or agreed to in writing, software     /
+//     distributed under the License is distributed on an "AS IS" BASIS,       /
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied./
+//     See the License for the specific language governing permissions and     /
+//     limitations under the License.                                          /
+////////////////////////////////////////////////////////////////////////////////
+
+package dev.cosgy.TextToSpeak.commands.dictionary;
+
+import com.jagrosh.jdautilities.command.Command;
+import com.jagrosh.jdautilities.command.CommandEvent;
+import com.jagrosh.jdautilities.menu.Paginator;
+import dev.cosgy.TextToSpeak.Bot;
+import net.dv8tion.jda.api.Permission;
+import net.dv8tion.jda.api.exceptions.PermissionException;
+import org.slf4j.Logger;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+public class WordListCmd extends Command {
+    private final Bot bot;
+    Logger log = getLogger(this.getClass());
+
+    private final Paginator.Builder builder;
+
+    public WordListCmd(Bot bot){
+        this.bot = bot;
+        this.name = "wdls";
+        this.help = "辞書に、登録してある単語をリストアップします。";
+        this.category = new Category("辞書");
+        this.botPermissions = new Permission[] {Permission.MESSAGE_ADD_REACTION, Permission.MESSAGE_EMBED_LINKS};
+        builder = new Paginator.Builder()
+                .setColumns(1)
+                .setFinalAction(m -> {
+                    try {
+                        m.clearReactions().queue();
+                    } catch (PermissionException ignore) {
+                    }
+                })
+                .setItemsPerPage(10)
+                .waitOnSinglePage(false)
+                .useNumberedItems(true)
+                .showPageNumbers(true)
+                .wrapPageEnds(true)
+                .setEventWaiter(bot.getWaiter())
+                .setTimeout(1, TimeUnit.MINUTES);
+    }
+
+    @Override
+    protected void execute(CommandEvent event){
+        int pagenum = 1;
+        try {
+            pagenum = Integer.parseInt(event.getArgs());
+        } catch (NumberFormatException ignore) {
+        }
+        List<String> list = new ArrayList<>();
+        try {
+            HashMap<String, String> words = bot.getDictionary().GetWords(event.getGuild().getIdLong());
+
+            for (String key : words.keySet()) {
+                list.add(key + "-" + words.get(key));
+            }
+        }catch (NullPointerException ignored){
+            return;
+        }
+        String[] wordList = new String[list.size()];
+
+        if(list.size() == 0){
+            event.reply("単語が登録されていません。");
+            return;
+        }
+
+        for (int i = 0; i < list.size(); i++) {
+            wordList[i] = list.get(i);
+        }
+        builder.setText("単語一覧")
+                .setItems(wordList)
+                .setUsers(event.getAuthor())
+                .setColor(event.getSelfMember().getColor());
+        builder.build().paginate(event.getChannel(), pagenum);
+    }
+}
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/AboutCommand.java b/src/main/java/dev/cosgy/TextToSpeak/commands/general/AboutCommand.java
index 3bd716b..d3c79cd 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/commands/general/AboutCommand.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/general/AboutCommand.java
@@ -104,7 +104,7 @@ protected void execute(CommandEvent event) {
             builder.addField("", event.getJDA().getUsers().size() + " ユーザーのシャード\n" + event.getJDA().getGuilds().size() + " サーバー", true);
             builder.addField("", event.getJDA().getTextChannels().size() + " テキストチャンネル\n" + event.getJDA().getVoiceChannels().size() + " ボイスチャンネル", true);
         }
-        builder.setFooter("再起動が行われた時間：", "https://www.cosgy.dev/wp-content/uploads/2020/03/restart.jpg");
+        builder.setFooter("再起動が行われた時間", "https://www.cosgy.dev/wp-content/uploads/2020/03/restart.jpg");
         builder.setTimestamp(event.getClient().getStartTime());
         event.reply(builder.build());
     }
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/ByeCmd.java b/src/main/java/dev/cosgy/TextToSpeak/commands/general/ByeCmd.java
index 01ca42c..d92044b 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/commands/general/ByeCmd.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/general/ByeCmd.java
@@ -35,6 +35,7 @@ public ByeCmd(Bot bot){
     protected void execute(CommandEvent event) {
         AudioHandler handler = (AudioHandler) event.getGuild().getAudioManager().getSendingHandler();
         handler.stopAndClear();
+        bot.getVoiceCreation().ClearGuildFolder(event.getGuild());
         event.getGuild().getAudioManager().closeAudioConnection();
         event.reply("ボイスチャンネルから切断しました。");
     }
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/JoinCmd.java b/src/main/java/dev/cosgy/TextToSpeak/commands/general/JoinCmd.java
index acc7f52..97edb2e 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/commands/general/JoinCmd.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/general/JoinCmd.java
@@ -39,8 +39,15 @@ protected void execute(CommandEvent event){
         bot.getPlayerManager().setUpHandler(event.getGuild());
 
         GuildVoiceState userState = event.getMember().getVoiceState();
+
+        if(!userState.inVoiceChannel()){
+            event.reply("このコマンドを使用するには、ボイスチャンネルに参加している必要があります。");
+            return;
+        }
+
         try {
             event.getGuild().getAudioManager().openAudioConnection(userState.getChannel());
+            event.reply(String.format("**%s**に接続しました。", userState.getChannel().getName()));
         } catch (PermissionException ex) {
             event.reply(event.getClient().getError() + String.format("**%s**に接続できません!", userState.getChannel().getName()));
         }
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetIntonationCmd.java b/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetIntonationCmd.java
index de9362c..3340dcf 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetIntonationCmd.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetIntonationCmd.java
@@ -56,8 +56,8 @@ protected void execute(CommandEvent event){
             event.reply("数値を設定して下さい。");
             return;
         }
-        if(0.0f >= value){
-            event.reply("有効な数値を設定して下さい。");
+        if(!(0.1f <= value && value <= 100.0f)){
+            event.reply("有効な数値を設定して下さい。0.1~100.0");
             return;
         }
         UserSettings settings = bot.getUserSettingsManager().getSettings(event.getAuthor().getIdLong());
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetSpeedCmd.java b/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetSpeedCmd.java
index fe2b06a..6686054 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetSpeedCmd.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetSpeedCmd.java
@@ -57,8 +57,8 @@ protected void execute(CommandEvent event){
             event.reply("数値を設定して下さい。");
             return;
         }
-        if(0.0f >= value){
-            event.reply("有効な数値を設定して下さい。");
+        if(!(0.1f <= value && value <= 100.0f)){
+            event.reply("有効な数値を設定して下さい。0.1~100.0");
             return;
         }
         UserSettings settings = bot.getUserSettingsManager().getSettings(event.getAuthor().getIdLong());
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityA.java b/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityA.java
index 85b1687..e83e02c 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityA.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityA.java
@@ -56,8 +56,8 @@ protected void execute(CommandEvent event){
             event.reply("数値を設定して下さい。");
             return;
         }
-        if(0.0f >= value && value >= 1.0f){
-            event.reply("有効な数値を設定して下さい。");
+        if(!(0.1f <= value && value <= 1.0f)){
+            event.reply("有効な数値を設定して下さい。0.1~1.0");
             return;
         }
         UserSettings settings = bot.getUserSettingsManager().getSettings(event.getAuthor().getIdLong());
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityFm.java b/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityFm.java
index 9c2b902..43c27b0 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityFm.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/general/SetVoiceQualityFm.java
@@ -57,8 +57,8 @@ protected void execute(CommandEvent event){
             event.reply("数値を設定して下さい。");
             return;
         }
-        if(0.0f >= value){
-            event.reply("有効な数値を設定して下さい。");
+        if(!(0.1f <= value && value <= 100.0f)){
+            event.reply("有効な数値を設定して下さい。0.1~100.0");
             return;
         }
         UserSettings settings = bot.getUserSettingsManager().getSettings(event.getAuthor().getIdLong());
diff --git a/src/main/java/dev/cosgy/TextToSpeak/commands/owner/ShutdownCmd.java b/src/main/java/dev/cosgy/TextToSpeak/commands/owner/ShutdownCmd.java
new file mode 100644
index 0000000..e0bb036
--- /dev/null
+++ b/src/main/java/dev/cosgy/TextToSpeak/commands/owner/ShutdownCmd.java
@@ -0,0 +1,56 @@
+//////////////////////////////////////////////////////////////////////////////////////////
+//  Copyright 2021 Cosgy Dev                                                             /
+//                                                                                       /
+//     Licensed under the Apache License, Version 2.0 (the "License");                   /
+//     you may not use this file except in compliance with the License.                  /
+//     You may obtain a copy of the License at                                           /
+//                                                                                       /
+//        http://www.apache.org/licenses/LICENSE-2.0                                     /
+//                                                                                       /
+//     Unless required by applicable law or agreed to in writing, software               /
+//     distributed under the License is distributed on an "AS IS" BASIS,                 /
+//     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.          /
+//     See the License for the specific language governing permissions and               /
+//     limitations under the License.                                                    /
+//////////////////////////////////////////////////////////////////////////////////////////
+
+package dev.cosgy.TextToSpeak.commands.owner;
+
+import com.jagrosh.jdautilities.command.CommandEvent;
+import dev.cosgy.TextToSpeak.Bot;
+import dev.cosgy.TextToSpeak.TextToSpeak;
+import dev.cosgy.TextToSpeak.commands.OwnerCommand;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.io.IOException;
+
+public class ShutdownCmd extends OwnerCommand {
+    private final Bot bot;
+
+    public ShutdownCmd(Bot bot) {
+        this.bot = bot;
+        this.name = "shutdown";
+        this.help = "一時ファイルを削除してボットを停止します。";
+        this.guildOnly = false;
+    }
+
+    @Override
+    protected void execute(CommandEvent event) {
+
+        event.reply("一時ファイルを削除しています。", m -> {
+            File tmp = new File("tmp");
+            File wav = new File("wav");
+
+            try {
+                FileUtils.cleanDirectory(tmp);
+                FileUtils.cleanDirectory(wav);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            m.editMessage("一時ファイルを削除しました。").queue();
+            event.replyWarning("シャットダウンしています...");
+            bot.shutdown();
+        });
+    }
+}
diff --git a/src/main/java/dev/cosgy/TextToSpeak/listeners/MessageListener.java b/src/main/java/dev/cosgy/TextToSpeak/listeners/MessageListener.java
index f4bf16e..ab2fc3f 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/listeners/MessageListener.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/listeners/MessageListener.java
@@ -26,6 +26,7 @@
 import dev.cosgy.TextToSpeak.audio.VoiceCreation;
 import net.dv8tion.jda.api.JDA;
 import net.dv8tion.jda.api.entities.*;
+import net.dv8tion.jda.api.events.ReadyEvent;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
 
@@ -65,9 +66,23 @@ public void onMessageReceived(MessageReceivedEvent event)
                 return;
             }
 
+            String prefix = bot.getConfig().getPrefix().equals("@mention") ? "@" + event.getJDA().getSelfUser().getName() + " " : bot.getConfig().getPrefix();
+
+            if(msg.startsWith(prefix)){
+                return;
+            }
+
+            // URLを置き換え
+            msg = msg.replaceAll("(http://|https://)[\\w.\\-/:#?=&;%~+]+","ゆーあーるえる");
+
             if(textChannel == settingText){
+
+                if(bot.getSettingsManager().getSettings(guild).isReadName()){
+                    msg = author.getName() + "  " + msg;
+                }
+
                 VoiceCreation vc = bot.getVoiceCreation();
-                String file = vc.CreateVoice(author, msg);
+                String file = vc.CreateVoice(guild,author, msg);
 
                 bot.getPlayerManager().loadItemOrdered(event.getGuild(), file, new ResultHandler(null, event, false));
 
@@ -76,6 +91,12 @@ public void onMessageReceived(MessageReceivedEvent event)
         }
     }
 
+
+    @Override
+    public void onReady(ReadyEvent e){
+        bot.getDictionary().Init();
+    }
+
     private class ResultHandler implements AudioLoadResultHandler {
         private final Message m;
         private final MessageReceivedEvent event;
diff --git a/src/main/java/dev/cosgy/TextToSpeak/settings/Settings.java b/src/main/java/dev/cosgy/TextToSpeak/settings/Settings.java
index 44ec493..0c59633 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/settings/Settings.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/settings/Settings.java
@@ -28,9 +28,11 @@ public class Settings implements GuildSettingsProvider {
     protected long textId;
     private String prefix;
     private int volume;
+    private boolean readName;
+    private boolean joinAndLeaveRead;
 
 
-    public Settings(SettingsManager manager, String textId, String prefix, int volume) {
+    public Settings(SettingsManager manager, String textId, String prefix, int volume, boolean readName, boolean joinAndLeaveRead) {
         this.manager = manager;
         try {
             this.textId = Long.parseLong(textId);
@@ -39,13 +41,17 @@ public Settings(SettingsManager manager, String textId, String prefix, int volum
         }
         this.prefix = prefix;
         this.volume = volume;
+        this.readName = readName;
+        this.joinAndLeaveRead = joinAndLeaveRead;
     }
 
-    public Settings(SettingsManager manager, long textId, String prefix, int volume) {
+    public Settings(SettingsManager manager, long textId, String prefix, int volume, boolean readName, boolean joinAndLeaveRead) {
         this.manager = manager;
         this.textId = textId;
         this.prefix = prefix;
         this.volume = volume;
+        this.readName = readName;
+        this.joinAndLeaveRead = joinAndLeaveRead;
     }
 
 
@@ -80,4 +86,20 @@ public void setPrefix(String prefix) {
     public Collection<String> getPrefixes() {
         return prefix == null ? Collections.EMPTY_SET : Collections.singleton(prefix);
     }
+
+    public boolean isReadName(){
+        return  readName;
+    }
+
+    public void setReadName(boolean readName){
+        this.readName = readName;
+        this.manager.writeSettings();
+    }
+
+    public boolean isJoinAndLeaveRead(){ return joinAndLeaveRead; }
+
+    public void setJoinAndLeaveRead(boolean joinAndLeaveRead){
+        this.joinAndLeaveRead = joinAndLeaveRead;
+        this.manager.writeSettings();
+    }
 }
diff --git a/src/main/java/dev/cosgy/TextToSpeak/settings/SettingsManager.java b/src/main/java/dev/cosgy/TextToSpeak/settings/SettingsManager.java
index d5784f3..2d25da5 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/settings/SettingsManager.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/settings/SettingsManager.java
@@ -40,7 +40,9 @@ public SettingsManager() {
                 settings.put(Long.parseLong(id), new Settings(this,
                         o.has("text_channel_id") ? o.getString("text_channel_id") : null,
                         o.has("prefix") ? o.getString("prefix") : null,
-                        o.has("volume") ? o.getInt("volume") : 50
+                        o.has("volume") ? o.getInt("volume") : 50,
+                        o.has("read_name") && o.getBoolean("read_name"),
+                        o.has("join_and_leave_read") && o.getBoolean("join_and_leave_read")
                         ));
             });
         } catch (IOException | JSONException e) {
@@ -62,7 +64,7 @@ public Settings getSettings(long guildId) {
      * @return 作成されたデフォルト設定
      */
     private Settings createDefaultSettings() {
-        return new Settings(this, 0, null, 50);
+        return new Settings(this, 0, null, 50, false, false);
     }
 
     /**
@@ -79,6 +81,10 @@ protected void writeSettings() {
                 o.put("prefix", s.getPrefix());
             if (s.getVolume() != 50)
                 o.put("volume", s.getVolume());
+            if(s.isReadName())
+                o.put("read_name", s.isReadName());
+            if(s.isJoinAndLeaveRead())
+                o.put("join_and_leave_read", s.isJoinAndLeaveRead());
             obj.put(Long.toString(key), o);
         });
         try {
diff --git a/src/main/java/dev/cosgy/TextToSpeak/utils/OtherUtil.java b/src/main/java/dev/cosgy/TextToSpeak/utils/OtherUtil.java
index f068182..944c7f7 100644
--- a/src/main/java/dev/cosgy/TextToSpeak/utils/OtherUtil.java
+++ b/src/main/java/dev/cosgy/TextToSpeak/utils/OtherUtil.java
@@ -39,7 +39,7 @@ public class OtherUtil {
     public final static String NEW_VERSION_AVAILABLE = "利用可能な新しいバージョンがあります!\n"
             + "現在のバージョン: %s\n"
             + "最新のバージョン: %s\n\n"
-            + " https://github.com/Cosgy-Dev/MusicBot-JP-java/releases/latest から最新バージョンをダウンロードして下さい。";
+            + " https://github.com/Cosgy-Dev/TextToSpeakBot/releases/latest から最新バージョンをダウンロードして下さい。";
     private final static String WINDOWS_INVALID_PATH = "c:\\windows\\system32\\";
 
     public static Path getPath(String path) {
@@ -162,7 +162,7 @@ public static String getCurrentVersion() {
     public static String getLatestVersion() {
         try {
             Response response = new OkHttpClient.Builder().build()
-                    .newCall(new Request.Builder().get().url("https://api.github.com/repos/Cosgy-Dev/MusicBot-JP-java/releases/latest").build())
+                    .newCall(new Request.Builder().get().url("https://api.github.com/repos/Cosgy-Dev/TextToSpeakBot/releases/latest").build())
                     .execute();
             ResponseBody body = response.body();
             if (body != null) {
diff --git a/src/main/resources/UserData.sqlite b/src/main/resources/UserData.sqlite
index dc1da36..468969e 100644
Binary files a/src/main/resources/UserData.sqlite and b/src/main/resources/UserData.sqlite differ
diff --git a/src/main/resources/lang/yomiage.properties b/src/main/resources/lang/yomiage.properties
index 014c238..6adf7a4 100644
--- a/src/main/resources/lang/yomiage.properties
+++ b/src/main/resources/lang/yomiage.properties
@@ -13,4 +13,6 @@
 #     See the License for the specific language governing permissions and      #
 #     limitations under the License.                                           #
 ################################################################################
-appName=\u8aad\u307f\u4e0a\u3052\u30dc\u30c3\u30c8 by Cosgy Dev
\ No newline at end of file
+appName=\u8AAD\u307F\u4E0A\u3052\u30DC\u30C3\u30C8 by Cosgy Dev
+categoryAdmin="\u7BA1\u7406"
+categorySetting = "\u8A2D\u5B9A"
\ No newline at end of file
diff --git a/src/main/resources/lang/yomiage_en.properties b/src/main/resources/lang/yomiage_en.properties
index d4d8ec2..e1f6a7a 100644
--- a/src/main/resources/lang/yomiage_en.properties
+++ b/src/main/resources/lang/yomiage_en.properties
@@ -15,4 +15,6 @@
 ################################################################################
 
 
-appName=Yomiage Bot by Cosgy Dev
\ No newline at end of file
+appName=Yomiage Bot by Cosgy Dev
+categoryAdmin="Admin"
+categorySetting="Setting"
\ No newline at end of file
diff --git a/src/main/resources/lang/yomiage_ja.properties b/src/main/resources/lang/yomiage_ja.properties
index 014c238..b299078 100644
--- a/src/main/resources/lang/yomiage_ja.properties
+++ b/src/main/resources/lang/yomiage_ja.properties
@@ -13,4 +13,6 @@
 #     See the License for the specific language governing permissions and      #
 #     limitations under the License.                                           #
 ################################################################################
-appName=\u8aad\u307f\u4e0a\u3052\u30dc\u30c3\u30c8 by Cosgy Dev
\ No newline at end of file
+appName=\u8AAD\u307F\u4E0A\u3052\u30DC\u30C3\u30C8 by Cosgy Dev
+categoryAdmin="\u7BA1\u7406"
+categorySetting="\u8A2D\u5B9A"
\ No newline at end of file
diff --git a/src/main/resources/reference.conf b/src/main/resources/reference.conf
index a588f5b..fbb1b48 100644
--- a/src/main/resources/reference.conf
+++ b/src/main/resources/reference.conf
@@ -23,8 +23,8 @@ owner = 所有者IDをここに貼り付け
 
 // この項目は、Botの接頭辞を設定します
 // 接頭辞はコマンドを制御するために使用されます
-// !!を使用すると、playコマンドは !!play になります。
-// デフォルトの接頭辞はBotの@mentionになります (例: @Botname play)
+// !!を使用すると、joinコマンドは !!join になります。
+// デフォルトの接頭辞はBotの@mentionになります (例: @Botname join)
 prefix = "@mention"
 
 // この項目は、Botの接頭辞(副)を設定します
@@ -58,4 +58,10 @@ dictionary = "/var/lib/mecab/dic/open-jtalk/naist-jdic"
 //　フォルダの中は階層分けせずにhtsvoiceを保存して下さい。
 voiceDirectory ="/usr/share/hts-voice"
 
+// Windows環境で、Open JTalkがインストールされているディレクトリを入力して下さい。
+// 注意:
+// Open JTalkの実行ファイル名は、必ず｀open_jtalk.exe｀に設定してください。
+// Windows環境でのホストは、推奨していません。
+winjtalkdir = ""
+
 /// END OF YOMIAGEBOT CONFIG ///
\ No newline at end of file