diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
index 7ab86ae..8618328 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/node.js.yml
@@ -1,24 +1,28 @@
-name: Run test on pull request
+name: Node.js CI
 
 on:
-  pull_request:
     push:
-      branches: [ main ]
+        branches: [ main ]
     pull_request:
-      branches: [ main ]
+        branches: [ main ]
 
 jobs:
-  build:
-    runs-on: ubuntu-latest
+    build:
 
-    steps:
-      - uses: actions/checkout@v3
+        runs-on: ubuntu-latest
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: ./.node-version
-      - run: npm ci
-      - run: npm run build --if-present
-      - run: npm test
-      - run: npm install discord.js
\ No newline at end of file
+        strategy:
+            matrix:
+                node-version: [12.x, 14.x, 16.x]
+
+        steps:
+          - uses: actions/checkout@v3
+          - name: Use Node.js ${{ matrix.node-version }}
+            uses: actions/setup-node@v3
+            with:
+                node-version: ${{ matrix.node-version }}
+                cache: 'npm'
+          - run: npm ci
+          - run: npm run build --if-present
+          - run: npm test
+          - run: npm install discord.js
\ No newline at end of file
diff --git a/404.html b/404.html
index f4811fa..1a0b886 100644
--- a/404.html
+++ b/404.html
@@ -1,21 +1,45 @@
 <!DOCTYPE html>
 <html>
     <head>
+        <link rel="stylesheet" href="./style.css">
+        <style>
+            #stop{
+                width: 600px;
+                height: 60px;
+                background-color: black;
+                color: aliceblue;
+                font-size: 25px;
+                font-weight: 900;
+                text-decoration-color: aliceblue;
+                cursor:pointer;
+                border-radius: 35px;
+                text-align: center;
+            }
+        </style>
     </head>
     <body>
-        <h1 id="color-text">お探しのページはありませんでした。</h1>
-        <p id="color-text">404 Not Found</p>
-        <a href="https://githubcommander.github.io/commander/">mainに戻る</a>
+        <header id="headerGen"></header>
+            <main>
+                <h1 id="color-text">お探しのページはありませんでした。</h1>
+                <p>404 Not Found</p>
+                <input type="button" id="stop" value="ポリゴンショック止めるボタン(ムスカ大佐用)"><br>
+                <a href="index.html">mainに戻る</a>
+            </main>
         <script>
-        setInterval(color,1);
-            function color() {
-                var x = document.getElementById("color-text");
-                var run1 = Math.ceil( Math.random() * 255 );
-                var run2 = Math.ceil( Math.random() * 255 );
-                var run3 = Math.ceil( Math.random() * 255 );
-                var y = "rgb(" + run1 + "," + run2 + "," + run3 + ")"
-                x.style.color = y;
-            }
+        const color = setInterval(() => {
+            let x = document.getElementById("color-text");
+            let run1 = Math.ceil( Math.random() * 255 );
+            let run2 = Math.ceil( Math.random() * 255 );
+            let run3 = Math.ceil( Math.random() * 255 );
+            let y = `rgb(${run1},${run2},${run3})`
+            x.style.color = y;
+        }, 10)
+        document.getElementById("stop").onclick = ()=>{
+            clearInterval(color)
+        }
         </script>
+        <script src="http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js"></script>
+        <script src="js/index.js"></script>
+        <script src="js/header.js"></script>
     </body>
 </html>
diff --git a/README.md b/README.md
index dd2a7ff..c48f96f 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,7 @@
 # COMMANDER WEB SITE
 コマンダーの集い公式サイト
