diff --git a/arch-graphical-install-auto.sh b/arch-graphical-install-auto.sh
index b6d321c..6a775ea 100755
--- a/arch-graphical-install-auto.sh
+++ b/arch-graphical-install-auto.sh
@@ -692,8 +692,11 @@ userrechte
 
 # grub-updater
 if [ -d /etc/grub.d ]; then
-    cp /opt/${repo}/configs/grub.d/10_linux /etc/grub.d/10_linux
+    cp -v /opt/${repo}/configs/grub.d/* /etc/grub.d/
 fi
+cp /opt/${repo}/scripts/extract-menuentry.py /usr/bin/extract-menuentry.py
+cp /opt/${repo}/scripts/extract-menuentry-snapshots.py /usr/bin/extract-menuentry-snapshots.py
+
 mkdir -p /boot/grub/
 grub-mkconfig -o /boot/grub/grub.cfg
 
diff --git a/arch-install.sh b/arch-install.sh
index 1d18af6..41dbb96 100755
--- a/arch-install.sh
+++ b/arch-install.sh
@@ -780,15 +780,24 @@ function grubinstall() {
         parameter="${parameter}cryptkey=UUID=${usbkeyuuid}:${usbkeydateisystem}:\/archkey "
     fi
 
+    sed -i '/GRUB_CMDLINE_LINUX=/d' ${mountpoint}/etc/default/grub
+    echo "GRUB_CMDLINE_LINUX=\"${parameter}\"" >> ${mountpoint}/etc/default/grub
+
     [[ -z "${autostartdesktop}" ]] && autostartdesktop=sway
     [[ -z "${lang}" ]] && lang=de_DE
     [[ -z "${keytable}" ]] && keytable=de
     [[ -z "${tz}" ]] && tz=Europe/Berlin
 
-    parameter="${parameter}autostartdesktop=${autostartdesktop} lang=${lang} keytable=${keytable} tz=${tz} "
+    parameter="lang=${lang} keytable=${keytable} tz=${tz} autostartdesktop=sway "
+
+    sed -i '/GRUB_CMDLINE_LINUX_DEFAULT=/d' ${mountpoint}/etc/default/grub
+    echo "GRUB_CMDLINE_LINUX_DEFAULT=\"${parameter}\"" >> ${mountpoint}/etc/default/grub
+
+    parameter="lang=${lang} keytable=${keytable} tz=${tz} autostartdesktop=i3 "
+
+    sed -i '/GRUB_CMDLINE_LINUX_DEFAULT_ALT=/d' ${mountpoint}/etc/default/grub
+    echo "GRUB_CMDLINE_LINUX_DEFAULT_ALT=\"${parameter}\"" >> ${mountpoint}/etc/default/grub
 
-    sed -i '/GRUB_CMDLINE_LINUX=/d' ${mountpoint}/etc/default/grub
-    echo "GRUB_CMDLINE_LINUX=\"${parameter}\"" >> ${mountpoint}/etc/default/grub
     echo "GRUB_DISABLE_OS_PROBER=true" >> ${mountpoint}/etc/default/grub
 }
 
@@ -1243,7 +1252,7 @@ function abfrage() {
         read -p "Should you autologin in youre System? : [Y/n] " autologin
         [[ -z "${autologin}" ]] && autologin=y
 
-        read -p "Should you start Sway (default) or I3? : [SWAY/I3] " autostartdesktop
+        read -p "Should you start Sway (default) or I3 (this can selected by the last load GRUB Entry)? : [SWAY/I3] " autostartdesktop
         [[ -z "${autostartdesktop}" ]] && autostartdesktop=sway
 
         if lspci | grep -e VGA -e 3D -m 1 | grep NVIDIA; then
diff --git a/configs/grub.d/10_linux b/configs/grub.d/10_linux
deleted file mode 100755
index f1625b4..0000000
--- a/configs/grub.d/10_linux
+++ /dev/null
@@ -1,358 +0,0 @@
-#! /bin/sh
-set -e
-
-# grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009,2010  Free Software Foundation, Inc.
-#
-# GRUB is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GRUB is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GRUB.  If not, see <http://www.gnu.org/licenses/>.
-
-prefix="/usr"
-exec_prefix="/usr"
-datarootdir="/usr/share"
-
-. "$pkgdatadir/grub-mkconfig_lib"
-
-export TEXTDOMAIN=grub
-export TEXTDOMAINDIR="${datarootdir}/locale"
-
-CLASS="--class gnu-linux --class gnu --class os"
-
-if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then
-  OS=Linux
-else
-  OS="${GRUB_DISTRIBUTOR} Linux"
-  CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1|LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
-fi
-
-# loop-AES arranges things so that /dev/loop/X can be our root device, but
-# the initrds that Linux uses don't like that.
-case ${GRUB_DEVICE} in
-  /dev/loop/*|/dev/loop[0-9])
-    GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"`
-  ;;
-esac
-
-if [ "x${GRUB_CMDLINE_LINUX_RECOVERY}" = "x" ] ; then
-  GRUB_CMDLINE_LINUX_RECOVERY=single
-fi
-
-# Default to disabling partition uuid support to maintian compatibility with
-# older kernels.
-GRUB_DISABLE_LINUX_PARTUUID=${GRUB_DISABLE_LINUX_PARTUUID-true}
-
-# btrfs may reside on multiple devices. We cannot pass them as value of root= parameter
-# and mounting btrfs requires user space scanning, so force UUID in this case.
-if ( [ "x${GRUB_DEVICE_UUID}" = "x" ] && [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] ) \
-    || ( [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \
-	&& [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ] ) \
-    || ( ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \
-	&& ! test -e "/dev/disk/by-partuuid/${GRUB_DEVICE_PARTUUID}" ) \
-    || ( test -e "${GRUB_DEVICE}" && uses_abstraction "${GRUB_DEVICE}" lvm ); then
-  LINUX_ROOT_DEVICE=${GRUB_DEVICE}
-elif [ "x${GRUB_DEVICE_UUID}" = "x" ] \
-    || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ]; then
-  LINUX_ROOT_DEVICE=PARTUUID=${GRUB_DEVICE_PARTUUID}
-else
-  LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID}
-fi
-
-case x"$GRUB_FS" in
-    xbtrfs)
-	rootsubvol="`make_system_path_relative_to_its_root /`"
-	rootsubvol="${rootsubvol#/}"
-	if [ "x${rootsubvol}" != x ]; then
-	    GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}"
-	fi;;
-    xzfs)
-	rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
-	bootfs="`make_system_path_relative_to_its_root / | sed -e "s,@$,,"`"
-	LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}"
-	;;
-esac
-
-title_correction_code=
-
-linux_entry ()
-{
-  os="$1"
-  version="$2"
-  type="$3"
-  args="$4"
-
-  if [ -z "$boot_device_id" ]; then
-      boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
-  fi
-  if [ x$type != xsimple ] ; then
-      case $type in
-	  booster)
-	      title="$(gettext_printf "%s, with Linux %s (booster initramfs)" "${os}" "${version}")" ;;
-	  fallback)
-	      title="$(gettext_printf "%s, with Linux %s (fallback initramfs)" "${os}" "${version}")" ;;
-    snapshot)
-        title="$(gettext_printf "%s, with Linux %s (snapshot) ${SNAPSHOTNAME}" "${os}" "${version}")" ;;
-	  recovery)
-	      title="$(gettext_printf "%s, with Linux %s (recovery mode)" "${os}" "${version}")" ;;
-	  *)
-	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
-      esac
-      if [ x"$title" = x"$GRUB_ACTUAL_DEFAULT" ] || [ x"Previous Linux versions>$title" = x"$GRUB_ACTUAL_DEFAULT" ]; then
-	  replacement_title="$(echo "Advanced options for ${OS}" | sed 's,>,>>,g')>$(echo "$title" | sed 's,>,>>,g')"
-	  quoted="$(echo "$GRUB_ACTUAL_DEFAULT" | grub_quote)"
-	  title_correction_code="${title_correction_code}if [ \"x\$default\" = '$quoted' ]; then default='$(echo "$replacement_title" | grub_quote)'; fi;"
-	  grub_warn "$(gettext_printf "Please don't use old title \`%s' for GRUB_DEFAULT, use \`%s' (for versions before 2.00) or \`%s' (for 2.00 or later)" "$GRUB_ACTUAL_DEFAULT" "$replacement_title" "gnulinux-advanced-$boot_device_id>gnulinux-$version-$type-$boot_device_id")"
-      fi
-      echo "menuentry '$(echo "$title" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-$version-$type-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
-  else
-      echo "menuentry '$(echo "$os" | grub_quote)' ${CLASS} \$menuentry_id_option 'gnulinux-simple-$boot_device_id' {" | sed "s/^/$submenu_indentation/"
-  fi      
-  if [ x$type != xrecovery ] ; then
-      save_default_entry | grub_add_tab
-  fi
-
-  # Use ELILO's generic "efifb" when it's known to be available.
-  # FIXME: We need an interface to select vesafb in case efifb can't be used.
-  if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
-      echo "	load_video" | sed "s/^/$submenu_indentation/"
-      if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
-	  && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
-	  echo "	set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
-      fi
-  else
-      if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
-	  echo "	load_video" | sed "s/^/$submenu_indentation/"
-      fi
-      echo "	set gfxpayload=$GRUB_GFXPAYLOAD_LINUX" | sed "s/^/$submenu_indentation/"
-  fi
-
-  echo "	insmod gzio" | sed "s/^/$submenu_indentation/"
-
-  if [ x$dirname = x/ ]; then
-    if [ -z "${prepare_root_cache}" ]; then
-      prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | grub_add_tab)"
-    fi
-    printf '%s\n' "${prepare_root_cache}" | sed "s/^/$submenu_indentation/"
-  else
-    if [ -z "${prepare_boot_cache}" ]; then
-      prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
-    fi
-    printf '%s\n' "${prepare_boot_cache}" | sed "s/^/$submenu_indentation/"
-  fi
-  message="$(gettext_printf "Loading Linux %s ..." ${version})"
-  sed "s/^/$submenu_indentation/" << EOF
-	echo	'$(echo "$message" | grub_quote)'
-	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} rw ${args}
-EOF
-  if test -n "${initrd}" ; then
-    # TRANSLATORS: ramdisk isn't identifier. Should be translated.
-    message="$(gettext_printf "Loading initial ramdisk ...")"
-    initrd_path=
-    for i in ${initrd}; do
-      initrd_path="${initrd_path} ${rel_dirname}/${i}"
-    done
-    sed "s/^/$submenu_indentation/" << EOF
-	echo	'$(echo "$message" | grub_quote)'
-	initrd	$(echo $initrd_path)
-EOF
-  fi
-  sed "s/^/$submenu_indentation/" << EOF
-}
-EOF
-}
-
-machine=`uname -m`
-case "x$machine" in
-    xi?86 | xx86_64)
-	list=
-	for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
-	    if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
-	done ;;
-    *) 
-	list=
-	for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
-                  if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi
-	done ;;
-esac
-
-case "$machine" in
-    i?86) GENKERNEL_ARCH="x86" ;;
-    mips|mips64) GENKERNEL_ARCH="mips" ;;
-    mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
-    arm*) GENKERNEL_ARCH="arm" ;;
-    *) GENKERNEL_ARCH="$machine" ;;
-esac
-
-prepare_boot_cache=
-prepare_root_cache=
-boot_device_id=
-title_correction_code=
-
-# Extra indentation to add to menu entries in a submenu. We're not in a submenu
-# yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
-submenu_indentation=""
-
-# Perform a reverse version sort on the entire list.
-# Temporarily replace the '.old' suffix by ' 1' and append ' 2' for all
-# other files to order the '.old' files after their non-old counterpart
-# in reverse-sorted order.
-
-reverse_sorted_list=$(echo $list | tr ' ' '\n' | sed -e 's/\.old$/ 1/; / 1$/! s/$/ 2/' | version_sort -r | sed -e 's/ 1$/.old/; s/ 2$//')
-
-is_top_level=true
-for linux in ${reverse_sorted_list}; do
-  gettext_printf "Found linux image: %s\n" "$linux" >&2
-  basename=`basename $linux`
-  dirname=`dirname $linux`
-  rel_dirname=`make_system_path_relative_to_its_root $dirname`
-  version=`echo $basename | sed -e "s,vmlinuz-,,g"`
-  alt_version=`echo $version | sed -e "s,\.old$,,g"`
-  linux_root_device_thisversion="${LINUX_ROOT_DEVICE}"
-
-  initrd_early=
-  for i in ${GRUB_EARLY_INITRD_LINUX_STOCK} \
-	   ${GRUB_EARLY_INITRD_LINUX_CUSTOM}; do
-    if test -e "${dirname}/${i}" ; then
-      initrd_early="${initrd_early} ${i}"
-    fi
-  done
-
-  initrd_real=
-  for i in "initrd.img-${version}" "initrd-${version}.img" \
-	   "initrd-${alt_version}.img.old" "initrd-${version}.gz" \
-	   "initrd-${alt_version}.gz.old" "initrd-${version}" \
-	   "initramfs-${version}.img" "initramfs-${alt_version}.img.old" \
-	   "initrd.img-${alt_version}" "initrd-${alt_version}.img" \
-	   "initrd-${alt_version}" "initramfs-${alt_version}.img" \
-	   "initramfs-genkernel-${version}" \
-	   "initramfs-genkernel-${alt_version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \
-	   "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do
-    if test -e "${dirname}/${i}" ; then
-      initrd_real="${i}"
-      break
-    fi
-  done
-
-  initrd=
-  if test -n "${initrd_early}" || test -n "${initrd_real}"; then
-    initrd="${initrd_early} ${initrd_real}"
-
-    initrd_display=
-    for i in ${initrd}; do
-      initrd_display="${initrd_display} ${dirname}/${i}"
-    done
-    gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
-  fi
-
-  config=
-  for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do
-    if test -e "${i}" ; then
-      config="${i}"
-      break
-    fi
-  done
-
-  initramfs=
-  if test -n "${config}" ; then
-      initramfs=`grep CONFIG_INITRAMFS_SOURCE= "${config}" | cut -f2 -d= | tr -d \"`
-  fi
-
-  if test -z "${initramfs}" && test -z "${initrd_real}" ; then
-    # "UUID=" and "ZFS=" magic is parsed by initrd or initramfs.  Since there's
-    # no initrd or builtin initramfs, it can't work here.
-    if [ "x${GRUB_DEVICE_PARTUUID}" = "x" ] \
-	|| [ "x${GRUB_DISABLE_LINUX_PARTUUID}" = "xtrue" ]; then
-
-	linux_root_device_thisversion=${GRUB_DEVICE}
-    else
-	linux_root_device_thisversion=PARTUUID=${GRUB_DEVICE_PARTUUID}
-    fi
-  fi
-
-  # The GRUB_DISABLE_SUBMENU option used to be different than others since it was
-  # mentioned in the documentation that has to be set to 'y' instead of 'true' to
-  # enable it. This caused a lot of confusion to users that set the option to 'y',
-  # 'yes' or 'true'. This was fixed but all of these values must be supported now.
-  if [ "x${GRUB_DISABLE_SUBMENU}" = xyes ] || [ "x${GRUB_DISABLE_SUBMENU}" = xy ]; then
-    GRUB_DISABLE_SUBMENU="true"
-  fi
-
-  if [ "x$is_top_level" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xtrue ]; then
-    linux_entry "${OS}" "${version}" simple \
-    "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-
-    submenu_indentation="$grub_tab"
-    
-    if [ -z "$boot_device_id" ]; then
-	boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
-    fi
-    # TRANSLATORS: %s is replaced with an OS name
-    echo "submenu '$(gettext_printf "Advanced options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-advanced-$boot_device_id' {"
-    is_top_level=false
-  fi
-
-  linux_entry "${OS}" "${version}" advanced \
-              "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-
-  if test -e "${dirname}/initramfs-${version}-fallback.img" ; then
-    initrd="${initrd_early} initramfs-${version}-fallback.img"
-
-    if test -n "${initrd}" ; then
-      gettext_printf "Found fallback initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
-    fi
-
-    linux_entry "${OS}" "${version}" fallback \
-                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-  fi
-
-  if test -e "${dirname}/booster-${version}.img" ; then
-    initrd="${initrd_early} booster-${version}.img"
-
-    if test -n "${initrd}" ; then
-      gettext_printf "Found booster initrd image(s) in %s:%s\n" "${dirname}" "${initrd_extra} ${initrd}" >&2
-    fi
-
-    linux_entry "${OS}" "${version}" booster \
-                "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
-  fi
-
-  if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
-    linux_entry "${OS}" "${version}" recovery \
-                "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}"
-  fi
-done
-
-# If at least one kernel was found, then we need to
-# add a closing '}' for the submenu command.
-if [ x"$is_top_level" != xtrue ]; then
-  echo '}'
-fi
-
-if [ -f "/etc/grub-snapshot" ]; then
-  if [ "$(cat /etc/grub-snapshot | wc -l)" != 0 ]; then
-    # TRANSLATORS: %s is replaced with an OS name
-    echo "submenu '$(gettext_printf "Snapshot options for %s" "${OS}" | grub_quote)' \$menuentry_id_option 'gnulinux-snapshot-$boot_device_id' {"
-    is_top_level=false
-    snapshotanzahl="$(expr $(wc -l /etc/grub-snapshot | awk '{print $1}') + 1)"
-    while (( "$(expr $snapshotanzahl - 1)" )); do
-      snapshotanzahl=`expr ${snapshotanzahl} - 1`
-      SNAPSHOTNAME="$(cat /etc/grub-snapshot | sed ''$snapshotanzahl'!d')"
-      SNAPSHOT="rootflags=subvol=${SNAPSHOTNAME}"
-      linux_entry "${OS}" "${version}" snapshot \
-          "${SNAPSHOT} ${GRUB_CMDLINE_LINUX#* } ${GRUB_CMDLINE_LINUX_DEFAULT}"
-    done
-    echo '}'
-  fi
-fi
-
-echo "$title_correction_code"
diff --git a/configs/grub.d/40_linux b/configs/grub.d/40_linux
new file mode 100755
index 0000000..c621c1a
--- /dev/null
+++ b/configs/grub.d/40_linux
@@ -0,0 +1,6 @@
+#!/bin/sh
+. /etc/default/grub
+export GRUB_DISABLE_RECOVERY=true
+export GRUB_DISABLE_SUBMENU=y
+export GRUB_CMDLINE_LINUX_DEFAULT=$GRUB_CMDLINE_LINUX_DEFAULT_ALT
+/etc/grub.d/10_linux | python /usr/bin/extract-menuentry.py
diff --git a/configs/grub.d/40_snapshots b/configs/grub.d/40_snapshots
new file mode 100755
index 0000000..47b6e58
--- /dev/null
+++ b/configs/grub.d/40_snapshots
@@ -0,0 +1,23 @@
+#!/bin/sh
+. /etc/default/grub
+export GRUB_DISABLE_RECOVERY=true
+export GRUB_DISABLE_SUBMENU=y
+export GRUB_CMDLINE_LINUX_DEFAULT=$GRUB_CMDLINE_LINUX_DEFAULT_ALT
+
+if [ -f "/etc/grub-snapshot" ]; then
+  if [ "$(cat /etc/grub-snapshot | wc -l)" != 0 ]; then
+    # TRANSLATORS: %s is replaced with an OS name
+    echo "submenu 'Snapshot options for SpectreOS' \$menuentry_id_option 'gnulinux-snapshot-$boot_device_id' {"
+    is_top_level=false
+    snapshotanzahl="$(expr $(wc -l /etc/grub-snapshot | awk '{print $1}') + 1)"
+    while (( "$(expr $snapshotanzahl - 1)" )); do
+      snapshotanzahl=`expr ${snapshotanzahl} - 1`
+      SNAPSHOTNAME="$(cat /etc/grub-snapshot | sed ''$snapshotanzahl'!d')"
+      SNAPSHOT="rootflags=subvol=${SNAPSHOTNAME}"
+
+      export GRUB_CMDLINE_LINUX="${SNAPSHOT} ${GRUB_CMDLINE_LINUX#* }"
+      /etc/grub.d/10_linux | python /usr/bin/extract-menuentry-snapshots.py ${SNAPSHOT#*@}
+    done
+    echo '}'
+  fi
+fi
diff --git a/scripts/extract-menuentry-snapshots.py b/scripts/extract-menuentry-snapshots.py
new file mode 100755
index 0000000..4285bc9
--- /dev/null
+++ b/scripts/extract-menuentry-snapshots.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+import os, sys, re
+
+# https://askubuntu.com/questions/1155064/grub2-create-2nd-boot-entry-with-different-kernel-command-line-options-in-grub
+
+menuentry_start = "menuentry"
+
+def extract_menuentry(infile):
+  in_menuentry = False
+  for line in infile.readlines():
+    if in_menuentry:
+      if line.strip() == "}":
+        in_menuentry = False
+        print(line.rstrip())
+        pass
+      else:
+        print(line.rstrip())
+        pass
+      pass
+    else:
+      if line.startswith(menuentry_start):
+        in_menuentry = True
+        match = re.search(r"menuentry '[^']+' (.*)", line)
+        print("menuentry '%s' %s" % (os.environ.get('GRUB_ALT_NAME', 'SpectreOS Linux Snapshot ({})'.format(sys.argv[1])), match.group(1)))
+        pass
+      pass
+    pass
+  pass
+
+
+if __name__ == "__main__":
+  extract_menuentry(sys.stdin)
+  pass
diff --git a/scripts/extract-menuentry.py b/scripts/extract-menuentry.py
new file mode 100755
index 0000000..eea91ff
--- /dev/null
+++ b/scripts/extract-menuentry.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python3
+import os, sys, re
+
+# https://askubuntu.com/questions/1155064/grub2-create-2nd-boot-entry-with-different-kernel-command-line-options-in-grub
+
+menuentry_start = "menuentry"
+
+def extract_menuentry(infile):
+  in_menuentry = False
+  for line in infile.readlines():
+    if in_menuentry:
+      if line.strip() == "}":
+        in_menuentry = False
+        print(line.rstrip())
+        pass
+      else:
+        print(line.rstrip())
+        pass
+      pass
+    else:
+      if line.startswith(menuentry_start):
+        in_menuentry = True
+        match = re.search(r"menuentry '[^']+' (.*)", line)
+        print("menuentry '%s' %s" % (os.environ.get('GRUB_ALT_NAME', 'SpectreOS Linux alt'), match.group(1)))
+        pass
+      pass
+    pass
+  pass
+
+
+if __name__ == "__main__":
+  extract_menuentry(sys.stdin)
+  pass