diff --git a/modules/Layout.js b/modules/Layout.js
index 4cf8752a3..2816ff3cf 100644
--- a/modules/Layout.js
+++ b/modules/Layout.js
@@ -186,8 +186,12 @@ Layout.prototype.render = function (l) {
         x+4,y+h-1,
         x,y+h-5,
         x,y+4
-      ], bg = l.selected?gfx.theme.bgH:gfx.theme.bg2;
-      gfx.setColor(bg).fillPoly(poly).setColor(l.selected ? gfx.theme.fgH : gfx.theme.fg2).drawPoly(poly);
+      ], bg = l.selected?gfx.theme.bgH:gfx.theme.bg2, 
+      btnborder = l.selected?gfx.theme.fgH:gfx.theme.fg2;
+    //add button color option
+    if(l.btnCol!==undefined) bg = l.btnCol;
+    if(l.btnBorder1!==undefined) btnborder = l.btnBorder;
+    gfx.setColor(bg).fillPoly(poly).setColor(btnborder).drawPoly(poly);   
     if (l.col!==undefined) gfx.setColor(l.col);
     if (l.src) gfx.setBgColor(bg).drawImage(
       "function"==typeof l.src?l.src():l.src,