+
+#梅干しからの説明
+##script
+http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js
+ショートカットはこれ使ってくだせぇ(
diff --git a/history/index.html b/history/index.html
index ba7b5a2..87b6364 100644
--- a/history/index.html
+++ b/history/index.html
@@ -32,8 +32,8 @@ <h2>サーバーの歴史紹介</h2>
             <p>説明テスト<br>改行のテスト</p>
         </div>
     </main>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-    <script src="../index.js"></script>
-    <script src="../header.js"></script>
+    <script src="http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js"></script>
+    <script src="../js/index.js"></script>
+    <script src="../js/header.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/index.html b/index.html
index 30f0870..4d6d6a8 100644
--- a/index.html
+++ b/index.html
@@ -1,23 +1,12 @@
 <!DOCTYPE html>
 <html>
     <head>
-        <script src="./index.js"></script>
         <title>コマンダーの集い公式wiki</title>
-        <link rel="stylesheet" href="./style.css">
+        <link rel="stylesheet" href="style.css">
         <meta name="viewport" content="width=device-width">
     </head>
     <body>
-        <header id="header">
-            <nav>
-                <ul>
-                    <li><a href="./">HOME</a></li>
-                    <li><a href="./about/">ABOUT</a></li>
-                    <li><a href="./members/">MEMBERS</a></li>
-                    <li><a href="./works/">WORKS</a></li>
-                    <li><a href="./history/">HISTORY</a></li>
-
-                </ul>
-            </nav>
+        <header id="headerGen" class="header">
             <h1>コマンダーの集い</h1>
         </header>
         <main>
@@ -25,8 +14,11 @@ <h2>どんなサーバー？</h2>
             <p class="animation_box">Minecraft統合版のコマンドについて話し合うサーバーです！<br>初心者から上級者まで歓迎しています！</p>
             <br>
             <h2>概要</h2>
-            <p style="text-color: #ee3333; fony-size: 20px;">サーバーの主</p>
+            <p style="color: #ee3333; font-size: 20px;">サーバーの主</p>
             <p>だれだ～</p>
         </main>
+        <script src="http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js"></script>
+        <script src="js/index.js"></script>
+        <script src="js/header.js"></script>
     </body>
 </html>
diff --git a/index.js b/index.js
deleted file mode 100644
index a000e93..0000000
--- a/index.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const folder = "pictures/Normal/";
-$.ajax({
-    url : folder,
-    success: function (data) {
-        $(data).find("a").attr("href", function (i, val) {
-            if( val.match(/\.(jpe?g|png|gif)$/) ) {
-                $("body").append( "<img src='"+ folder + val +"'>" );
-            }
-        });
-    }
-});
-
-
-//以下鯖関連のアイコン等の画像取得↓
-// const { Client } = require("discord.js")
-// const client = new Client({ intents: 32767 })
-
-// document.getElementsByID("serverIcon") = client.guilds.cache.get("941651004884152380").iconURL
-
-// function getUserIconURL(ID){
-//     return client.users.fetch(ID).iconURL
-//     console.log(client.users.fetch(ID).iconURL)
-//     console.log(client.guilds.cache.get("941651004884152380").iconURL)
-// }
-
-$(function () {
-    setTimeout(function () {
-        $('.text_fadein').fadeIn(1000);
-    }, 500);
-});
diff --git a/members/flex.js b/js/flex.js
similarity index 70%
rename from members/flex.js
rename to js/flex.js
index 3f30a7a..8863ed3 100644
--- a/members/flex.js
+++ b/js/flex.js
@@ -1,7 +1,9 @@
 const members = [
+    "! Kinorudo1406 ! キノタン",
     "(j゙゚ω゚゙j)",
     "(x-6)(x6)+x(x9)^2-3(x4)^3-10x^2",
     "{Sora4654}ソラ",
+    "꧁༒ハルッチ꧂",
     "√𝓰𝓸𝓻𝓸",
     "§1 towayan6717",
     "§b§lワン",
@@ -17,6 +19,7 @@ const members = [
     "Bacotch(ばたすこ)",
     "Barry Slime",
     "BE_yuya91",
+    "BionicHail",
     "c3yk",
     "C310R",
     "CHICKOA",
@@ -52,6 +55,7 @@ const members = [
     "JagaPotatoXD",
     "junjunlife",
     "K.N.yuki",
+    "King_Neo",
     "kouma",
     "ksAIM_NUR【ぬる】",
     "kunes",
@@ -60,10 +64,12 @@ const members = [
     "Lucky_yuto",
     "manazon pc",
     "MayoneezuYT",
+    "Microペーパー",
     "mikan-ミカン",
     "minecraftanthurum84",
     "murama_71",
     "murandy1106",
+    "NANA_7Fish",
     "Nen",
     "NYANKUN",
     "OOO(kuroneko)",
@@ -93,6 +99,7 @@ const members = [
     "suzuyu01",
     "T.tuyopi---",
     "takara",
+    "TAKATO",
     "Takumi",
     "teratoma",
     "-Tiger",
@@ -106,19 +113,27 @@ const members = [
     "WL suiren",
     "yamap",
     "Yumaru",
+    "YUUKIN",
     "ZAF",
+    "zaku",
     "Zyign",
+    "мIᑕh i",
     "ああ",
     "アーサー",
+    "アール",
     "あかいな",
     "あはっち",
     "あまぐも",
     "イカのカルパッチョ",
     "イカ焼き",
     "イタリア",
+    "いちご",
+    "イルカ-イルカのゲーム部屋(Youtuber)",
     "ウィザースケルトンの魔法工房",
+    "うっちー",
     "うましま",
     "えーゆー！",
+    "エビ",
     "エビシュウマイ",
     "おいしいじゃこ",
     "おーきどーき",
@@ -147,25 +162,41 @@ const members = [
     "すぜぁ",
     "スタイト",
     "ストレイの魔法工房",
+    "スペ塩",
+    "スムージー",
+    "セイ",
     "ゾーラ",
     "そこら辺のサネス",
     "ソルトさん",
+    "ゾンビの魔法工房",
     "たくあん",
     "たけのこII",
-    "たけのこよにこい",
+    "たけのこよにこい", ,
     "タコなし",
     "だこやき",
     "たたa",
+    "ﾃﾞ→ﾝ？",
+    "ディスティ",
     "と↑り↓さ↓ん↑",
     "とうふ",
     "トッポくん",
     "トマトのコマンド紹介",
+    "ナゾのK a.k.a マゾのK",
     "ねお",
+    "ばーど",
     "ハニホニ",
+    "ハムスター",
     "ハル",
+    "ハレ",
     "はろるど",
+    "パンさん",
+    "ハンバーガー",
+    "ビートル",
+    "ビーマー",
     "ひかる30634",
+    "ヒライスン",
     "ひろ",
+    "ふぁんしょあ",
     "ふうぎう",
     "ふらっとなおうち！",
     "ブラニカ",
@@ -174,25 +205,57 @@ const members = [
     "ほるもーたろう",
     "まっさん",
     "まるら",
+    "マンスーパー",
     "みかんせいじん",
     "みっつー",
     "メジェド⚙ナギ",
+    "メロクリ",
     "ゆい",
+    "ゆきち",
+    "ユキムラ",
+    "ゆっくりLM",
     "ゆるく",
     "ゆン",
+    "よー",
+    "よっとなす",
+    "よひぃー",
     "りす",
     "りゅうと",
+    "るん♪",
+    "れう-LEU1301",
+    "ろく",
     "わたくし",
     "わどり",
     "んうえいぬkf",
     "أよっちゃん",
-    "承太劇場(改訂版)",
+    "𝕄𝕖𝕣𝕚𝟠𝟞",
+    "伊R325U-NTL瑠瑠色金",
+    "一般人",
+    "雨叉໒꒱. ﾟ. ﾟ",
+    "楽いく",
+    "気刃無双",
+    "凝縮されたあきかん",
+    "鍵です。",
+    "黒砂糖",
+    "最高皇帝神風看守長(かみかぜ)",
+    "社会人一年目YASITY",
+    "承太劇場",
+    "新鮮な腐った羊羹さんは田中マイケルがお好き？",
     "神かるch",
+    "星咲 蒼也",
+    "鷹《Miofa》🐺🌲🍽",
+    "津田 繋",
+    "統マ回(とうまかい)",
+    "悲しのか無し",
+    "飛脚しか勝たん",
+    "悠生[S655]",
     "両替機",
-    "! Kinorudo1406 ! キノタン",
+    "霊夢にゃん",
+    "琥珀",
+    "饂飩天地開闢神話",
 ]
 const serverMembers = document.getElementById("serverMembers")
 for (let i = 0; i <= members.length - 1; i++) {
-    const flex = `<a href=""><div class="Flex Member"><img src ="../pictures/Normal/${members[i]}.png"><h4>${members[i]}</h4><p>ここに簡単な説明</p></div></a>`
-    serverMembers.insertAdjacentHTML("beforebegin", flex)
+    const flex = `<a href=""><div class="Flex Member"><img src ="../pictures/Normal/${members[i]}.png",><h4>${members[i]}</h4><p>ここに簡単な説明</p></div></a>`
+    serverMembers.insertAdjacentHTML("beforeend", flex)
 }
\ No newline at end of file
diff --git a/header.js b/js/header.js
similarity index 80%
rename from header.js
rename to js/header.js
index 8659935..b32fe5c 100644
--- a/header.js
+++ b/js/header.js
@@ -2,10 +2,11 @@ const headerGen = document.getElementById("headerGen")
 const header = (function(param) {return param[0].replace(/\n|\r/g, "");})`
 <nav>
     <ul>
-        <li><a href="../../commander/">HOME</a></li>
+        <li><a href="../">HOME</a></li>
         <li><a href="../../commander/about/">ABOUT</a></li>
-        <li><a href="../../commander/history/">HISTORY</a></li>
         <li><a href="../../commander/members/">MEMBERS</a></li>
+        <li><a href="../../commander/works/">WORKS</a></li>
+        <li><a href="../../commander/history/">HISTORY</a></li>
     </ul>
 </nav>`
 headerGen.insertAdjacentHTML("afterbegin", header)
\ No newline at end of file
diff --git a/js/index.js b/js/index.js
new file mode 100644
index 0000000..a98844e
--- /dev/null
+++ b/js/index.js
@@ -0,0 +1,27 @@
+//ショートカット。<script src="http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js"></script>←これhtmlに追加
+shortcut.add("ctrl+/",()=>{
+    alert("test!!")
+})
+shortcut.add("a",()=>{
+    alert("a=>test!!")
+})
+
+
+
+//以下鯖関連のアイコン等の画像取得↓
+const { Client } = require("discord.js")
+const client = new Client({ intents: 32767 })
+
+document.getElementsByID("serverIcon") = client.guilds.cache.get("941651004884152380").iconURL
+
+function getUserIconURL(ID){
+    return client.users.fetch(ID).iconURL
+    console.log(client.users.fetch(ID).iconURL)
+    console.log(client.guilds.cache.get("941651004884152380").iconURL)
+}
+
+$(function () {
+    setTimeout(function () {
+        $('.text_fadein').fadeIn(1000);
+    }, 500);
+});
diff --git a/members/index.html b/members/index.html
index 44502ee..9585fe4 100644
--- a/members/index.html
+++ b/members/index.html
@@ -11,6 +11,7 @@
     <header id="headerGen"></header>
     <main>
         <div class="FlexDiv" id="membersDiv">
+            <h2>Members</h2>
             <h3>スタッフ</h3>
             <a href="">
                 <div class="Flex Member">
@@ -63,7 +64,7 @@ <h4>虚無</h4>
             <a href="">
                 <div class="Flex Member" id="Oyakodon">
                     <img src="../pictures/STAFF/親子丼株式会社.png">
-                    <h4>親子丼株式会社㈲</h4>㈲
+                    <h4>親子丼株式会社㈲</h4>
                     <p>ここにかんたんな説明</p>
                 </div>
             </a>
@@ -94,14 +95,15 @@ <h4>翡翠星</h4>
         </div>
         <div id="serverMembers">
             <h3>サーバーメンバー</h3>
+            <!-- beforeend -->
         </div>
     </main>
     <footer>
         <p>©2022 Commander Community Members</p>
     </footer>
-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
-    <script src="../index.js"></script>
-    <script src="../header.js"></script>
-    <script src="flex.js"></script>
+    <script src="../js/index.js"></script>
+    <script src="../js/header.js"></script>
+    <script src="../js/flex.js"></script>
+    <script src="http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/package.json b/package.json
index 86aa640..5479cb9 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"SUCCESSFUL!\" && exit 0"
   },
   "author": "",
   "license": "ISC",
diff --git a/style.css b/style.css
index 2c1920d..c8dd0b2 100644
--- a/style.css
+++ b/style.css
@@ -1,22 +1,23 @@
 *{
     margin: 0px;
     padding: 0px;
+    text-align: left;
 }
 .FlexDiv{
-    width: 966px;
+    width: 920px;
     margin-bottom: 70px;
 }
 .FlexDiv a{
     margin-right: 210px;
-    width: 255px;
+    width: 230px;
 }
-.Flex {
+.Flex{
     flex-wrap: wrap;
     display: inline-flex;
     padding: 3px;
     margin: 3px;
     height: 130px;
-    width: 420px;
+    width: 380px;
     flex-basis: 49%;
     border-radius: .6rem;
     transition: .4s;
@@ -34,7 +35,6 @@
     width: 130px;
     height: 130px;
     border-radius: .6rem;
-    margin-right: 15px;
 }
 .Flex h4, h5, h6, a {
     display: inline-block;
@@ -43,19 +43,22 @@
     color: #757575;
 }
 .Flex p {
+    display: inline-block;
     word-wrap: break-word;
     margin: 10px 0px 0px 15px;
     height: 20px;
     color: #757575;
 }
+
+.header {
     background-image: url(pictures/background.jpg);
-    height: 500px;
-}
-header{
     background-color:rgba(255,255,255,0.6);
-    background-size: auto;
     background-blend-mode:lighten;
+    height: 500px;
     background-size: 100% auto;
+}
+header{
+    width: 100% auto;
     margin: 0 0 0 0;
     padding: 0 0 0 0;
 }
@@ -64,36 +67,30 @@ header h1{
     margin-top: 55px;
     font-size: 60px;
     color: #000;
-    -webkit-text-stroke: 2px #FFF;
 }
 header nav{
+    background-color: rgb(25, 23, 23);
     padding-top: 12px;
     text-align: center;
-    background-color: black;
     height: 65px;
     box-sizing: border-box;
+    margin: 0 0 0 0;
 }
-nav *{
-    color: aliceblue;
-}
+
 nav ul{
     display: flex;
     list-style: none;
-    display: inline-flex;
     margin: 0px 200px 0px 7px;
     height: 23px;
-    color: #757575;
     /* margin-top: 12px; */
 }
-/*
-nav li, :not(img){
+
+nav li a{
+    color: aliceblue;
     padding: 0;
-    /* margin-right: 55px;
-    margin-left: 10px; */
-}
-*/
-header img{
-    width: 70px;
+    margin-right: 55px;
+    margin-left: 10px;
+    width: 176px;
 }
 
 a {
diff --git a/test/index.html b/test/index.html
new file mode 100644
index 0000000..2ba9726
--- /dev/null
+++ b/test/index.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html lang="ja">
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>TEST</title>
+    <link rel="stylesheet" href="../style.css">
+    <script src="../index.js"></script>
+</head>
+<body>
+    <main>
+        <h2>アイコン取得テスト</h2>
+        <img src="getUserIcon("833185541842403369")">
+        <a href="../404.html"><h3>404</h3></a>
+    </main>
+    <script src="http://www.openjs.com/scripts/events/keyboard_shortcuts/shortcut.js"></script>
+    <script src="../js/index.js"></script>
+    <script src="../js/header.js"></script>
+</body>
+</html>
\ No newline at end of file
diff --git a/works/index.html b/works/index.html
index ad99ebe..0386605 100644
--- a/works/index.html
+++ b/works/index.html
@@ -8,16 +8,30 @@
     <title>コマンダーの集い公式wiki|有志制作</title>
 </head>
 <body>
+    <header id="headerGen"></header>
     <main>
+        <h2>このサイト</h2>
+        <h3>コード書いた人たち</h3>
+        <ul>
+            <li><a href="../members/index.html#">あまぐも(@Amagm0)</a></li>
+            <li><a href="../members/index.html#">MIYUKINNG(@MIYUKINNG)</a></li>
+            <li><a href="../members/index.html#">梅干し(@hs02uly)</a></li>
+            <li><a href="../members/index.html#">HardSmoothy(@HardSmoothy)</a></li>
+            <li><a href="../members/index.html#">STAR(@SkyBlueSTAR)</a></li>
+            <li><a href="../members/index.html#">ビートル(専用垢→@GitHubCommander)</a></li>
+            <li><a href="../members/index.html#">きつね(@ShotaController)名前は気にしないでおこうね！！！ﾊﾊｯ</a></li>
+        </ul>
         <h2>防城戦</h2>
         <h3>主な制作メンバー</h3>
-        <p>
-            <a href="members/index.html#Oyakodon">・親子丼株式会社㈲</a><br>
-            <a href="members/index.html#"></a>
-        </p>
+        <ul>
+            <li><a href="../members/index.html#Oyakodon">親子丼株式会社㈲</a><br></li>
+            <li><a href="../members/index.html#"></a></li>
+        </ul>
     </main>
     <footer>
         <p>©2022 Commander Community Members</p>
     </footer>
+    <script src="../js/index.js"></script>
+    <script src="../js/header.js"></script>
 </body>
 </html>
\ No newline at end of file
