diff --git a/templates/boot/grub/grml-theme/black.png b/templates/boot/grub/grml-theme/black.png
deleted file mode 100644
index 83736f653..000000000
Binary files a/templates/boot/grub/grml-theme/black.png and /dev/null differ
diff --git a/templates/boot/grub/grml-theme/grml-logo.png b/templates/boot/grub/grml-theme/grml-logo.png
deleted file mode 100644
index 34efa2d75..000000000
Binary files a/templates/boot/grub/grml-theme/grml-logo.png and /dev/null differ
diff --git a/templates/boot/grub/grml-theme/item_c.png b/templates/boot/grub/grml-theme/item_c.png
new file mode 100644
index 000000000..d2776a509
Binary files /dev/null and b/templates/boot/grub/grml-theme/item_c.png differ
diff --git a/templates/boot/grub/grml-theme/logo.png b/templates/boot/grub/grml-theme/logo.png
new file mode 100644
index 000000000..8b1c5e5c5
Binary files /dev/null and b/templates/boot/grub/grml-theme/logo.png differ
diff --git a/templates/boot/grub/grml-theme/menu_c.png b/templates/boot/grub/grml-theme/menu_c.png
new file mode 100644
index 000000000..d2776a509
Binary files /dev/null and b/templates/boot/grub/grml-theme/menu_c.png differ
diff --git a/templates/boot/grub/grml-theme/menu_e.png b/templates/boot/grub/grml-theme/menu_e.png
new file mode 100644
index 000000000..23a3fdc03
Binary files /dev/null and b/templates/boot/grub/grml-theme/menu_e.png differ
diff --git a/templates/boot/grub/grml-theme/menu_s.png b/templates/boot/grub/grml-theme/menu_s.png
new file mode 100644
index 000000000..390bc05e4
Binary files /dev/null and b/templates/boot/grub/grml-theme/menu_s.png differ
diff --git a/templates/boot/grub/grml-theme/sb-theme.txt b/templates/boot/grub/grml-theme/sb-theme.txt
index f9d533553..b1352043a 100644
--- a/templates/boot/grub/grml-theme/sb-theme.txt
+++ b/templates/boot/grub/grml-theme/sb-theme.txt
@@ -1,45 +1,56 @@
-# This is the theme to be used in Secure Boot mode
-
 title-text: ""
-title-color: "#FFFFFF"
-desktop-image: "black.png"
-message-color:  "#FFFFFF"
+title-color: "#FFF"
+desktop-color: "#000"
 
 + image {
-  file = "grml-logo.png"
-  left = 45%
-  top = 2%
+  file = "logo.png"
+  left = 4%
+  top = 4%
+}
++ image {
+  file = "uefisec.png"
+  left = 96%-250
+  top = 4%
 }
 + boot_menu {
-  left = 15%
-  width = 70%
-  top = 16%
-  height = 36%
-  item_color = "#FFFFFF"
-  selected_item_color = "orange"
+  left = 4%+90
+  width = 92%-180
+  top = 25%
+  height = 55%
+  # TODO: set height=60%
+  item_color = #FFF
+  selected_item_color = #000
   item_spacing = 4
-  item_height = 12
-  border_color = "#FFFFFF"
+  item_padding = 10
+  item_height = 20
+  menu_pixmap_style = "menu_*.png"
+  item_pixmap_style = "item_*.png"
+  selected_item_pixmap_style = "sel_*.png"
+  item_icon_space = 0
+  icon_width = 0
+  icon_height = 0
+  scrollbar_frame = "scbf_*.png"
+  scrollbar_thumb = "scbt_*.png"
+  scrollbar_width = 2
 }
-
-
-# Show an informational message.
 + vbox {
-  top = 55%
-  left = 20%
-  + label {text = "Running in Secure Boot mode" color = "white" align = "left"}
-  + label {text = ""}
-  + label {text = "Press ENTER to boot or E to edit menu entry " color = "white"}
-  + label {text = "Press C to enter the Grub commandline" color = "white"}
+  left = 4%+100
+  width = 80%
+  top = 90%
+  + label {text = "Press ENTER to boot" color = "white" align = "left" }
+  + label {text = "Press E to edit menu entry" color = "white" align = "left" }
+  + label {text = "Press C to enter the GRUB commandline" color = "white" }
 }
