diff --git a/CB/Core.py b/CB/Core.py
index f56487f..eb75e11 100644
--- a/CB/Core.py
+++ b/CB/Core.py
@@ -234,12 +234,7 @@ def parse_url(self, url):
                 self.bulk_tukui_check()
                 return TukuiAddon('2', self.tukuiCache)
         elif url.lower() == 'elvui:dev':
-            if self.clientType == 'wow_retail':
-                return GitHubAddonRaw('tukui-org/ElvUI', 'development', ['ElvUI', 'ElvUI_OptionsUI'])
-            elif self.clientType == 'wow_burning_crusade':
-                return GitHubAddonRaw('tukui-org/ElvUI-TBC', 'development', ['ElvUI', 'ElvUI_OptionsUI'])
-            else:
-                return GitHubAddonRaw('tukui-org/ElvUI-Classic', 'development', ['ElvUI', 'ElvUI_OptionsUI'])
+            return GitHubAddonRaw('tukui-org/ElvUI', 'development', ['ElvUI', 'ElvUI_OptionsUI'])
         elif url.lower() == 'tukui':
             if self.clientType == 'wow_retail':
                 return TukuiAddon('Tukui', self.tukuiCache, 'tukui')
diff --git a/CB/GitHub.py b/CB/GitHub.py
index b526676..9c70a90 100644
--- a/CB/GitHub.py
+++ b/CB/GitHub.py
@@ -137,7 +137,7 @@ def __init__(self, project, branch, targetdirs):
         self.directories = targetdirs
         self.author = []
 
-        if project.startswith('tukui-org/ElvUI'):
+        if project == 'tukui-org/ElvUI':
             self.name = 'ElvUI'
             self.author = ['Elv']
         elif project == 'tukui-org/Tukui':
diff --git a/CB/__init__.py b/CB/__init__.py
index e499522..a9e3e5d 100644
--- a/CB/__init__.py
+++ b/CB/__init__.py
@@ -2,7 +2,7 @@
 import random
 from rich.terminal_theme import TerminalTheme
 
-__version__ = '3.18.2'
+__version__ = '3.18.3'
 __license__ = 'GPLv3'
 __copyright__ = '2019-2021, Paweł Jastrzębski <pawelj@iosphe.re>'
 __docformat__ = 'restructuredtext en'