diff --git a/lib/entities/default_entity_container.widget.dart b/lib/entities/default_entity_container.widget.dart
index dd5de7b..3e5c8df 100644
--- a/lib/entities/default_entity_container.widget.dart
+++ b/lib/entities/default_entity_container.widget.dart
@@ -36,7 +36,6 @@ class DefaultEntityContainer extends StatelessWidget {
       mainAxisSize: MainAxisSize.max,
       children: <Widget>[
         EntityIcon(),
-
         Flexible(
           fit: FlexFit.tight,
           flex: 3,
diff --git a/lib/entities/simple_state.widget.dart b/lib/entities/simple_state.widget.dart
index d480b37..a2b24ca 100644
--- a/lib/entities/simple_state.widget.dart
+++ b/lib/entities/simple_state.widget.dart
@@ -27,7 +27,7 @@ class SimpleEntityState extends StatelessWidget {
       tStyle = textStyle;
     } else if (entityModel.entityWrapper.entity.statelessType == StatelessEntityType.callService) {
       tStyle = Theme.of(context).textTheme.subhead.copyWith(
-        color: Colors.blue
+        color: HAClientTheme().getLinkTextStyle(context).color
       );
     } else {
       tStyle = Theme.of(context).textTheme.body1;