Resolves #223, Resolves #197

lib/entity_widgets/entity_icon.dart

@@ -11,7 +11,7 @@ class EntityIcon extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final entityModel = EntityModel.of(context);
-    return GestureDetector(
+    return InkWell(
       child: Padding(
         padding: padding,
         child: MaterialDesignIcons.createIconWidgetFromEntityData(

lib/entity_widgets/entity_name.dart

@@ -13,7 +13,7 @@ class EntityName extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final entityModel = EntityModel.of(context);
-    return GestureDetector(
+    return InkWell(
       child: Padding(
         padding: padding,
         child: Text(

lib/entity_widgets/state/simple_state.dart

@@ -13,7 +13,7 @@ class SimpleEntityState extends StatelessWidget {
     final entityModel = EntityModel.of(context);
     Widget result = Padding(
         padding: padding,
-        child: GestureDetector(
+        child: InkWell(
           child: Text(
               "${entityModel.entityWrapper.entity.state}${entityModel.entityWrapper.entity.unitOfMeasurement}",
               textAlign: textAlign,