diff --git a/README.md b/README.md
index d96f1bd..65216ce 100644
--- a/README.md
+++ b/README.md
@@ -4,10 +4,10 @@ Show an owner when grub is booting up.
 It is looking like this:
 
 ```
-##########################
-# Owner:                 #
-# Alex Alexsen <a@a.tld> #
-##########################
+    ##########################
+    # Owner:                 #
+    # Alex Alexsen <a@a.tld> #
+    ##########################
 ```
 
 
diff --git a/build/etc/default/grub b/build/etc/default/grub
deleted file mode 100644
index 07ff988..0000000
--- a/build/etc/default/grub
+++ /dev/null
@@ -1,6 +0,0 @@
-
-# Name and mail address of owner
-#OWNER="John Doe <john@doe.tld>"
-
-# Amounts of seconds for how long the owner information is displayed. It is skippable via ESC. Default: 5
-#OWNER_TIMEOUT=5
diff --git a/build/etc/grub.d/000_ownership b/build/etc/grub.d/000_ownership
deleted file mode 100755
index 408e434..0000000
--- a/build/etc/grub.d/000_ownership
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-# Author: Bandie <bandie@chaospott.de>
-# Copyright: Bandie, 2019, GNU-GPLv3
-
-set -e
-
-## Get params from /etc/default/grub
-OWNER=$(cat /etc/default/grub | egrep "^OWNER=.*$" | sed "s/.*=\(.*\)/\1/;s/\"//g;s/'//g")
-OWNER_TIMEOUT=$(cat /etc/default/grub | egrep "^OWNER_TIMEOUT=.*$" | sed "s/.*=\(.*\)/\1/;s/\"//g;s/'//g")
-
-
-## Check if OWNER is set
-if [ -z "$OWNER" ]; then
-	echo "/etc/default/grub: No OWNER set." >&2
-	exit 0
-fi
-
-## Notify user about ownership
-echo "Show ==> $OWNER <== as owner" >&2
-
-
-## Generate spaces in case if the owner has a very short name
-for ((i=${#OWNER}; i<6; i++)); do
-	NSP="$NSP "
-done
-
-## Generate border around the owner message
-B="##########"
-for ((i=6; i<${#OWNER}; i++)); do
-	B="${B}#"
-	SPACE="$SPACE "
-done
-
-
-## Check if OWNER_TIMEOUT is set. If not, default 5
-if ! [[ $OWNER_TIMEOUT =~ ^[0-9]+$ ]]; then
-	OWNER_TIMEOUT=5
-	echo "/etc/default/grub: No OWNER_TIMEOUT set. Using default: 5 seconds." >&2
-fi
-
-## Write it into the grub.cfg
-cat << EOF
-echo ""
-echo "$B"
-echo "# Owner: ${SPACE}#"
-echo "# $OWNER $NSP#"
-echo "$B"
-echo ""
-echo ""
-sleep -i $OWNER_TIMEOUT
-EOF
diff --git a/etc/grub.d/000_ownership b/etc/grub.d/000_ownership
index 408e434..829d8d9 100755
--- a/etc/grub.d/000_ownership
+++ b/etc/grub.d/000_ownership
@@ -25,7 +25,7 @@ for ((i=${#OWNER}; i<6; i++)); do
 done
 
 ## Generate border around the owner message
-B="##########"
+B="    ##########"
 for ((i=6; i<${#OWNER}; i++)); do
 	B="${B}#"
 	SPACE="$SPACE "
@@ -42,8 +42,8 @@ fi
 cat << EOF
 echo ""
 echo "$B"
-echo "# Owner: ${SPACE}#"
-echo "# $OWNER $NSP#"
+echo "    # Owner: ${SPACE}#"
+echo "    # $OWNER $NSP#"
 echo "$B"
 echo ""
 echo ""