diff --git a/_L.lua b/_L.lua
index 8906555..6632d7a 100644
--- a/_L.lua
+++ b/_L.lua
@@ -11,85 +11,80 @@ shared._Locale = {
 		combatAlerterInCombat = "I am in combat with %s at %s (%s) at [%s](%2.2f, %2.2f)",
 		snifferStinky = "I smell a stinky %s",
 		spotterSpotted = "I see (%s) %s/%s %s of race %s (%s) with pvp %s and health %s/%s at %s (%s) [%s](%2.2f, %2.2f)",
-		english = "English",
-		russian = "Russian",
 		whoerNew = "%s %s c:%s r:%s (%s) g:%s - %s",
 		whoerMoved = "%s c:%s (%s - %s) g:%s moved to %s",
 		whoerGone = "%s c:%s g:%s left %s",
 		killed = "%s killed %s with %s in %s (%s) at [%s](%2.2f, %2.2f)",
-		hostile = "hostile",
 		friendly = "friendly",
 		unknown = "unknown",
 		pvpOn = "ON",
 		pvpOff = "OFF",
-		config = {
-			afkThreshold = "Afk Threshold",
-			agentTracker = "Agent Tracker",
-			alertSound = "Alert Sound",
-			tagSound = "Tag Sound",
-			alliance = "Alliance",
-			bonkDetector = "Bonk Detector",
-			cleanupInterval = "Cleanup Interval",
-			combatAlerter = "Combat Alerter",
-			combatSound = "Combat Sound",
-			commander = "Commander",
-			deathReporter = "Death Reporter",
-			debug = "Debug",
-			declineOther = "Decline Other",
-			doWhisper = "Do Whisper",
-			duelThrottle = "Duel Throttle",
-			dueler = "Dueler",
-			echoer = "Echoer",
-			echoToRussian = "Russian",
-			emoter = "Emoter",
-			enabled = "Enabled",
-			english = "English",
-			everyone = "Everyone",
-			heimdallConfig = "Heimdall Config",
-			helpSound = "Help Sound",
-			hostile = "Hostile",
-			ignored = "Ignored",
-			interval = "Interval",
-			inviter = "Inviter",
-			keyword = "Keyword",
-			locale = "Locale",
-			macroer = "Macroer",
-			messageDelegator = "Message Delegator",
-			messenger = "Messenger",
-			minimapTagger = "Minimap Tagger",
-			channels = "Channels",
-			channelLocale = "Channel Locale",
-			prefix = "Prefix",
-			priority = "Priority",
-			russian = "Russian",
-			scale = "Scale",
-			sniffer = "Sniffer",
-			soundFile = "Sound File",
-			soundThrottle = "Sound Throttle",
-			spotter = "Spotter",
-			stinkies = "Stinkies",
-			stinky = "Stinky",
-			stinkyTracker = "Stinky Tracker",
-			textureFile = "Texture File",
-			throttle = "Throttle",
-			ttl = "TTL",
-			whisperNotify = "Whisper Notify",
-			noter = "Noter",
-			whoer = "Whoer",
-			zoneNotifyFor = "Zone Notify For",
-			zoneOverride = "Zone Override",
-			allAssist = "All Assist",
-			agentsAssist = "Agents Assist",
-			assist = "Assist",
-			kickOffline = "Kick Offline",
-			lastNotes = "Last Notes",
-			network = "Network",
-			addonPrefix = "Addon Prefix",
-			members = "Members",
-			updateInterval = "Update Interval",
-			networkMessenger = "Network Messenger",
-			queries = "Who queries",
-		},
+		afkThreshold = "Afk Threshold",
+		agentTracker = "Agent Tracker",
+		alertSound = "Alert Sound",
+		tagSound = "Tag Sound",
+		alliance = "Alliance",
+		bonkDetector = "Bonk Detector",
+		cleanupInterval = "Cleanup Interval",
+		combatAlerter = "Combat Alerter",
+		combatSound = "Combat Sound",
+		commander = "Commander",
+		deathReporter = "Death Reporter",
+		debug = "Debug",
+		declineOther = "Decline Other",
+		doWhisper = "Do Whisper",
+		duelThrottle = "Duel Throttle",
+		dueler = "Dueler",
+		echoer = "Echoer",
+		echoToRussian = "Russian",
+		emoter = "Emoter",
+		enabled = "Enabled",
+		english = "English",
+		everyone = "Everyone",
+		heimdallConfig = "Heimdall Config",
+		helpSound = "Help Sound",
+		hostile = "Hostile",
+		ignored = "Ignored",
+		interval = "Interval",
+		inviter = "Inviter",
+		keyword = "Keyword",
+		locale = "Locale",
+		macroer = "Macroer",
+		messageDelegator = "Message Delegator",
+		messenger = "Messenger",
+		minimapTagger = "Minimap Tagger",
+		channels = "Channels",
+		channelLocale = "Channel Locale",
+		prefix = "Prefix",
+		priority = "Priority",
+		russian = "Russian",
+		scale = "Scale",
+		sniffer = "Sniffer",
+		soundFile = "Sound File",
+		soundThrottle = "Sound Throttle",
+		spotter = "Spotter",
+		stinkies = "Stinkies",
+		stinky = "Stinky",
+		stinkyTracker = "Stinky Tracker",
+		textureFile = "Texture File",
+		throttle = "Throttle",
+		ttl = "TTL",
+		whisperNotify = "Whisper Notify",
+		noter = "Noter",
+		whoer = "Whoer",
+		zoneNotifyFor = "Zone Notify For",
+		zoneOverride = "Zone Override",
+		allAssist = "All Assist",
+		agentsAssist = "Agents Assist",
+		assist = "Assist",
+		kickOffline = "Kick Offline",
+		lastNotes = "Last Notes",
+		network = "Network",
+		addonPrefix = "Addon Prefix",
+		members = "Members",
+		updateInterval = "Update Interval",
+		networkMessenger = "Network Messenger",
+		queries = "Who queries",
 	},
 	ru = {
 		bonkDetected = "%s ударил %s (%s)",
@@ -101,81 +96,76 @@ shared._Locale = {
 		whoerMoved = "%s класса %s (%s - %s) и гильдии %s переместился в %s",
 		whoerGone = "%s класса %s и гильдии %s покинул %s",
 		killed = "%s убил %s с %s в %s (%s) на [%s](%2.2f, %2.2f)",
-		hostile = "враждебный",
 		friendly = "дружественный",
 		unknown = "неизвестный",
-		english = "Английский",
-		russian = "Русский",
 		pvpOn = "вкл",
 		pvpOff = "выкл",
-		config = {
-			alertSound = "Звук Оповещения",
-			tagSound = "Звук Тега",
-			soundThrottle = "Тхроттлер Звука",
-			soundFile = "Файл Звука",
-			textureFile = "Файл Текстуры",
-			combatSound = "Звук Боя",
-			helpSound = "Звук Помощи",
-			afkThreshold = "Порог AFK",
-			agentTracker = "Трекер Агента",
-			alliance = "Альянс",
-			cleanupInterval = "Интервал Очистки",
-			combatAlerter = "Система Оповещения о Бое",
-			channelLocale = "Локаль Канала",
-			commander = "Командир",
-			deathReporter = "Система Отчетов о Смерти",
-			debug = "Отладка",
-			declineOther = "Отклонить Другое",
-			doWhisper = "Отправить Шепот",
-			duelThrottle = "Регулятор Дуэли",
-			dueler = "Дуэлянт",
-			echoer = "Эхо-модуль",
-			echoToRussian = "Русский",
-			emoter = "Генератор Эмоций",
-			enabled = "Включено",
-			english = "Английский",
-			everyone = "Все",
-			heimdallConfig = "Конфигурация Heimdall",
-			hostile = "Враждебный",
-			ignored = "Игнорируется",
-			interval = "Интервал",
-			inviter = "Инвайтер",
-			keyword = "Ключевое Слово",
-			locale = "Локаль",
-			macroer = "Макрос-отправитель",
-			messageDelegator = "Делегатор Сообщений",
-			messenger = "Мессенджер",
-			minimapTagger = "Маркер Миникарты",
-			channels = "Каналы",
-			prefix = "Префикс",
-			priority = "Приоритет",
-			russian = "Русский",
-			scale = "Масштаб",
-			sniffer = "Сниффер",
-			spotter = "Наблюдатель",
-			stinkies = "Неприятные Запахи",
-			stinky = "Неприятный",
-			stinkyTracker = "Трекер Неприятных Запахов",
-			noter = "Нотер",
-			throttle = "Тхроттлер",
-			ttl = "TTL",
-			whisperNotify = "Уведомление Шепотом",
-			whoer = "Запроситель Who",
-			zoneNotifyFor = "Уведомления о Зоне Для",
-			zoneOverride = "Переопределение Зоны",
-			allAssist = "Все Ассисты",
-			agentsAssist = "Агенты Ассисты",
-			assist = "Ассист",
-			kickOffline = "Кик Оффлайн",
-			bonkDetector = "Детектор Ударов",
-			lastNotes = "Последние Заметки",
-			network = "Сеть",
-			addonPrefix = "Префикс Аддона",
-			members = "Участники",
-			updateInterval = "Интервал Обновления",
-			networkMessenger = "Сетевой Мессенджер",
-			queries = "Запросы Who",
-		},
+		alertSound = "Звук Оповещения",
+		tagSound = "Звук Тега",
+		soundThrottle = "Тхроттлер Звука",
+		soundFile = "Файл Звука",
+		textureFile = "Файл Текстуры",
+		combatSound = "Звук Боя",
+		helpSound = "Звук Помощи",
+		afkThreshold = "Порог AFK",
+		agentTracker = "Трекер Агента",
+		alliance = "Альянс",
+		cleanupInterval = "Интервал Очистки",
+		combatAlerter = "Система Оповещения о Бое",
+		channelLocale = "Локаль Канала",
+		commander = "Командир",
+		deathReporter = "Система Отчетов о Смерти",
+		debug = "Отладка",
+		declineOther = "Отклонить Другое",
+		doWhisper = "Отправить Шепот",
+		duelThrottle = "Регулятор Дуэли",
+		dueler = "Дуэлянт",
+		echoer = "Эхо-модуль",
+		echoToRussian = "Русский",
+		emoter = "Генератор Эмоций",
+		enabled = "Включено",
+		english = "Английский",
+		everyone = "Все",
+		heimdallConfig = "Конфигурация Heimdall",
+		hostile = "Враждебный",
+		ignored = "Игнорируется",
+		interval = "Интервал",
+		inviter = "Инвайтер",
+		keyword = "Ключевое Слово",
+		locale = "Локаль",
+		macroer = "Макрос-отправитель",
+		messageDelegator = "Делегатор Сообщений",
+		messenger = "Мессенджер",
+		minimapTagger = "Маркер Миникарты",
+		channels = "Каналы",
+		prefix = "Префикс",
+		priority = "Приоритет",
+		russian = "Русский",
+		scale = "Масштаб",
+		sniffer = "Сниффер",
+		spotter = "Наблюдатель",
+		stinkies = "Неприятные Запахи",
+		stinky = "Неприятный",
+		stinkyTracker = "Трекер Неприятных Запахов",
+		noter = "Нотер",
+		throttle = "Тхроттлер",
+		ttl = "TTL",
+		whisperNotify = "Уведомление Шепотом",
+		whoer = "Запроситель Who",
+		zoneNotifyFor = "Уведомления о Зоне Для",
+		zoneOverride = "Переопределение Зоны",
+		allAssist = "Все Ассисты",
+		agentsAssist = "Агенты Ассисты",
+		assist = "Ассист",
+		kickOffline = "Кик Оффлайн",
+		bonkDetector = "Детектор Ударов",
+		lastNotes = "Последние Заметки",
+		network = "Сеть",
+		addonPrefix = "Префикс Аддона",
+		members = "Участники",
+		updateInterval = "Интервал Обновления",
+		networkMessenger = "Сетевой Мессенджер",
+		queries = "Запросы Who",
 		["Orgrimmar"] = "Оргриммар",
 		["Valley of Strength"] = "Долина Силы",
 		["Valley of Trials"] = "Долина Испытаний",