diff --git a/sopel_modules/SpiceBot_AI/AI_Hello.py b/sopel_modules/SpiceBot_AI/AI_Hello.py
deleted file mode 100644
index ee30964..0000000
--- a/sopel_modules/SpiceBot_AI/AI_Hello.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-import spicemanip
-
-
-@sopel.module.rule(r'(?i)(hi|hello|hey),? $nickname[ \t]*$')
-def bot_command_hello(bot, trigger):
- hello = spicemanip.main(['Hi', 'Hey', 'Hello'], "random")
- punctuation = spicemanip.main(['', '!', '?'], "random")
- bot.osd(hello + ' ' + trigger.nick + punctuation)
-
-
-@sopel.module.nickname_commands('hello', 'hi', 'hey')
-def bot_command_hello_b(bot, trigger):
- bot_command_hello(bot, trigger)
diff --git a/sopel_modules/SpiceBot_AI/AI_InsultHandler.py b/sopel_modules/SpiceBot_AI/AI_InsultHandler.py
deleted file mode 100644
index 910dd7b..0000000
--- a/sopel_modules/SpiceBot_AI/AI_InsultHandler.py
+++ /dev/null
@@ -1,10 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-
-@sopel.module.rule(r'(?i)(Fuck|Screw) (you|off),? $nickname[ \t]*$')
-def bot_command_srewyou(bot, trigger):
- bot.osd("Watch your mouth, " + trigger.nick + ", or I'll tell your mother!")
diff --git a/sopel_modules/SpiceBot_AI/AI_Lazy.py b/sopel_modules/SpiceBot_AI/AI_Lazy.py
deleted file mode 100644
index a3385a6..0000000
--- a/sopel_modules/SpiceBot_AI/AI_Lazy.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-
-@sopel.module.rule(r'(?i)(Damnit|Lazy)? $nickname[ \t]*$')
-def bot_command_damnlazy(bot, trigger):
- bot.osd("I do not tell you how to do your job, " + trigger.nick + "!!!")
-
-
-@sopel.module.rule('$nickname is lazy')
-def bot_command_damnlazy_b(bot, trigger):
- bot_command_damnlazy(bot, trigger)
diff --git a/sopel_modules/SpiceBot_AI/AI_Love.py b/sopel_modules/SpiceBot_AI/AI_Love.py
deleted file mode 100644
index c43361c..0000000
--- a/sopel_modules/SpiceBot_AI/AI_Love.py
+++ /dev/null
@@ -1,40 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-
-@sopel.module.rule(r'(?i)(I love you|loveya),? $nickname[ \t]*$')
-def bot_command_love(bot, trigger):
- bot.osd(trigger.nick + ", I love you too.")
-
-
-@sopel.module.rule('$nickname (loveya|I love you)')
-def bot_command_love_b(bot, trigger):
- bot_command_love(bot, trigger)
-
-
-@sopel.module.nickname_commands('loveya')
-def bot_command_love_c(bot, trigger):
- bot_command_love(bot, trigger)
-
-
-@sopel.module.rule('(I love) $nickname')
-def bot_command_love_d(bot, trigger):
- bot_command_like(bot, trigger)
-
-
-@sopel.module.rule(r'(?i)(I like you),? $nickname[ \t]*$')
-def bot_command_like(bot, trigger):
- bot.osd(trigger.nick + ", I like you too.")
-
-
-@sopel.module.rule('$nickname (I like you)')
-def bot_command_like_b(bot, trigger):
- bot_command_like(bot, trigger)
-
-
-@sopel.module.rule('(I like) $nickname')
-def bot_command_like_c(bot, trigger):
- bot_command_like(bot, trigger)
diff --git a/sopel_modules/SpiceBot_AI/AI_Really.py b/sopel_modules/SpiceBot_AI/AI_Really.py
deleted file mode 100644
index 162b828..0000000
--- a/sopel_modules/SpiceBot_AI/AI_Really.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-import spicemanip
-
-
-@sopel.module.rule(r'(?i)(really),? $nickname\?')
-def bot_command_really(bot, trigger):
- really = spicemanip.main(["Yes, really.", "Really really"], "random")
- bot.osd(trigger.nick + ", " + really)
-
-
-@sopel.module.rule('$nickname really\?')
-def bot_command_really_b(bot, trigger):
- bot_command_really(bot, trigger)
diff --git a/sopel_modules/SpiceBot_AI/AI_Thanks.py b/sopel_modules/SpiceBot_AI/AI_Thanks.py
deleted file mode 100644
index 8babea3..0000000
--- a/sopel_modules/SpiceBot_AI/AI_Thanks.py
+++ /dev/null
@@ -1,20 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-
-@sopel.module.rule(r'(?i)(thank you|thanks),? $nickname[ \t]*$')
-def bot_command_thanks(bot, trigger):
- bot.osd(trigger.nick + ",You're welcome.")
-
-
-@sopel.module.rule('$nickname (thank you)')
-def bot_command_thanks_b(bot, trigger):
- bot_command_thanks(bot, trigger)
-
-
-@sopel.module.nickname_commands('thanks')
-def bot_command_thanks_c(bot, trigger):
- bot_command_thanks(bot, trigger)
diff --git a/sopel_modules/SpiceBot_AI/AI_Welcomeback.py b/sopel_modules/SpiceBot_AI/AI_Welcomeback.py
deleted file mode 100644
index b81f42c..0000000
--- a/sopel_modules/SpiceBot_AI/AI_Welcomeback.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# coding=utf-8
-
-from __future__ import unicode_literals, absolute_import, division, print_function
-
-import sopel.module
-
-import spicemanip
-
-
-@sopel.module.rule(r'(?i)(welcome back),? $nickname\?')
-def bot_command_really(bot, trigger):
- reply = spicemanip.main(['Thank you', 'thanks'], "random")
- bot.osd(trigger.nick + ", " + reply)
diff --git a/sopel_modules/SpiceBot_AI/__init__.py b/sopel_modules/SpiceBot_AI/__init__.py
index a5f1f17..683ec02 100644
--- a/sopel_modules/SpiceBot_AI/__init__.py
+++ b/sopel_modules/SpiceBot_AI/__init__.py
@@ -3,13 +3,6 @@ from __future__ import unicode_literals, absolute_import, division, print_functi
from .AI import *
from .AI_aiml import *
-from .AI_Hello import *
-from .AI_Thanks import *
-from .AI_Lazy import *
-from .AI_InsultHandler import *
-from .AI_Love import *
-from .AI_Really import *
-from .AI_Welcomeback import *
__author__ = 'Sam Zick'
__email__ = 'sam@deathbybandaid.net'
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_goodbye.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_goodbye.aiml
index 6234ef0..9835bb2 100644
--- a/sopel_modules/SpiceBot_Configs/aiml/nickname_goodbye.aiml
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_goodbye.aiml
@@ -27,6 +27,45 @@
+
+ BOTNICK seeya
+
+
+ bye, triggernick
+ goodbye, triggernick
+ seeya, triggernick
+ cya, triggernick
+ ttyl, triggernick
+
+
+
+
+
+ BOTNICK cya
+
+
+ bye, triggernick
+ goodbye, triggernick
+ seeya, triggernick
+ cya, triggernick
+ ttyl, triggernick
+
+
+
+
+
+ BOTNICK ttyl
+
+
+ bye, triggernick
+ goodbye, triggernick
+ seeya, triggernick
+ cya, triggernick
+ ttyl, triggernick
+
+
+
+
BYE BOTNICK
@@ -53,4 +92,43 @@
+
+ seeya BOTNICK
+
+
+ bye, triggernick
+ goodbye, triggernick
+ seeya, triggernick
+ cya, triggernick
+ ttyl, triggernick
+
+
+
+
+
+ cya BOTNICK
+
+
+ bye, triggernick
+ goodbye, triggernick
+ seeya, triggernick
+ cya, triggernick
+ ttyl, triggernick
+
+
+
+
+
+ ttyl BOTNICK
+
+
+ bye, triggernick
+ goodbye, triggernick
+ seeya, triggernick
+ cya, triggernick
+ ttyl, triggernick
+
+
+
+
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_hello.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_hello.aiml
new file mode 100644
index 0000000..09876b9
--- /dev/null
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_hello.aiml
@@ -0,0 +1,70 @@
+
+
+
+
+ BOTNICK hi
+
+
+ hi, triggernick
+ hello, triggernick
+ hey, triggernick
+
+
+
+
+
+ BOTNICK hello
+
+
+ hi, triggernick
+ hello, triggernick
+ hey, triggernick
+
+
+
+
+
+ BOTNICK hey
+
+
+ hi, triggernick
+ hello, triggernick
+ hey, triggernick
+
+
+
+
+
+ hi BOTNICK
+
+
+ hi, triggernick
+ hello, triggernick
+ hey, triggernick
+
+
+
+
+
+ hello BOTNICK
+
+
+ hi, triggernick
+ hello, triggernick
+ hey, triggernick
+
+
+
+
+
+ hey BOTNICK
+
+
+ hi, triggernick
+ hello, triggernick
+ hey, triggernick
+
+
+
+
+
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_insulthandler.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_insulthandler.aiml
new file mode 100644
index 0000000..25c37ac
--- /dev/null
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_insulthandler.aiml
@@ -0,0 +1,34 @@
+
+
+
+
+ BOTNICK fuck you
+ Watch your mouth, triggernick, or I'll tell your mother!
+
+
+
+ BOTNICK fuck off
+ Watch your mouth, triggernick, or I'll tell your mother!
+
+
+
+ BOTNICK screw you
+ Watch your mouth, triggernick, or I'll tell your mother!
+
+
+
+ fuck you BOTNICK
+ Watch your mouth, triggernick, or I'll tell your mother!
+
+
+
+ fuck off BOTNICK
+ Watch your mouth, triggernick, or I'll tell your mother!
+
+
+
+ screw you BOTNICK
+ Watch your mouth, triggernick, or I'll tell your mother!
+
+
+
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_lazy.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_lazy.aiml
new file mode 100644
index 0000000..854221a
--- /dev/null
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_lazy.aiml
@@ -0,0 +1,38 @@
+
+
+
+
+ BOTNICK IS LAZY
+
+
+ hi, triggernick
+ hello, triggernick
+ hey, triggernick
+
+
+
+
+
+
+ LAZY BOTNICK
+
+
+ hi, triggernick
+ hello, triggernick
+ hey, triggernick
+
+
+
+
+
+ DAMNIT BOTNICK
+
+
+ hi, triggernick
+ hello, triggernick
+ hey, triggernick
+
+
+
+
+
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_love.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_love.aiml
new file mode 100644
index 0000000..cf8fde8
--- /dev/null
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_love.aiml
@@ -0,0 +1,44 @@
+
+
+
+
+ BOTNICK I love you
+ triggernick, I love you too.
+
+
+
+ BOTNICK loveya
+ triggernick, I love you too.
+
+
+
+ BOTNICK I love you
+ triggernick, I love you too.
+
+
+
+ BOTNICK I like you
+ triggernick, I like you too.
+
+
+
+ I love you BOTNICK
+ triggernick, I love you too.
+
+
+
+ loveya BOTNICK
+ triggernick, I love you too.
+
+
+
+ I love BOTNICK
+ triggernick, I love you too.
+
+
+
+ I like BOTNICK
+ triggernick, I like you too.
+
+
+
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_really.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_really.aiml
new file mode 100644
index 0000000..0847dd6
--- /dev/null
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_really.aiml
@@ -0,0 +1,25 @@
+
+
+
+
+ BOTNICK really
+
+
+ triggernick, Yes, really.
+ triggernick, Really really
+
+
+
+
+
+ really BOTNICK
+
+
+ triggernick, Yes, really.
+ triggernick, Really really
+
+
+
+
+
+
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_thanks.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_thanks.aiml
new file mode 100644
index 0000000..dcdd7bc
--- /dev/null
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_thanks.aiml
@@ -0,0 +1,34 @@
+
+
+
+
+ thank you BOTNICK
+ triggernick, I like you too.
+
+
+
+ BOTNICK thank you
+ triggernick, I like you too.
+
+
+
+ thanks BOTNICK
+ triggernick, I like you too.
+
+
+
+ BOTNICK thanks
+ triggernick, I like you too.
+
+
+
+ thankya BOTNICK
+ triggernick, I like you too.
+
+
+
+ BOTNICK thankya
+ triggernick, I like you too.
+
+
+
diff --git a/sopel_modules/SpiceBot_Configs/aiml/nickname_welcomeback.aiml b/sopel_modules/SpiceBot_Configs/aiml/nickname_welcomeback.aiml
new file mode 100644
index 0000000..4c10348
--- /dev/null
+++ b/sopel_modules/SpiceBot_Configs/aiml/nickname_welcomeback.aiml
@@ -0,0 +1,14 @@
+
+
+
+
+ BOTNICK welcome back
+ Thanks!
+
+
+
+ welcome back BOTNICK
+ Thanks!
+
+
+