--- a/common/core/src/main/java/com/redhat/thermostat/gateway/common/core/servlet/BasicResourceHandler.java	Fri Sep 22 10:09:13 2017 -0400
+++ b/common/core/src/main/java/com/redhat/thermostat/gateway/common/core/servlet/BasicResourceHandler.java	Mon Sep 25 16:40:59 2017 +0200
@@ -42,6 +42,7 @@
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 /**
@@ -51,9 +52,13 @@
 public class BasicResourceHandler {
 
     protected Response getFileAsResponse(ClassLoader loader, String fileName) throws IOException {
+        return getFileAsResponse(loader, fileName, MediaType.TEXT_PLAIN_TYPE);
+    }
+
+    protected Response getFileAsResponse(ClassLoader loader, String fileName, MediaType type) throws IOException {
         try (InputStream stream = loader.getResourceAsStream(fileName);) {
             String responseContent = read(stream);
-            return Response.ok(responseContent).build();
+            return Response.ok(responseContent, type).build();
         }
     }
 

--- a/services/commands/src/main/java/com/redhat/thermostat/gateway/service/commands/http/handlers/StaticResourcesHandler.java	Fri Sep 22 10:09:13 2017 -0400
+++ b/services/commands/src/main/java/com/redhat/thermostat/gateway/service/commands/http/handlers/StaticResourcesHandler.java	Mon Sep 25 16:40:59 2017 +0200
@@ -48,11 +48,15 @@
 import com.redhat.thermostat.gateway.common.core.servlet.BasicResourceHandler;
 
 @Path("{fileName: .+(\\.(yaml|html))}")
-@Produces(MediaType.TEXT_PLAIN)
+@Produces({MediaType.TEXT_PLAIN, MediaType.TEXT_HTML})
 public class StaticResourcesHandler extends BasicResourceHandler {
 
     @GET
-    public Response getFileAsPlainText(@PathParam("fileName") String fileName) throws IOException {
-        return getFileAsResponse(StaticResourcesHandler.class.getClassLoader(), fileName);
+    public Response getFileAsTextOrHtml(@PathParam("fileName") String fileName) throws IOException {
+        MediaType type = MediaType.TEXT_PLAIN_TYPE;
+        if (fileName.endsWith(".html")) {
+            type = MediaType.TEXT_HTML_TYPE;
+        }
+        return getFileAsResponse(StaticResourcesHandler.class.getClassLoader(), fileName, type);
     }
 }