-
 + progress_bar {
-   id = "__timeout__"
-   top = 75%
-   left = 20%
-   text_color = "#FFFFFF"
-   fg_color = "orange"
-   bg_color = #66B
-   border_color = #006
-   text = "@TIMEOUT_NOTIFICATION_LONG@"
+  id = "__timeout__"
+  top = 90%+26
+  left = 96%-300
+  width = 190
+  height = 16
+  text_color = #000
+  fg_color = "#F47820"
+  bg_color = #FFF
+  border_color = #000
+  #border_color = "#F47820"
+  text = "@TIMEOUT_NOTIFICATION_MIDDLE@"
 }
diff --git a/templates/boot/grub/grml-theme/scbf_c.png b/templates/boot/grub/grml-theme/scbf_c.png
new file mode 100644
index 000000000..a1afe4636
Binary files /dev/null and b/templates/boot/grub/grml-theme/scbf_c.png differ
diff --git a/templates/boot/grub/grml-theme/scbf_n.png b/templates/boot/grub/grml-theme/scbf_n.png
new file mode 100644
index 000000000..a1afe4636
Binary files /dev/null and b/templates/boot/grub/grml-theme/scbf_n.png differ
diff --git a/templates/boot/grub/grml-theme/scbf_s.png b/templates/boot/grub/grml-theme/scbf_s.png
new file mode 100644
index 000000000..a1afe4636
Binary files /dev/null and b/templates/boot/grub/grml-theme/scbf_s.png differ
diff --git a/templates/boot/grub/grml-theme/scbt_c.png b/templates/boot/grub/grml-theme/scbt_c.png
new file mode 100644
index 000000000..7d5c2b005
Binary files /dev/null and b/templates/boot/grub/grml-theme/scbt_c.png differ
diff --git a/templates/boot/grub/grml-theme/scbt_n.png b/templates/boot/grub/grml-theme/scbt_n.png
new file mode 100644
index 000000000..7d5c2b005
Binary files /dev/null and b/templates/boot/grub/grml-theme/scbt_n.png differ
diff --git a/templates/boot/grub/grml-theme/scbt_s.png b/templates/boot/grub/grml-theme/scbt_s.png
new file mode 100644
index 000000000..7d5c2b005
Binary files /dev/null and b/templates/boot/grub/grml-theme/scbt_s.png differ
diff --git a/templates/boot/grub/grml-theme/sel_c.afphoto b/templates/boot/grub/grml-theme/sel_c.afphoto
new file mode 100644
index 000000000..ad4dc465a
Binary files /dev/null and b/templates/boot/grub/grml-theme/sel_c.afphoto differ
diff --git a/templates/boot/grub/grml-theme/sel_c.png b/templates/boot/grub/grml-theme/sel_c.png
new file mode 100644
index 000000000..7d5c2b005
Binary files /dev/null and b/templates/boot/grub/grml-theme/sel_c.png differ
diff --git a/templates/boot/grub/grml-theme/theme.txt b/templates/boot/grub/grml-theme/theme.txt
index 3a7be37ae..9a7f7ac19 100644
--- a/templates/boot/grub/grml-theme/theme.txt
+++ b/templates/boot/grub/grml-theme/theme.txt
@@ -1,43 +1,56 @@
-# This is the default GRUB theme of Grml
-
 title-text: ""
-title-color: "#FFFFFF"
-desktop-image: "black.png"
-message-color:  "#FFFFFF"
+title-color: "#FFF"
+desktop-color: "#000"
 
 + image {
-  file = "grml-logo.png"
-  left = 45%
-  top = 2%
+  file = "logo.png"
+  left = 4%
+  top = 4%
+}
++ image {
+  file = "uefi.png"
+  left = 96%-250
+  top = 4%
 }
 + boot_menu {
-  left = 15%
-  width = 70%
-  top = 16%
-  height = 36%
-  item_color = "#FFFFFF"
-  selected_item_color = "orange"
+  left = 4%+90
+  width = 92%-180
+  top = 25%
+  height = 55%
+  # TODO: set height=60%
+  item_color = #FFF
+  selected_item_color = #000
   item_spacing = 4
-  item_height = 12
-  border_color = "#FFFFFF"
+  item_padding = 10
+  item_height = 20
+  menu_pixmap_style = "menu_*.png"
+  item_pixmap_style = "item_*.png"
+  selected_item_pixmap_style = "sel_*.png"
+  item_icon_space = 0
+  icon_width = 0
+  icon_height = 0
+  scrollbar_frame = "scbf_*.png"
+  scrollbar_thumb = "scbt_*.png"
+  scrollbar_width = 2
 }
