diff --git a/lib/entities/default_entity_container.widget.dart b/lib/entities/default_entity_container.widget.dart
index 753cf78..51d6bd6 100644
--- a/lib/entities/default_entity_container.widget.dart
+++ b/lib/entities/default_entity_container.widget.dart
@@ -25,9 +25,9 @@ class DefaultEntityContainer extends StatelessWidget {
           Divider(),
           Text(
               "${entityModel.entityWrapper.entity.displayName}",
-            style: Theme.of(context).textTheme.body1.copyWith(
-              color: Theme.of(context).primaryColor
-            ),
+            style: HAClientTheme().getLinkTextStyle(context).copyWith(
+              decoration: TextDecoration.none
+            )
           )
         ],
       );
diff --git a/lib/managers/theme_manager.dart b/lib/managers/theme_manager.dart
index a762a26..2538e0d 100644
--- a/lib/managers/theme_manager.dart
+++ b/lib/managers/theme_manager.dart
@@ -2,6 +2,10 @@ part of '../main.dart';
 
 class HAClientTheme {
 
+  static const DEFAULT = 0;
+  static const DARK = 1;
+  static const HOMEASSISTANT = 2;
+
   static const TextTheme textTheme = TextTheme(
     display1: TextStyle(fontSize: 34, fontWeight: FontWeight.normal),
     display2: TextStyle(fontSize: 34, fontWeight: FontWeight.normal),