diff --git a/src/UniversalDashboard/Themes/Azure.psd1 b/src/UniversalDashboard/Themes/Azure.psd1
index 55c5451a..4c023a23 100644
--- a/src/UniversalDashboard/Themes/Azure.psd1
+++ b/src/UniversalDashboard/Themes/Azure.psd1
@@ -1,180 +1,227 @@
 @{
     Name = "Azure"
     Definition = @{
-        UDDashboard = @{
-            BackgroundColor = "#333333"
-            FontColor = "#FFFFF"
-        }
-        UDNavBar = @{
-            BackgroundColor = "#1c1c1c"
-            FontColor = "#55b3ff"
-        }
-        UDCard = @{
-            BackgroundColor = "#252525"
-            FontColor = "#FFFFFF"
-            'border-radius'    = "12px"
-        }
-        UDChart = @{
-            BackgroundColor = "#252525"
-            FontColor = "#FFFFFF"
-            'border-radius'    = "12px"
-        }
-        UDMonitor = @{
-            BackgroundColor = "#252525"
-            FontColor = "#FFFFFF"
-            'border-radius'    = "12px"
-        }
-        UDTable = @{
-            BackgroundColor = "#252525"
-            FontColor = "#FFFFFF"
-            'border-radius'    = "12px"
-        }
-        UDGrid = @{
-            BackgroundColor = "#252525"
-            FontColor = "#FFFFFF"
-            'border-radius'    = "12px"
-        }
-        UDCounter = @{
-            BackgroundColor = "#252525"
-            FontColor = "#FFFFFF"
-            'border-radius'    = "12px"
-        }
-        UDInput = @{
-            BackgroundColor = "#252525"
-            FontColor = "#FFFFFF"
+UDDashboard = @{
+BackgroundColor = "#333333"
+FontColor = "#FFFFF"
+  }
+  UDNavBar = @{
+BackgroundColor = "#1c1c1c"
+FontColor = "#55b3ff"
+  }
+  UDCard= @{
+BackgroundColor = "#252525"
+FontColor = "#FFFFFF"
+'border-radius' = "12px"
+  }
+  UDChart  = @{
+BackgroundColor = "#252525"
+FontColor = "#FFFFFF"
+'border-radius' = "12px"
+  }
+  UDMonitor= @{
+BackgroundColor = "#252525"
+FontColor = "#FFFFFF"
+'border-radius' = "12px"
+  }
+  UDTable  = @{
+BackgroundColor = "#252525"
+FontColor = "#FFFFFF"
+'border-radius' = "12px"
+  }
+  UDGrid= @{
+BackgroundColor = "#252525"
+FontColor = "#FFFFFF"
+'border-radius' = "12px"
+  }
+  UDCounter= @{
+BackgroundColor = "#252525"
+FontColor = "#FFFFFF"
+'border-radius' = "12px"
+  }
+  UDInput  = @{
+BackgroundColor = "#252525"
+FontColor = "#FFFFFF"
 
-        }
-        UDFooter = @{
-            BackgroundColor = "#1c1c1c"
-            FontColor = "#55b3ff"
-            "margin-top" = "20px"
-        }
-        '.tabs'                                                                                                                    = @{
-            'color' = "#55b3ff"
-            'margin-top' = "64px"
-            'background-color' = "#333333"
-            'z-index' = "9998"
-        }
-        '.tabs .tab' = @{
-            'color' = "#252525"
-            }
+  }
+  UDFooter = @{
+BackgroundColor = "#1c1c1c"
+FontColor = "#55b3ff"
+"margin-top" = "4% !important"
+  }
+  '.tabs'  = @{
+'color'= "#55b3ff"
+'margin-top' = "64px"
+'background-color' = "#333333"
+'z-index' = "9998"
+  }
+  '.tabs .tab'= @{
+'color' = "#252525"
+  }
 
-            '.tabs .tab a:hover'                                                                                                            = @{
-                'background-color' = "#252525"
-                'color'            = "#55b3ff"
-            }
+  '.tabs .tab a:hover' = @{
+'background-color' = "#252525"
+'color'= "#55b3ff"
+  }
 
-            '.tabs .tab a.active'                                                                                                           = @{
-                'background-color' = "#1c1c1c"
-                'color'            = "#55b3ff"
-            }
-            '.tabs .tab a:focus.active'                                                                                                     = @{
+  '.tabs .tab a.active'= @{
+'background-color' = "#1c1c1c"
+'color'= "#55b3ff"
+  }
+  '.tabs .tab a:focus.active'= @{
 
-            'background-color' = "#252525"
-            'color' = "#55b3ff"
-            }
-            '.tabs .indicator' = @{
-            'background-color' = "#55b3ff"
-            }
-            '.tabs .tab a' = @{
-            'color' = "#FFFFFF"
-            }
+'background-color' = "#252525"
+'color'= "#55b3ff"
+  }
+  '.tabs .indicator'= @{
+'background-color' = "#55b3ff"
+  }
+  '.tabs .tab a' = @{
+'color' = "#FFFFFF"
+  }
 
-            '[type="radio"]:checked + span::after' = @{
+  '[type="radio"]:checked + span::after' = @{
 
-                'background-color' =  "#55b3ff"
+'background-color' = "#55b3ff"
 
-            }
-            '.pagination li a' = @{
-                color = "#55b3ff !important"
-            }
-            ".ud-navbar"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          = @{
-                'width'    = "100%"
-                'position' = "fixed"
-                'z-index'  = "9999"
-            }
-            'nav'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 = @{
-                'left'  = "0"
-                'right' = "0"
+  }
+  '.pagination li a'= @{
+'color' = "#fff !important"
+  }
+  ".ud-navbar"= @{
+'width' = "100%"
+'position' = "fixed"
+'z-index'  = "9999"
+  }
+  'nav' = @{
+'left'  = "0"
+'right' = "0"
 
-            }
-            'input:not([type]), input[type="date"]:not(.browser-default), input[type="datetime-local"]:not(.browser-default), input[type="datetime"]:not(.browser-default), input[type="email"]:not(.browser-default), input[type="number"]:not(.browser-default), input[type="password"]:not(.browser-default), input[type="search"]:not(.browser-default), input[type="tel"]:not(.browser-default), input[type="text"]:not(.browser-default), input[type="time"]:not(.browser-default), input[type="url"]:not(.browser-default), textarea.materialize-textarea' = @{
-                'border-bottom' = "1px solid #55b3ff"
-                'color'         = "#FFFFFF"
-            }
-            '.select-wrapper input.select-dropdown'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               = @{
-                'color'                  = "#ffffff"
-                'border-bottom'          = "1px solid #55b3ff"
-                'border-block-end-color' = "#55b3ff"
-            }
-            '.dropdown-content'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   = @{
-                'background-color' = "#333333"
-            }
-            '.btn'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                = @{
-                'color'            = "#ffffff"
-                'background-color' = "#1c1c1c"
-                'border-radius'    = "8px"
-            }
-            '.btn:hover'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          = @{
-                'color'            = "#ffffff"
-                'background-color' = "#55b3ff"
-            }
-            '.btn-floating' = @{
-                'color'            = "#ffffff"
-                'background-color' = "#1c1c1c"
-            }
-            '.select-dropdown li span'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            = @{
-                'color' = "#ffffff"
-            }
+  }
+  'input:not([type]), input[type="date"]:not(.browser-default), input[type="datetime-local"]:not(.browser-default), input[type="datetime"]:not(.browser-default), input[type="email"]:not(.browser-default), input[type="number"]:not(.browser-default), input[type="password"]:not(.browser-default), input[type="search"]:not(.browser-default), input[type="tel"]:not(.browser-default), input[type="text"]:not(.browser-default), input[type="time"]:not(.browser-default), input[type="url"]:not(.browser-default), textarea.materialize-textarea' = @{
+'border-bottom' = "1px solid #55b3ff"
+'color'= "#FFFFFF"
+  }
+  '.select-wrapper input.select-dropdown'= @{
+'color'= "#ffffff"
+'border-bottom' = "1px solid #55b3ff"
+'border-block-end-color' = "#55b3ff"
+  }
+  '.dropdown-content'  = @{
+'background-color' = "#333333"
+  }
+  '.btn'= @{
+'color'= "#1c1c1c"
+'background-color' = "#bababa"
+'border-radius' = "8px"
+  }
+  '.btn:hover'= @{
+'color'= "#ffffff"
+'background-color' = "#55b3ff"
+  }
+  '.btn-floating'= @{
+'color'= "#1c1c1c"
+'background-color' = "#bababa"
+  }
+  '.select-dropdown li span' = @{
+'color' = "#ffffff"
+  }
 
-            '.sidenav'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                            = @{
-                'background-color' = "#1c1c1c"
-                'margin-top'       = "75px"
-                'height'           = "77%"
-                'border-radius'    = "8px"
-                'box-shadow'       = "none"
-                'z-index'          = "0"
-                'color' = "#fff"
-            }
+  '.sidenav'  = @{
+'background-color' = "#1c1c1c"
+'margin-top' = "75px"
+'height'  = "77%"
+'border-radius' = "8px"
+'box-shadow' = "none"
+'z-index' = "0"
+'color'= "#fff"
+  }
 
-            '.sidenav a:hover'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    = @{
-                'background-color' = "#1e353f"
-                'color'            = "#e16036"
-            }
-            '.sidenav li > a'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     = @{
-                'color'     = "#f1f1f1"
-                'font-size' = "18px"
-            }
-            'li'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  = @{
-                'color' = "#55b3ff"
-            }
-            '.collapsible-header'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 = @{
-                'background-color' = "#252525"
-                'border-bottom'    = "1px solid #55b3ff"
-            }
-            '.collapsible' = @{
-                "border-top" = "1px solid #55b3ff"
-                "border-right" = "1px solid #55b3ff"
-                "border-left" = "1px solid #55b3ff"
-                'margin' = ".5rem 0 1rem"
-            }
-            'h' = @{
-                "color" = "#fff !important"
-            }
-            '.collapsible-body' = @{
-                "background-color" = "#252525"
-                "border-bottom" = "1px solid #fff"
-            }
-            '[type="checkbox"]:checked + span:not(.lever)::before' = @{
-                "border-right" = "2px solid #55b3ff"
-                "border-bottom" = "2px solid #55b3ff"
-            }
-            '.collection .collection-item' = @{
-                'background-color' = "#252525"
-            }
-            'img'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 = @{
-                'border-radius' = "8px"
-                'float' ="left"
-            }
-    }
+  '.sidenav a:hover'= @{
+'background-color' = "#1e353f"
+'color'= "#55b3ff"
+  }
+  '.sidenav li > a' = @{
+'color'  = "#f1f1f1"
+'font-size' = "18px"
+  }
+  'li'  = @{
+'color' = "#55b3ff"
+  }
+  '.collapsible-header'= @{
+'background-color' = "#252525"
+'border-bottom' = "1px solid #55b3ff"
+  }
+  '.collapsible' = @{
+"border-top"= "1px solid #55b3ff"
+"border-right" = "1px solid #55b3ff"
+"border-left"  = "1px solid #55b3ff"
+'margin' = ".5rem 0 1rem"
+  }
+  'h'= @{
+"color" = "#fff !important"
+  }
+  'h3, h4' = @{
+    'line-height' = "110%"
+    'color' = "#fff"
+}
+  '.collapsible-body'  = @{
+"background-color" = "#252525"
+"border-bottom" = "1px solid #55b3ff"
+  }
+  '[type="checkbox"]:checked + span:not(.lever)::before'= @{
+"border-right"  = "2px solid #55b3ff"
+"border-bottom" = "2px solid #55b3ff"
+  }
+  '.collection .collection-item'= @{
+'background-color' = "#252525"
+  }
+  'img' = @{
+'border-radius' = "8px"
+'float'= "left"
+  }
+  '.pagination li.active' = @{
+'background-color' = "#55b3ff"
+  }
+  '.divider'  = @{
+'height'  = "1px"
+'overflow'= "hidden"
+'background-color' = "#55b3ff"
+  }
+  '.sidenav .collapsible-header'= @{
+'color'= "#fff !important"
+'background-color' = "#1c1c1c !important"
+'font-size'  = "18px"
+  }
+  'ul:not(.browser-default)' = @{
+'padding-left'  = "0"
+'list-style-type'  = "none"
+'background-color' = "#1c1c1c"
+  }
+  '.card .card-action a:not(.btn):not(.btn-large):not(.btn-small):not(.btn-large):not(.btn-floating)'= @{
+'color'  = "#55b3ff"
+'margin-right' = "24px"
+'-webkit-transition' = "color .3s ease"
+'transition'= "color .3s ease"
+'text-transform'  = "uppercase"
+  }
+  '.btn-flat' = @{
+    'color' = "#fff"
+  }
+  '.sidenav .subheader' = @{
+    'color' = "#fff"
+    'font-size' = "18px"
+  }
+  '.svg-inline--fa' = @{
+    'color' = "#fff"
+}
+'.modal'                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              = @{
+  'z-index' = "9999 !important"
+  'max-width' = "90% !important"
+  'max-height' = "90% !important"
+  'width' = "90% !important"
+  'color' = "#000"
+  'background-color' = "#a3a3a3"
+}
+}
 }
\ No newline at end of file