-
-
-# Show an informational message.
 + vbox {
-  top = 55%
-  left = 20%
-  + label {text = "Press ENTER to boot or E to edit menu entry " color = "white" align = "left"}
-  + label {text = "Press C to enter the Grub commandline" color = "white"}
+  left = 4%+100
+  width = 80%
+  top = 90%
+  + label {text = "Press ENTER to boot" color = "white" align = "left" }
+  + label {text = "Press E to edit menu entry" color = "white" align = "left" }
+  + label {text = "Press C to enter the GRUB commandline" color = "white" }
 }
-
 + progress_bar {
-   id = "__timeout__"
-   top = 75%
-   left = 20%
-   text_color = "#FFFFFF"
-   fg_color = "orange"
-   bg_color = #66B
-   border_color = #006
-   text = "@TIMEOUT_NOTIFICATION_LONG@"
+  id = "__timeout__"
+  top = 90%+26
+  left = 96%-300
+  width = 190
+  height = 16
+  text_color = #000
+  fg_color = "#F47820"
+  bg_color = #FFF
+  border_color = #000
+  #border_color = "#F47820"
+  text = "@TIMEOUT_NOTIFICATION_MIDDLE@"
 }
diff --git a/templates/boot/grub/grml-theme/uefi.png b/templates/boot/grub/grml-theme/uefi.png
new file mode 100644
index 000000000..cddc452ff
Binary files /dev/null and b/templates/boot/grub/grml-theme/uefi.png differ
diff --git a/templates/boot/grub/grml-theme/uefisec.png b/templates/boot/grub/grml-theme/uefisec.png
new file mode 100644
index 000000000..ddb2772e9
Binary files /dev/null and b/templates/boot/grub/grml-theme/uefisec.png differ
diff --git a/templates/grub-theme-sources/README.md b/templates/grub-theme-sources/README.md
new file mode 100644
index 000000000..617b7b748
--- /dev/null
+++ b/templates/grub-theme-sources/README.md
@@ -0,0 +1,5 @@
+Grub Theme image sources
+========================
+
+Source files used to build the PNGs in templates/boot/grub/grml-theme.
+Affinity Photo 2 was used.
diff --git a/templates/grub-theme-sources/logo.afphoto b/templates/grub-theme-sources/logo.afphoto
new file mode 100644
index 000000000..1eec52927
Binary files /dev/null and b/templates/grub-theme-sources/logo.afphoto differ
diff --git a/templates/grub-theme-sources/menu_c.afphoto b/templates/grub-theme-sources/menu_c.afphoto
new file mode 100644
index 000000000..c166c4ee3
Binary files /dev/null and b/templates/grub-theme-sources/menu_c.afphoto differ
diff --git a/templates/grub-theme-sources/menu_e.afphoto b/templates/grub-theme-sources/menu_e.afphoto
new file mode 100644
index 000000000..03d2d5c92
Binary files /dev/null and b/templates/grub-theme-sources/menu_e.afphoto differ
diff --git a/templates/grub-theme-sources/menu_s.afphoto b/templates/grub-theme-sources/menu_s.afphoto
new file mode 100644
index 000000000..d750ac782
Binary files /dev/null and b/templates/grub-theme-sources/menu_s.afphoto differ
diff --git a/templates/grub-theme-sources/scbf_c_n_s.afphoto b/templates/grub-theme-sources/scbf_c_n_s.afphoto
new file mode 100644
index 000000000..226029541
Binary files /dev/null and b/templates/grub-theme-sources/scbf_c_n_s.afphoto differ
diff --git a/templates/grub-theme-sources/scbt_c_n_s.afphoto b/templates/grub-theme-sources/scbt_c_n_s.afphoto
new file mode 100644
index 000000000..328cdbe22
Binary files /dev/null and b/templates/grub-theme-sources/scbt_c_n_s.afphoto differ
diff --git a/templates/grub-theme-sources/uefi.afphoto b/templates/grub-theme-sources/uefi.afphoto
new file mode 100644
index 000000000..5bd89bc4d
Binary files /dev/null and b/templates/grub-theme-sources/uefi.afphoto differ
diff --git a/templates/grub-theme-sources/uefisec.afphoto b/templates/grub-theme-sources/uefisec.afphoto
new file mode 100644
index 000000000..5b825d508
Binary files /dev/null and b/templates/grub-theme-sources/uefisec.afphoto differ