diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index c674098..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,15 +0,0 @@
-# ---> Linux
-*~
-
-# temporary files which can be created if a process still has a handle open of a deleted file
-.fuse_hidden*
-
-# KDE directory preferences
-.directory
-
-# Linux trash folder which might appear on any partition or disk
-.Trash-*
-
-# .nfs files are created when an open file is removed but is still being accessed
-.nfs*
-
diff --git a/README.md b/README.md
index f319ab9..ba075a7 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 # RPS-Client
 
 ```bash
-wget -qO- --header 'Authorization:token 9031f8d227dd83ba601680bf3a9f6c2d26c1a970' https://gitea.int.eertmoed.net/WiS/RPS-Client/archive/latest.tar.gz | tar xvz ; bash ./rps-client/install.sh ;
+wget -qO- --header 'Authorization:token 9031f8d227dd83ba601680bf3a9f6c2d26c1a970' https://gitea.int.eertmoed.net/WiS/RPS-Client/archive/latest.tar.gz | tar xvz ; bash /root/rps-client/install.sh ;
 ```
 
 ```ruby
diff --git a/etc/systemd/system/chromium-monitor.service b/etc/systemd/system/chromium-monitor.service
index 280dfb6..8faa16e 100644
--- a/etc/systemd/system/chromium-monitor.service
+++ b/etc/systemd/system/chromium-monitor.service
@@ -1,12 +1,11 @@
 [Unit]
 Description=A Service to monitor the Kiosk's current site
-After=network.target getty@tty1.service
+After=network.target
 
 [Service]
-ExecStartPre=-/bin/sleep 120
 Type=simple
-ExecStart=/usr/bin/chromium-monitor
-Restart=on-failure
+User=loginuser
+ExecStart=/usr/bin/custom/chromium-monitor
 
 [Install]
 WantedBy=multi-user.target
diff --git a/etc/systemd/system/hostname.service b/etc/systemd/system/hostname.service
new file mode 100644
index 0000000..c3eeabe
--- /dev/null
+++ b/etc/systemd/system/hostname.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=Set Hostname from DHCP
+After=network.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/custom/hostname
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/etc/systemd/system/watchdog.service b/etc/systemd/system/watchdog-monitor.service
similarity index 63%
rename from etc/systemd/system/watchdog.service
rename to etc/systemd/system/watchdog-monitor.service
index 79cee81..4f95c51 100644
--- a/etc/systemd/system/watchdog.service
+++ b/etc/systemd/system/watchdog-monitor.service
@@ -1,15 +1,13 @@
 [Unit]
 Description=Watchdog Monitor Service
-After=network.target getty@tty1.service
+After=network.target
 
 [Service]
-ExecStartPre=-/bin/sleep 120
 Type=simple
-ExecStart=/usr/bin/watchdog
-Restart=on-failure
+ExecStart=/usr/bin/custom/watchdog-monitor
 
 [Install]
 WantedBy=multi-user.target
 
-#  Version 1.0:
+#  Version 1.1:
 #  Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.
\ No newline at end of file
diff --git a/home/loginuser/.xinitrc b/home/loginuser/.xinitrc
index 19206a5..56f7edd 100644
--- a/home/loginuser/.xinitrc
+++ b/home/loginuser/.xinitrc
@@ -14,7 +14,8 @@ then
     xset s noblank
     xset s off
 else
-    xset s $SCREEN
+    xset +dpms
+    xset dmps 0 0 $SCREEN
 fi
 
 #NO-Var fallback site
@@ -23,7 +24,11 @@ then
 	WBS=https://www.wis.gmbh/
 fi
 
-#Start Chromium
+sudo systemctl stop watchdog-monitor
+sudo systemctl stop chromium-monitor
+sudo systemctl start watchdog-monitor
+sudo systemctl start chromium-monitor
+
 chromium-browser $WBS \
   --window-size=$RES \
   --window-position=0,0 \
diff --git a/install.sh b/install.sh
index 5beeb11..12aebbe 100644
--- a/install.sh
+++ b/install.sh
@@ -11,69 +11,164 @@ print_status() {
     echo -e "${GREEN}✔${NC} ${1} completed."
 }
 
-echo -e "${RED}→${NC} Starting System Update..."
-sudo apt update >>/var/log/install 2>&1 && print_status "System Update"
-sudo apt upgrade -y >>/var/log/install 2>&1 && print_status "System Upgrade"
-sudo apt dist-upgrade -y >>/var/log/install 2>&1 && print_status "System Dist-Upgrade"
+echo -e "${RED}→${NC} Starting System Update..." | tee -a /var/log/install
+sudo apt-get update >>/var/log/install 2>&1 && print_status "System Update"
+sudo apt-get upgrade -y >>/var/log/install 2>&1 && print_status "System Upgrade"
+#sudo apt-get dist-upgrade -y >>/var/log/install 2>&1 && print_status "System Dist-Upgrade"
+
+echo -e "${RED}→${NC} Installing required packages..." | tee -a /var/log/install
+sudo apt install --no-install-recommends xserver-xorg x11-xserver-utils xinit chromium-browser fonts-noto-color-emoji nfs-common watchdog xdotool rsync -y >>/var/log/install 2>&1 && print_status "Required packages installed"
+#sudo apt install realvnc-vnc-server overlayroot -y >>/var/log/install 2>&1 && print_status "VNC and Overlayroot installed"
 sudo apt autoremove -y >>/var/log/install 2>&1 && print_status "Autoremove"
 sudo apt clean >>/var/log/install 2>&1 && print_status "Clean"
+rm -rf /var/lib/apt/lists/* >>/var/log/install 2>&1 && print_status "Clear cache"
 
-echo -e "${RED}→${NC} Installing required packages..."
-sudo apt install --no-install-recommends xserver-xorg x11-xserver-utils xinit chromium-browser fonts-noto-color-emoji nfs-common watchdog xdotool rsync -y >>/var/log/install 2>&1 && print_status "Required packages installed"
-sudo apt install realvnc-vnc-server overlayroot -y >>/var/log/install 2>&1 && print_status "VNC and Overlayroot installed"
+echo -e "${RED}→${NC} Configuring Raspberry Pi settings..." | tee -a /var/log/install
+#sudo raspi-config nonint do_camera 0 >> /var/log/install 2>&1 && print_status "Camera disabled"
+#sudo raspi-config nonint do_vnc 0 >> /var/log/install 2>&1 && print_status "VNC enabled"
+#sudo raspi-config nonint do_spi 0 >> /var/log/install 2>&1 && print_status "SPI disabled"
+#sudo raspi-config nonint do_i2c 0 >> /var/log/install 2>&1 && print_status "I2C disabled"
+#sudo raspi-config nonint do_serial 0 0 >> /var/log/install 2>&1 && print_status "Serial port disabled"
+#sudo raspi-config nonint do_onewire 0 >> /var/log/install 2>&1 && print_status "1-Wire disabled"
+#sudo raspi-config nonint do_remote_gpio 0 >> /var/log/install 2>&1 && print_status "Remote GPIO disabled"
+#sudo raspi-config nonint do_gpu_memory 256 >> /var/log/install 2>&1 && print_status "GPU memory set to 256MB"
+#sudo raspi-config nonint do_locale "de_DE.UTF-8" "de_DE.UTF-8" >> /var/log/install 2>&1 && print_status "Locale set to de_DE.UTF-8"
+#sudo raspi-config nonint do_timezone "Europe/Berlin" >> /var/log/install 2>&1 && print_status "Timezone set to Europe/Berlin"
+sudo raspi-config nonint do_boot_order 3 >> /var/log/install 2>&1 && print_status "Boot order set to network boot"
 
-echo -e "${RED}→${NC} Creating user 'loginuser'..."
+echo -e "${RED}→${NC} Creating user 'loginuser'..." | tee -a /var/log/install
 sudo adduser --disabled-password --gecos "" loginuser >>/var/log/install 2>&1 && print_status "User 'loginuser' created"
 
-echo -e "${RED}→${NC} Setting permissions for 'loginuser'..."
+echo -e "${RED}→${NC} Copy requiered files..." | tee -a /var/log/install
+mkdir -p /etc/chromium/policies/managed /home/wis/.ssh /usr/bin/custom
+declare -A files=(
+    ["/root/rps-client/boot/ro-root.sh"]="/boot/ro-root.sh"
+    ["/root/rps-client/boot/firmware/ro-root.sh"]="/boot/firmware/ro-root.sh"
+    ["/root/rps-client/etc/dhcp/dhclient.conf"]="/etc/dhcp/dhclient.conf"
+    ["/root/rps-client/etc/systemd/system/hostname.service"]="/etc/systemd/system/hostname.service"
+    ["/root/rps-client/etc/systemd/system/watchdog-monitor.service"]="/etc/systemd/system/watchdog-monitor.service"
+    ["/root/rps-client/etc/systemd/system/chromium-monitor.service"]="/etc/systemd/system/chromium-monitor.service"
+    ["/root/rps-client/etc/systemd/system/getty@tty1.service.d/override.conf"]="/etc/systemd/system/getty@tty1.service.d/override.conf"
+    ["/root/rps-client/etc/chromium/policies/managed/disable_password_saving.json"]="/etc/chromium/policies/managed/disable_password_saving.json"
+    ["/root/rps-client/home/loginuser/.bash_profile"]="/home/loginuser/.bash_profile"
+    ["/root/rps-client/home/loginuser/.xinitrc"]="/home/loginuser/.xinitrc"
+    ["/root/rps-client/home/wis/.ssh/id_rsa.pub"]="/home/wis/.ssh/id_rsa.pub"
+    ["/root/rps-client/root/remove_unused_kernel.sh"]="/root/remove_unused_kernel.sh"
+    ["/root/rps-client/usr/bin/custom/hostname"]="/usr/bin/custom/hostname"
+    ["/root/rps-client/usr/bin/custom/chromium-monitor"]="/usr/bin/custom/chromium-monitor"
+    ["/root/rps-client/usr/bin/custom/watchdog-monitor"]="/usr/bin/custom/watchdog-monitor"
+)
+RSYNC_OPTS="-a --numeric-ids --info=progress2 --no-owner --no-group"
+for src in "${!files[@]}"; do
+    dst="${files[$src]}"
+    echo "Copying $src to $dst..."
+    sudo rsync $RSYNC_OPTS "$src" "$dst" >>/var/log/install 2>&1 && print_status "$src copied to $dst"
+done
+print_status "All files have been successfully copied"
+
+echo -e "${RED}→${NC} Configuring VNC..." | tee -a /var/log/install
+sudo systemctl enable vncserver-x11-serviced.service >>/var/log/install 2>&1 && print_status "VNC service enabled"
+sudo systemctl start vncserver-x11-serviced.service >>/var/log/install 2>&1 && print_status "VNC service started"
+CONFIG_FILE="/root/.vnc/config.d/vncserver-x11"
+if [ ! -d "$(dirname "$CONFIG_FILE")" ]; then
+    mkdir -p "$(dirname "$CONFIG_FILE")"
+    echo -e "${GREEN}✔${NC} Created directory for VNC config." | tee -a /var/log/install
+fi
+read -p "Do you want to set a VNC password? (y/n): " -r
+if [[ $REPLY =~ ^[Yy](e[Ss]?)?$ ]]; then
+    vncpasswd
+    echo -e "${GREEN}✔${NC} VNC password has been set." | tee -a /var/log/install
+else
+    echo -e "${GREEN}✔${NC} No VNC password will be set." | tee -a /var/log/install
+fi
+if [ "$(vncpasswd -o)" = 'none' ]; then
+    echo "Authentication=none" >> "$CONFIG_FILE"
+    echo "Geometry=1920x1080" >> "$CONFIG_FILE"
+    echo "#  Version 1.0:" >> "$CONFIG_FILE"
+    echo "#  Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspbian as custom PXE init script." >> "$CONFIG_FILE"
+    print_status "VNC config set to no authentication with geometry 1920x1080." >> /var/log/install 2>&1
+else
+    echo "Authentication=none" >> "$CONFIG_FILE"
+    echo "Geometry=1920x1080" >> "$CONFIG_FILE"
+    echo "#  Version 1.0:" >> "$CONFIG_FILE"
+    echo "#  Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspbian as custom PXE init script." >> "$CONFIG_FILE"
+    print_status "VNC password is set. Authentication will be required." >> /var/log/install 2>&1
+fi
+sudo raspi-config nonint do_vnc 0 >>/var/log/install 2>&1 && print_status "VNC enabled in raspi-config"
+sudo systemctl unmask vncserver-x11-serviced.service >>/var/log/install 2>&1 && print_status "VNC unmask"
+sudo systemctl enable vncserver-x11-serviced.service >>/var/log/install 2>&1 && print_status "VNC enabled systemctl"
+
+echo -e "${RED}→${NC} Setting permissions for 'loginuser'..." | tee -a /var/log/install
 sudo tee /etc/sudoers.d/loginuser >/dev/null << 'EOF'
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl restart watchdog, /usr/bin/systemctl restart chromium-monitor
-loginuser ALL=(ALL) NOPASSWD: /usr/bin/echo, /usr/bin/cp, /usr/bin/sed
-loginuser ALL=(ALL) NOPASSWD: /usr/sbin/reboot, /usr/sbin/dhclient eth0, /usr/bin/fbset
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl stop chromium-monitor, /usr/bin/systemctl start chromium-monitor
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/systemctl stop watchdog-monitor, /usr/bin/systemctl start watchdog-monitor
 loginuser ALL=(ALL) NOPASSWD: /usr/bin/cat /var/lib/dhcp/*
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/cp /etc/watchdog.conf /etc/watchdog.conf.bak
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/tee /etc/watchdog.conf, /usr/bin/tee -a /etc/watchdog.conf
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/sed -i
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/sed -r 's/[x]+/,/g'
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/fbset -s
+loginuser ALL=(ALL) NOPASSWD: /usr/bin/hostnamectl set-hostname
+loginuser ALL=(ALL) NOPASSWD: /usr/sbin/dhclient eth0
+loginuser ALL=(ALL) NOPASSWD: /usr/sbin/reboot
 EOF
 sudo usermod -aG video loginuser >>/var/log/install 2>&1 && print_status "Permissions for 'loginuser' set"
 
-echo -e "${RED}→${NC} Disabling root login..."
+echo -e "${RED}→${NC} Disabling root login..." | tee -a /var/log/install
 sudo tee /etc/ssh/sshd_config >/dev/null << 'EOF'
 PermitRootLogin no
 EOF
 sudo passwd -l root >>/var/log/install 2>&1 && print_status "Root login disabled"
 
-echo -e "${RED}→${NC} Copying required files..."
-sudo rsync -a --numeric-ids --info=progress2 --no-owner --no-group \
-    ./rps-client/boot/ro-root.sh /boot/ro-root.sh \
-    ./rps-client/boot/firmware/ro-root.sh /boot/firmware/ro-root.sh \
-    ./rps-client/etc/dhcp/dhclient.conf /etc/dhcp/dhclient.conf \
-    ./rps-client/etc/systemd/system/watchdog.service /etc/systemd/system/watchdog.service \
-    ./rps-client/etc/systemd/system/chromium-monitor.service /etc/systemd/system/chromium-monitor.service \
-    ./rps-client/etc/systemd/system/getty@tty1.service.d/override.conf /etc/systemd/system/getty@tty1.service.d/override.conf \
-    ./rps-client/etc/chromium/policies/managed/disable_password_saving.json /etc/chromium/policies/managed/disable_password_saving.json \
-    ./rps-client/home/loginuser/.bash_profile /home/loginuser/.bash_profile \
-    ./rps-client/home/loginuser/.xinitrc /home/loginuser/.xinitrc \
-    ./rps-client/home/wis/.ssh/id_rsa.pub /home/wis/.ssh/id_rsa.pub \
-    ./rps-client/root/remove_unused_kernel.sh /root/remove_unused_kernel.sh \
-    ./rps-client/root/.vnc/config.d/vncserver-x11 /root/.vnc/config.d/vncserver-x11 \
-    ./rps-client/usr/bin/chromium-monitor /usr/bin/chromium-monitor \
-    ./rps-client/usr/bin/watchdog /usr/bin/watchdog >>/var/log/install 2>&1 && print_status "Required files copied"
+echo -e "${RED}→${NC} Setting file permissions..." | tee -a /var/log/install
+sudo chown loginuser:loginuser -R /home/loginuser >>/var/log/install 2>&1 && print_status "File permissions for 'loginuser' set"
+sudo chown wis:wis -R /home/wis >>/var/log/install 2>&1 && print_status "File permissions for 'wis' set"
 
-echo -e "${RED}→${NC} Setting file permissions..."
-sudo chown loginuser:loginuser -R /home/loginuser >>/var/log/install 2>&1 && print_status "File permissions set"
+echo -e "${RED}→${NC} Creating log files..." | tee -a /var/log/install
+sudo touch /var/log/watchdog.log /var/log/chromium-monitor.log /var/log/hostname.log >>/var/log/install 2>&1 && print_status "Log files created"
+sudo chown loginuser:loginuser /var/log/watchdog.log /var/log/chromium-monitor.log /var/log/hostname.log >>/var/log/install 2>&1 && print_status "Ownership set for log files"
+sudo chmod 777 /var/log/watchdog.log /var/log/chromium-monitor.log /var/log/hostname.log >>/var/log/install 2>&1 && print_status "Permissions set for log files"
+sudo chmod +x /usr/bin/custom/* >>/var/log/install 2>&1 && print_status "Permissions set for script files"
 
-echo -e "${RED}→${NC} Enabling services..."
+echo -e "${RED}→${NC} Enabling services..." | tee -a /var/log/install
 sudo systemctl daemon-reload >>/var/log/install 2>&1 && print_status "Daemon reloaded"
-sudo systemctl enable watchdog chromium-monitor vncserver-x11-serviced.service >>/var/log/install 2>&1 && print_status "Services enabled"
+sudo systemctl enable hostname watchdog chromium-monitor vncserver-x11-serviced.service getty@tty1 >>/var/log/install 2>&1 && print_status "Services enabled"
 sudo systemctl restart getty@tty1 >>/var/log/install 2>&1 && print_status "getty service restarted"
 
-echo -e "${RED}→${NC} Cleaning up old kernels..."
-sudo bash /root/remove_unused_kernel.sh -u -e >>/var/log/install 2>&1 && print_status "Old kernels cleaned up"
+echo -e "${RED}→${NC} Do you want to clean up unused kernels? (y/n):" | tee -a /var/log/install
+read -r clean_kernels
+if [[ "$clean_kernels" =~ ^[Yy](e[Ss]?)?$ ]]; then
+    echo -e "${RED}→${NC} Cleaning up unused kernels..." | tee -a /var/log/install
+    yes yes | head -n 2 | sudo bash /root/remove_unused_kernel.sh -u -e >>/var/log/install 2>&1 && print_status "Unused kernels cleaned up"
+else
+    echo -e "${RED}→${NC} Skipping unused kernel cleanup..." | tee -a /var/log/install
+    echo -e "${GREEN}✔${NC} Cleanup has been skipped" | tee -a /var/log/install
+fi
 
-echo -e "${RED}→${NC} Cleaning up installer..."
+echo "performance" | sudo tee /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor
+sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target
+
+echo -e "${RED}→${NC} Cleaning up installer..." | tee -a /var/log/install
 sudo rm -rf ./rps-client >>/var/log/install 2>&1 && print_status "Installer cleaned up"
 
-echo -e "${GREEN}✔${NC} Installation complete. Press any key to reboot..."
+#echo -e "${RED}→${NC} Configuring Overlayroot..." | tee -a /var/log/install
+#CONFIG_FILE="/etc/overlayroot.conf"
+#echo 'overlayroot_cfgdisk="disabled"' | sudo tee "$CONFIG_FILE" >/dev/null
+#echo 'overlayroot=""' | sudo tee -a "$CONFIG_FILE" >/dev/null
+#read -p "Do you want to activate overlayfs? (y/n): " -r
+#if [[ $REPLY =~ ^[Yy](e[Ss]?)?$ ]]; then
+#    echo 'overlayroot="tmpfs:overlayfs"' | sudo tee -a "$CONFIG_FILE"
+#    sudo raspi-config nonint do_overlayroot 0 >>/var/log/install 2>&1 && print_status "Overlayroot enabled in raspi-config"
+#    echo -e "${GREEN}✔${NC} Overlayroot has been activated." | tee -a /var/log/install
+#else
+#    echo 'overlayroot=""' | sudo tee -a "$CONFIG_FILE"
+#    echo -e "${GREEN}✔${NC} Overlayroot has not been activated." | tee -a /var/log/install
+#fi
+
+echo -e "${GREEN}✔${NC} Installation complete. Press any key to reboot..." | tee -a /var/log/install 2>&1
 read -n 1 -s
+
 sudo reboot
 
-# Version 1.1:
-# Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.
+# Version 1.2:
+# Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.
\ No newline at end of file
diff --git a/root/.ssh/id_rsa.pub b/root/.ssh/id_rsa.pub
new file mode 100644
index 0000000..ddaa81d
--- /dev/null
+++ b/root/.ssh/id_rsa.pub
@@ -0,0 +1 @@
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCYDmONGe644a3bWKAyX1W704B8fCwlj4x/QjwyJX6gKpX2hmtrxZtusK729wTxP0lr1Gzll9A8LAEGqW5/sxxJqwtYDMOEfINsgE8fmvg9XSmJ9t5zOxJAuQfJB/dmE2a2mX3VSH740czvJ6NKlf9BUeu+41ZZUilyHngfgpVxEIED/6ZHRrkMUfaY09IfvwmNiYPTtK4cufLBdeEoNJPQvYdY1i+N+cJstUzlDRs179w8CqLPuPhIb0iQ3WO1S1XXQH4vUm4MaMmK+hDR4J/pfhuI3DXulwE04rZFU2izXQwl5VdYLv8w31gcegyRz68p+LprusY4QiDP62yaUCTE6JdrjjQSxbEag+OqCzozfvoO+SxMdWsxg2eViM4sKTODc0cQBSA4HJcDWeag5LU9k4WGeuVVj8BCCBqh+93IqylqyK7AKMztVZNiftSBEbfK8ZoHawg5PM26LtCTz6YcmGhn/dHpcpyC8606+SHSTl5YinDaRjarCBM4nppD3o5pizVFKutI28Ys3wkVAe96njnJqIi/J5tNQgrbJmteCE3/9SWhpsXjnuZX1RaZYLE3bBg8Gisz/sm7rN3acVXe6QD03PIxwn9Xp8r3avzDkQKo4vqxoYK6JF6j3vs+U4WLElq+NtvuMewfAWF2cgL2quognLWUM5s0p1/zLzxa8w==
\ No newline at end of file
diff --git a/root/.vnc/config.d/vncserver-x11 b/root/.vnc/config.d/vncserver-x11
deleted file mode 100644
index ce1b4a3..0000000
--- a/root/.vnc/config.d/vncserver-x11
+++ /dev/null
@@ -1,4 +0,0 @@
-Authentication=None
-
-#  Version 1.0:
-#  Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.
\ No newline at end of file
diff --git a/usr/bin/chromium-monitor b/usr/bin/chromium-monitor
deleted file mode 100644
index edae130..0000000
--- a/usr/bin/chromium-monitor
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash 
-get_monitor() {
-    sudo cat /var/lib/dhcp/* | grep -a "option monitor" | tail -1 | \
-    awk '{ s = ""; for (i = 3; i <= NF; i++) s = s $i " "; print s}' | \
-    awk -F '"' '{print $2}'
-}
-get_current_window() {
-    DISPLAY=:0 xdotool getwindowfocus getwindowname | awk -F '- Chromium' '{print $1}'
-}
-monitor=""
-while [ -z "$monitor" ]; do
-    monitor=$(get_monitor)
-    if [ -z "$monitor" ]; then
-        sleep 5
-    fi
-done
-monitor_md5=$(echo -n ${monitor^^} | sed -e 's/^[[:space:]]*//' | md5sum | awk '{print $1}')
-while true; do
-    new_monitor=$(get_monitor)
-    new_current=$(get_current_window)
-    if [ -n "$new_monitor" ] && [ -n "$new_current" ]; then
-        new_monitor_md5=$(echo -n ${new_monitor^^} | sed -e 's/^[[:space:]]*//' | md5sum | awk '{print $1}')
-        current_md5=$(echo -n ${new_current^^} | sed -e 's/^[[:space:]]*//' | md5sum | awk '{print $1}')
-        if [ "$new_monitor_md5" != "$monitor_md5" ] && [ "$current_md5" != "$monitor_md5" ]; then
-            echo "Mismatch detected. Rebooting now."
-            sudo reboot
-            exit 1
-        fi
-    else
-        echo "Either monitor or current is not available, skipping check."
-    fi
-    sleep 5s
-done
-
-#  Version 1.0:
-#  Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.
\ No newline at end of file
diff --git a/usr/bin/custom/chromium-monitor b/usr/bin/custom/chromium-monitor
new file mode 100644
index 0000000..739caad
--- /dev/null
+++ b/usr/bin/custom/chromium-monitor
@@ -0,0 +1,51 @@
+#!/bin/bash 
+
+LOGFILE="/var/log/chromium-monitor.log"
+
+# Function to log messages with timestamps
+log() {
+    echo "$(date '+%Y-%m-%d %H:%M:%S') - $1" >> "$LOGFILE"
+}
+
+# Function to get the monitor value from DHCP
+get_monitor() {
+    sudo cat /var/lib/dhcp/* | grep -a "option monitor" | tail -1 | \
+    awk '{ s = ""; for (i = 3; i <= NF; i++) s = s $i " "; print s}' | \
+    awk -F '"' '{print $2}'
+}
+
+# Function to get the current window name
+get_current_window() {
+    DISPLAY=:0 xdotool getwindowfocus getwindowname
+}
+
+# Initialize monitor variable
+monitor=""
+while [ -z "$monitor" ]; do
+    monitor=$(get_monitor)
+    if [ -n "$monitor" ]; then
+        log "Initial monitor detected: $monitor"  # Log initial monitor
+    fi
+    sleep 5
+done
+
+# Main loop to continuously check the current window
+while true; do
+    current_window=$(get_current_window)  # Get the current window name
+
+    if [ -n "$current_window" ]; then
+        # Check for mismatch using case-insensitive comparison
+        if ! echo "$current_window" | grep -iq "$monitor"; then
+            log "Mismatch detected! Monitor: $monitor, Current: $current_window"
+            log "Rebooting now."
+            sudo reboot
+            exit 1
+        fi
+    fi
+
+    # Sleep for a short duration before the next check
+    sleep 5
+done
+
+# Version 1.0:
+# Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspbian as custom PXE init script.
diff --git a/usr/bin/custom/hostname b/usr/bin/custom/hostname
new file mode 100644
index 0000000..85efd0c
--- /dev/null
+++ b/usr/bin/custom/hostname
@@ -0,0 +1,40 @@
+#!/bin/bash 
+
+LOGFILE="/var/log/hostname.log"
+
+# Function to log messages with timestamps
+log() {
+    echo "$(date '+%Y-%m-%d %H:%M:%S') - $1" >> "$LOGFILE"
+}
+
+# Function to read the hostname from the DHCP lease file
+get_hostname() {
+    sudo cat /var/lib/dhcp/* | grep -a "option host-name" | tail -1 | \
+    awk -F '"' '{print $2}'
+}
+
+# Function to update /etc/hosts with the new hostname
+update_hosts() {
+    local hostname="$1"
+    # Replace the second line with the new hostname
+    sudo sed -i "2s/.*/127.0.1.1   ${hostname}/" /etc/hosts
+    log "Updated /etc/hosts with hostname: $hostname"
+}
+
+# Read the hostname from DHCP
+hostname=$(get_hostname)
+
+if [ -n "$hostname" ]; then
+    # Set the hostname using hostnamectl
+    sudo hostnamectl set-hostname "$hostname"
+    log "Set hostname to: $hostname"
+    update_hosts "$hostname"
+else
+    log "No hostname found."
+fi
+
+# Log completion
+log "Hostname update script completed."
+
+# Version 1.0:
+# Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspbian as custom PXE init script.
diff --git a/usr/bin/custom/watchdog-monitor b/usr/bin/custom/watchdog-monitor
new file mode 100644
index 0000000..3797fe1
--- /dev/null
+++ b/usr/bin/custom/watchdog-monitor
@@ -0,0 +1,99 @@
+#!/bin/bash
+
+# Log file
+log_file="/var/log/watchdog.log"
+
+# Configuration file
+config_file="/etc/watchdog.conf"
+
+# Function to log messages with timestamp
+log() {
+    echo "$(date '+%Y-%m-%d %H:%M:%S') - $1" >> "$log_file"
+}
+
+# Function to update watchdog configuration
+update_watchdog_config() {
+    # Extract watchdog IP addresses
+    watchdog=$(sudo cat /var/lib/dhcp/* | grep -a "option watchdog" | tail -1 | \
+    awk '{for (i=3; i<=NF; i++) printf "%s ", $i}' | tr -d '";')
+    
+    IFS=', ' read -r -a ip_array <<< "$watchdog"  # Split IPs by comma or space
+
+    # Backup current configuration
+    sudo cp "$config_file" "$config_file.bak"
+    log "Backup of $config_file created successfully."
+
+    # Write static configuration to file
+    {
+        echo "realtime = yes"
+        echo "priority = 1"
+        echo "interface = eth0"
+        echo "interval = 58"
+        echo "ping-count = 1"
+    } | sudo tee "$config_file" > /dev/null
+    log "Static configuration written to $config_file."
+
+    if [ ${#ip_array[@]} -eq 0 ]; then
+        log "No IP addresses found. Watchdog configuration cleared."
+        return 1  # No IP addresses to configure
+    else
+        # Append IPs to config
+        for ip in "${ip_array[@]}"; do
+            echo "ping = $ip" | sudo tee -a "$config_file" > /dev/null
+        done
+        log "Configured watchdog to ping: ${ip_array[*]}"
+
+        # Attempt to restart watchdog service
+        if ! sudo systemctl restart watchdog; then
+            log "Failed to restart watchdog service. Attempting to stop and start."
+
+            # Fallback: stop then start the service
+            sudo systemctl stop watchdog
+            if sudo systemctl start watchdog; then
+                log "Watchdog service started successfully after stop."
+            else
+                log "Failed to start watchdog service after stop."
+                return 1
+            fi
+        else
+            log "Watchdog service restarted successfully."
+        fi
+
+        # Stop watchdog-monitor service if restart/start was successful
+        if sudo systemctl stop watchdog-monitor; then
+            log "watchdog-monitor service stopped successfully."
+        else
+            log "Failed to stop watchdog-monitor service."
+        fi
+
+        return 0  # Successful restart/start
+    fi
+}
+
+# Loop parameters
+interval=30  # Interval to wait between checks
+start_time=$(date +%s)
+end_time=$((start_time + 300))  # 5 minutes in seconds
+
+# Main loop
+while true; do
+    if ! update_watchdog_config; then
+        log "IP addresses found and watchdog restarted. Exiting loop."
+        break
+    else
+        log "No IP addresses found or restart failed. Waiting for $interval seconds before checking again..."
+    fi
+
+    # Check if 5 minutes have passed
+    if [ "$(date +%s)" -ge "$end_time" ]; then
+        log "5 minutes have passed. Stopping the watchdog service."
+        sudo systemctl stop watchdog
+        break
+    fi
+
+    log "Waiting for $interval seconds before checking for IP addresses again..."
+    sleep $interval
+done
+
+# Version 1.5:
+# Created 2024 by Tim Eertmoed @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom PXE init script.
diff --git a/usr/bin/watchdog b/usr/bin/watchdog
deleted file mode 100644
index 9e34575..0000000
--- a/usr/bin/watchdog
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-watchdog=$(sudo cat /var/lib/dhcp/* | grep -a "option watchdog" | tail -1 | \
-awk '{for (i=3; i<=NF; i++) printf "%s ", $i}' | tr -d '";')
-IFS=' ' read -r -a ip_array <<< "$watchdog"
-config_file="/etc/watchdog.conf"
-sudo cp "$config_file" "$config_file.bak"
-sudo sed -i '/ping/d' "$config_file"
-sudo sed -i '/^interval/d' "$config_file"
-echo "interval = 60" | sudo tee -a "$config_file" > /dev/null
-if [ ${#ip_array[@]} -eq 0 ]; then
-    sudo sed -i '/interval/d' "$config_file"
-    echo "No IP addresses found. Watchdog configuration cleared." >&2
-    sudo systemctl stop watchdog
-else
-    for ip in "${ip_array[@]}"; do
-        echo "ping = $ip" | sudo tee -a "$config_file" > /dev/null
-    done
-fi
-sudo systemctl restart watchdog
-
-#  Version 1.0:
-#  Created 2024 by Tim Eertmoed, Christian Hampp @ WiS IT-Solutions GmbH, Germany to work on Raspian as custom pxe init script.
\ No newline at end of file