diff --git a/src/components/WishImportModal.svelte b/src/components/WishImportModal.svelte
index 92fd0892..9c3e5a6f 100644
--- a/src/components/WishImportModal.svelte
+++ b/src/components/WishImportModal.svelte
@@ -31,18 +31,18 @@
   let genshinLink = '';
 
   let types = {
-    100: {
-      name: "Beginners' Wish",
-      id: 'beginners',
-    },
-    200: {
-      name: 'Standard',
-      id: 'standard',
-    },
-    301: {
-      name: 'Character Event',
-      id: 'character-event',
-    },
+    // 100: {
+    //   name: "Beginners' Wish",
+    //   id: 'beginners',
+    // },
+    // 200: {
+    //   name: 'Standard',
+    //   id: 'standard',
+    // },
+    // 301: {
+    //   name: 'Character Event',
+    //   id: 'character-event',
+    // },
     302: {
       name: 'Weapon Event',
       id: 'weapon-event',
@@ -135,7 +135,7 @@
     console.log(wishNumber, type);
     url.searchParams.set('auth_appid', 'webview_gacha');
     url.searchParams.set('init_type', '301');
-    url.searchParams.set('gacha_id', 'd610857102f9256ba143ccf2e03b964c76a6ed');
+    url.searchParams.set('gacha_id', 'b8fd0d8a6c940c7a16a486367de5f6d2232f53');
     url.searchParams.set('lang', 'en');
     url.searchParams.set('device_type', getDeviceType());
     if (region !== '') url.searchParams.set('region', region);
diff --git a/src/data/weaponList.js b/src/data/weaponList.js
index c950112c..2cc7aa94 100644
--- a/src/data/weaponList.js
+++ b/src/data/weaponList.js
@@ -2137,49 +2137,49 @@ export const weaponList = {
     ascension: [
       {
         items: [
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
+          { item: itemList.tile_of_decarabians_tower, amount: 3 },
+          { item: itemList.heavy_horn, amount: 3 },
+          { item: itemList.divining_scroll, amount: 2 },
         ],
         mora: 5000,
       },
       {
         items: [
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
+          { item: itemList.debris_of_decarabians_city, amount: 3 },
+          { item: itemList.heavy_horn, amount: 12 },
+          { item: itemList.divining_scroll, amount: 8 },
         ],
         mora: 15000,
       },
       {
         items: [
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
+          { item: itemList.debris_of_decarabians_city, amount: 6 },
+          { item: itemList.black_bronze_horn, amount: 6 },
+          { item: itemList.sealed_scroll, amount: 6 },
         ],
         mora: 20000,
       },
       {
         items: [
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
+          { item: itemList.fragment_of_decarabians_epic, amount: 3 },
+          { item: itemList.black_bronze_horn, amount: 12 },
+          { item: itemList.sealed_scroll, amount: 9 },
         ],
         mora: 30000,
       },
       {
         items: [
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
+          { item: itemList.fragment_of_decarabians_epic, amount: 6 },
+          { item: itemList.black_crystal_horn, amount: 9 },
+          { item: itemList.forbidden_curse_scroll, amount: 6 },
         ],
         mora: 35000,
       },
       {
         items: [
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
-          { item: itemList.unknown, amount: 0 },
+          { item: itemList.scattered_piece_of_decarabians_dream, amount: 4 },
+          { item: itemList.black_crystal_horn, amount: 18 },
+          { item: itemList.forbidden_curse_scroll, amount: 12 },
         ],
         mora: 45000,
       },
@@ -2303,65 +2303,65 @@ export const weaponList = {
       },
     ],
   },
-  // alley_hunter: {
-  //   name: 'Alley Hunter',
-  //   id: 'alley_hunter',
-  //   rarity: 4,
-  //   atk: 41,
-  //   secondary: 'CRIT Rate',
-  //   type: weapons.bow,
-  //   source: 'wish',
-  //   ascension: [
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_milk_tooth, amount: 3 },
-  //         { item: itemList.dead_ley_line_branch, amount: 3 },
-  //         { item: itemList.treasure_hoarder_insignia, amount: 2 },
-  //       ],
-  //       mora: 5000,
-  //     },
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_cracked_tooth, amount: 3 },
-  //         { item: itemList.dead_ley_line_branch, amount: 12 },
-  //         { item: itemList.treasure_hoarder_insignia, amount: 8 },
-  //       ],
-  //       mora: 15000,
-  //     },
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_cracked_tooth, amount: 6 },
-  //         { item: itemList.dead_ley_line_leaves, amount: 6 },
-  //         { item: itemList.silver_raven_insignia, amount: 6 },
-  //       ],
-  //       mora: 20000,
-  //     },
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_broken_fang, amount: 3 },
-  //         { item: itemList.dead_ley_line_leaves, amount: 12 },
-  //         { item: itemList.silver_raven_insignia, amount: 9 },
-  //       ],
-  //       mora: 30000,
-  //     },
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_broken_fang, amount: 6 },
-  //         { item: itemList.ley_line_sprouts, amount: 9 },
-  //         { item: itemList.golden_raven_insignia, amount: 6 },
-  //       ],
-  //       mora: 35000,
-  //     },
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_nostalgia, amount: 4 },
-  //         { item: itemList.ley_line_sprouts, amount: 18 },
-  //         { item: itemList.golden_raven_insignia, amount: 12 },
-  //       ],
-  //       mora: 45000,
-  //     },
-  //   ],
-  // },
+  alley_hunter: {
+    name: 'Alley Hunter',
+    id: 'alley_hunter',
+    rarity: 4,
+    atk: 41,
+    secondary: 'CRIT Rate',
+    type: weapons.bow,
+    source: 'wish',
+    ascension: [
+      {
+        items: [
+          { item: itemList.boreal_wolfs_milk_tooth, amount: 3 },
+          { item: itemList.dead_ley_line_branch, amount: 3 },
+          { item: itemList.treasure_hoarder_insignia, amount: 2 },
+        ],
+        mora: 5000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_cracked_tooth, amount: 3 },
+          { item: itemList.dead_ley_line_branch, amount: 12 },
+          { item: itemList.treasure_hoarder_insignia, amount: 8 },
+        ],
+        mora: 15000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_cracked_tooth, amount: 6 },
+          { item: itemList.dead_ley_line_leaves, amount: 6 },
+          { item: itemList.silver_raven_insignia, amount: 6 },
+        ],
+        mora: 20000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_broken_fang, amount: 3 },
+          { item: itemList.dead_ley_line_leaves, amount: 12 },
+          { item: itemList.silver_raven_insignia, amount: 9 },
+        ],
+        mora: 30000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_broken_fang, amount: 6 },
+          { item: itemList.ley_line_sprouts, amount: 9 },
+          { item: itemList.golden_raven_insignia, amount: 6 },
+        ],
+        mora: 35000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_nostalgia, amount: 4 },
+          { item: itemList.ley_line_sprouts, amount: 18 },
+          { item: itemList.golden_raven_insignia, amount: 12 },
+        ],
+        mora: 45000,
+      },
+    ],
+  },
   lithic_spear: {
     name: 'Lithic Spear',
     id: 'lithic_spear',
@@ -2421,65 +2421,65 @@ export const weaponList = {
       },
     ],
   },
