diff --git a/client/src/builtin/Autocomplete.vue b/client/src/builtin/Autocomplete.vue
deleted file mode 100644
index b779341c..00000000
--- a/client/src/builtin/Autocomplete.vue
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * BetterDiscord Autocomplete Component
- * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
- * All rights reserved.
- * https://betterdiscord.net
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
-*/
-
-<template>
-    <div class="bd-autocomplete">
-        <div class="bd-autocomplete-inner">
-            <div class="bd-autocompleteRow">
-                <div class="bd-autocompleteSelector">
-                    <div class="bd-autocompleteTitle">
-                        Emotes Matching:
-                        <strong>Kappa</strong>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-<script>
-    import EmoteModule from '../../../builtin/Emotemodule.js';
-    export default {
-        props: ['title', 'emotes'],
-        beforeMount() {
-            console.log(EmoteModule);
-        }
-    }
-</script>
diff --git a/client/src/styles/partials/generic/autocomplete.scss b/client/src/styles/partials/generic/autocomplete.scss
index 000f33b8..bfc8ebd5 100644
--- a/client/src/styles/partials/generic/autocomplete.scss
+++ b/client/src/styles/partials/generic/autocomplete.scss
@@ -14,12 +14,12 @@
         padding-bottom: 8px;
         white-space: nowrap;
 
-        .bd-autocompleteRow {
+        .bd-autocomplete-row {
             padding: 0 8px;
             font-size: 14px;
             line-height: 16px;
 
-            .bd-autocompleteSelector {
+            .bd-autocomplete-selector {
                 border-radius: 3px;
                 padding: 8px;
 
@@ -31,7 +31,7 @@
                     background-color: #36393f;
                 }
 
-                .bd-autocompleteTitle {
+                .bd-autocomplete-title {
                     color: #72767d;
                     padding: 4px 0;
                     text-transform: uppercase;
@@ -46,7 +46,7 @@
                     }
                 }
 
-                .bd-autocompleteField {
+                .bd-autocomplete-field {
                     display: flex;
                     flex: 1 1 auto;
                     color: #f6f6f7;
diff --git a/client/src/ui/components/common/Autocomplete.vue b/client/src/ui/components/common/Autocomplete.vue
index 627f5262..26323803 100644
--- a/client/src/ui/components/common/Autocomplete.vue
+++ b/client/src/ui/components/common/Autocomplete.vue
@@ -1,5 +1,5 @@
 /**
- * BetterDiscord Autocomplete Component
+ * BetterDiscord Emote Autocomplete Component
  * Copyright (c) 2015-present Jiiks/JsSucks - https://github.com/Jiiks / https://github.com/JsSucks
  * All rights reserved.
  * https://betterdiscord.net
@@ -11,17 +11,17 @@
 <template>
     <div class="bd-autocomplete">
         <div v-if="emotes && emotes.length" class="bd-autocomplete-inner">
-            <div class="bd-autocompleteRow">
-                <div class="bd-autocompleteSelector">
-                    <div class="bd-autocompleteTitle">
+            <div class="bd-autocomplete-row">
+                <div class="bd-autocomplete-selector">
+                    <div class="bd-autocomplete-title">
                         Emotes Matching:
                         <strong>{{title}}</strong>
                     </div>
                 </div>
             </div>
-            <div v-for="(emote, index) in emotes" class="bd-autocompleteRow" :key="index">
-                <div class="bd-autocompleteSelector bd-selectable" :class="{'bd-selected': index === selectedIndex}" @mouseover="() => { selected = emote.id }" @click="() => inject(emote)">
-                    <div class="bd-autocompleteField">
+            <div v-for="(emote, index) in emotes" class="bd-autocomplete-row" :key="index">
+                <div class="bd-autocomplete-selector bd-selectable" :class="{'bd-selected': index === selectedIndex}" @mouseover="() => { selected = emote.id }" @click="() => inject(emote)">
+                    <div class="bd-autocomplete-field">
                         <img :src="getEmoteSrc(emote)"/>
                         <div>{{emote.id}}</div>
                     </div>
@@ -30,6 +30,7 @@
         </div>
     </div>
 </template>
+
 <script>
     import { EmoteModule } from 'builtin';
     import { Events } from 'modules';