1 files changed, 6 insertions, 5 deletions
diff --git a/src/text.cpp b/src/text.cpp
index 27d794d33..542dc60d9 100644
--- a/src/text.cpp
+++ b/src/text.cpp
@@ -32,6 +32,8 @@
 
 #include "resources/image.h"
 
+#include "utils/delete2.h"
+
 #include "debug.h"
 
 int Text::mInstances = 0;
@@ -49,15 +51,15 @@ Text::Text(const std::string &text, const int x, const int y,
     mXOffset(0),
     mText(text),
     mColor(color),
-    mOutlineColor(Theme::getThemeColor(Theme::OUTLINE)),
+    mOutlineColor(theme->getColor(Theme::OUTLINE, 255)),
     mIsSpeech(isSpeech)
 {
     if (!textManager)
     {
         textManager = new TextManager;
-        if (Theme::instance())
+        if (theme)
         {
-            Theme::instance()->loadRect(mBubble, "bubble.xml", "");
+            theme->loadRect(mBubble, "bubble.xml", "");
         }
         else
         {
@@ -99,8 +101,7 @@ Text::~Text()
         textManager->removeText(this);
     if (--mInstances == 0)
     {
-        delete textManager;
-        textManager = nullptr;
+        delete2(textManager);
         for (int f = 0; f < 9; f ++)
         {
             if (mBubble.grid[f])