-  // wine_and_song: {
-  //   name: 'Wine and Song',
-  //   id: 'wine_and_song',
-  //   rarity: 4,
-  //   atk: 42,
-  //   secondary: 'Energy Recharge',
-  //   type: weapons.catalyst,
-  //   source: 'currently unobtainable',
-  //   ascension: [
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_milk_tooth, amount: 3 },
-  //         { item: itemList.dead_ley_line_branch, amount: 3 },
-  //         { item: itemList.divining_scroll, amount: 2 },
-  //       ],
-  //       mora: 5000,
-  //     },
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_cracked_tooth, amount: 3 },
-  //         { item: itemList.dead_ley_line_branch, amount: 12 },
-  //         { item: itemList.divining_scroll, amount: 8 },
-  //       ],
-  //       mora: 15000,
-  //     },
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_cracked_tooth, amount: 6 },
-  //         { item: itemList.dead_ley_line_leaves, amount: 6 },
-  //         { item: itemList.sealed_scroll, amount: 6 },
-  //       ],
-  //       mora: 20000,
-  //     },
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_broken_fang, amount: 3 },
-  //         { item: itemList.dead_ley_line_leaves, amount: 12 },
-  //         { item: itemList.sealed_scroll, amount: 9 },
-  //       ],
-  //       mora: 30000,
-  //     },
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_broken_fang, amount: 6 },
-  //         { item: itemList.ley_line_sprouts, amount: 9 },
-  //         { item: itemList.forbidden_curse_scroll, amount: 6 },
-  //       ],
-  //       mora: 35000,
-  //     },
-  //     {
-  //       items: [
-  //         { item: itemList.boreal_wolfs_nostalgia, amount: 4 },
-  //         { item: itemList.ley_line_sprouts, amount: 18 },
-  //         { item: itemList.forbidden_curse_scroll, amount: 12 },
-  //       ],
-  //       mora: 45000,
-  //     },
-  //   ],
-  // },
+  wine_and_song: {
+    name: 'Wine and Song',
+    id: 'wine_and_song',
+    rarity: 4,
+    atk: 42,
+    secondary: 'Energy Recharge',
+    type: weapons.catalyst,
+    source: 'currently unobtainable',
+    ascension: [
+      {
+        items: [
+          { item: itemList.boreal_wolfs_milk_tooth, amount: 3 },
+          { item: itemList.dead_ley_line_branch, amount: 3 },
+          { item: itemList.treasure_hoarder_insignia, amount: 2 },
+        ],
+        mora: 5000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_cracked_tooth, amount: 3 },
+          { item: itemList.dead_ley_line_branch, amount: 12 },
+          { item: itemList.treasure_hoarder_insignia, amount: 8 },
+        ],
+        mora: 15000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_cracked_tooth, amount: 6 },
+          { item: itemList.dead_ley_line_leaves, amount: 6 },
+          { item: itemList.silver_raven_insignia, amount: 6 },
+        ],
+        mora: 20000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_broken_fang, amount: 3 },
+          { item: itemList.dead_ley_line_leaves, amount: 12 },
+          { item: itemList.silver_raven_insignia, amount: 9 },
+        ],
+        mora: 30000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_broken_fang, amount: 6 },
+          { item: itemList.ley_line_sprouts, amount: 9 },
+          { item: itemList.golden_raven_insignia, amount: 6 },
+        ],
+        mora: 35000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_nostalgia, amount: 4 },
+          { item: itemList.ley_line_sprouts, amount: 18 },
+          { item: itemList.golden_raven_insignia, amount: 12 },
+        ],
+        mora: 45000,
+      },
+    ],
+  },
   blackcliff_warbow: {
     name: 'Blackcliff Warbow',
     id: 'blackcliff_warbow',
@@ -6256,4 +6256,63 @@ export const weaponList = {
       },
     ],
   },
+  elegy_for_the_end: {
+    name: "Elegy for the End",
+    id: "elegy_for_the_end",
+    rarity: 5,
+    type: weapons.bow,
+    source: "wish",
+    atk: 46,
+    secondary: "Energy Recharge",
+    ascension: [
+      {
+        items: [
+          { item: itemList.boreal_wolfs_milk_tooth, amount: 3 },
+          { item: itemList.heavy_horn, amount: 3 },
+          { item: itemList.recruits_insignia, amount: 2 },
+        ],
+        mora: 10000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_cracked_tooth, amount: 3 },
+          { item: itemList.heavy_horn, amount: 12 },
+          { item: itemList.recruits_insignia, amount: 8 },
+        ],
+        mora: 20000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_cracked_tooth, amount: 6 },
+          { item: itemList.black_bronze_horn, amount: 6 },
+          { item: itemList.sergeants_insignia, amount: 6 },
+        ],
+        mora: 30000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_broken_fang, amount: 3 },
+          { item: itemList.black_bronze_horn, amount: 12 },
+          { item: itemList.sergeants_insignia, amount: 9 },
+        ],
+        mora: 45000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_broken_fang, amount: 6 },
+          { item: itemList.black_crystal_horn, amount: 9 },
+          { item: itemList.lieutenants_insignia, amount: 6 },
+        ],
+        mora: 55000,
+      },
+      {
+        items: [
+          { item: itemList.boreal_wolfs_nostalgia, amount: 4 },
+          { item: itemList.black_crystal_horn, amount: 18 },
+          { item: itemList.lieutenants_insignia, amount: 12 },
+        ],
+        mora: 65000,
+      },
+    ],
+  },
 };
diff --git a/src/routes/settings/index.svelte b/src/routes/settings/index.svelte
index d875edc9..94df07b6 100644
--- a/src/routes/settings/index.svelte
+++ b/src/routes/settings/index.svelte
@@ -343,7 +343,10 @@
     </p>
     {#if changelogOpen}
       <div transition:slide class="mt-4">
-        <pre class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap">2021/03/13 
+        <pre class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap">2021/03/17 
+- Fix wish import
+- Add new 1.4 weapons</pre>
+        <pre class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap mt-2">2021/03/13 
 - Add timeline page</pre>
         <pre
           class="bg-background rounded-xl py-2 px-4 whitespace-pre-wrap mt-2">2021/03/09 
diff --git a/static/images/weapons/alley_hunter.png b/static/images/weapons/alley_hunter.png
index b2e00f1e..e49aa853 100644
Binary files a/static/images/weapons/alley_hunter.png and b/static/images/weapons/alley_hunter.png differ
diff --git a/static/images/weapons/elegy_for_the_end.png b/static/images/weapons/elegy_for_the_end.png
new file mode 100644
index 00000000..2bd72ee9
Binary files /dev/null and b/static/images/weapons/elegy_for_the_end.png differ
diff --git a/static/images/weapons/wine_and_song.png b/static/images/weapons/wine_and_song.png
index f50a82ef..4cdf000c 100644
Binary files a/static/images/weapons/wine_and_song.png and b/static/images/weapons/wine_and_song.png differ