diff --git a/Makefile b/Makefile
index e91710d06..37678f03c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,26 +2,43 @@
 ARGS         :=
 BUILD_SCRIPT := build.sh
 KERNEL       := zen
-SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug --noconfirm
+SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --noconfirm
 ARCH_x86_64  := --arch x86_64
 ARCH_i686    := --arch i686
 FULLBUILD    := -d -g -e --noconfirm
+DEBUG_OPTION := --debug --log
+DEBUG        := false
 FULL_x86_64  := xfce cinnamon i3 plasma gnome
 FULL_i686    := xfce lxde
 CURRENT_DIR  := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
 
+ifeq (${DEBUG},true)
+	ARGS += ${ARGS} ${DEBUG_OPTION}
+endif
+
 full:
 	sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m x86_64 ${FULL_x86_64}
 	sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m i686   ${FULL_i686}
 	@make clean
 
-basic-64 basic-32  cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 serene-64 serene-32 xfce-64 xfce-32 xfce-pro-64:
+basic-ja-64    basic-en-64    basic-ja-32     basic-en-32    \
+cinnamon-ja-64 cinnamon-en-64 cinnamon-ja-32  cinnamon-en-32 \
+gnome-ja-64    gnome-en-64    gnome-ja-32     gnome-en-32    \
+i3-ja-64       i3-en-64       i3-ja-32        i3-en-32       \
+lxde-ja-64     lxde-en-64     lxde-ja-32      lxde-en-32     \
+plasma-ja-64   plasma-en-64                                  \
+releng-ja-64   releng-en-64   releng-ja-32    releng-en-32   \
+serene-ja-64   serene-en-64   serene-ja-32    serene-en-32   \
+xfce-ja-64     xfce-en-64     xfce-ja-32      xfce-en-32     \
+xfce-pro-ja-64 xfce-pro-en-64                                \
+:
 	@$(eval ARCHITECTURE=${shell echo ${@} | rev | cut -d '-' -f 1 | rev })
-	@$(eval CHANNEL=${shell echo ${@} | sed "s/-${ARCHITECTURE}//g"})
+	@$(eval LOCALE=${shell echo ${@} | rev | cut -d '-' -f 2 | rev })
+	@$(eval CHANNEL=${shell echo ${@} | sed "s/-${LOCALE}-${ARCHITECTURE}//g"})
 	@[[ -z "${CHANNEL}" ]] && echo "Empty Channel" && exit 1 || :
 	@case ${ARCHITECTURE} in\
-		"32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_i686} ${CHANNEL} ;;\
-		"64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_x86_64} ${CHANNEL};;\
+		"32") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_i686} -l ${LOCALE} ${CHANNEL} ;;\
+		"64") sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} ${ARCH_x86_64} -l ${LOCALE} ${CHANNEL};;\
 		*   ) echo "Unknown Architecture"; exit 1  ;; \
 	esac
 	@make clean
@@ -43,7 +60,7 @@ build_option:
 	${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option
 
 clean:
-	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} --noconfirm clean
+	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} --noconfirm --debug clean
 
 build:build_option
 	$(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))
diff --git a/build.sh b/build.sh
index 4dd4abeb0..0fec5df8a 100755
--- a/build.sh
+++ b/build.sh
@@ -34,7 +34,7 @@ norepopkg=()
 # Load config file
 [[ ! -f "${defaultconfig}" ]] && "${tools_dir}/msg.sh" -a 'build.sh' error "${defaultconfig} was not found." && exit 1
 for config in "${defaultconfig}" "${script_path}/custom.conf"; do
-    [[ -f "${config}" ]] && source "${config}"
+    [[ -f "${config}" ]] && source "${config}" && loaded_files+=("${config}")
 done
 
 umask 0022
@@ -109,8 +109,7 @@ _usage () {
     for _type in "locale" "kernel"; do
         echo " ${_type} for each architecture:"
         for _arch in $(find "${script_path}/system/" -maxdepth 1 -mindepth 1 -name "${_type}-*" -print0 | xargs -I{} -0 basename {} | sed "s|${_type}-||g"); do
-            echo -n "    ${_arch}$(echo_blank "$(( "${blank}" - "${#_arch}" ))")"
-            "${tools_dir}/${_type}.sh" -a "${_arch}" show
+            echo "    ${_arch}$(echo_blank "$(( "${blank}" - "${#_arch}" ))")$("${tools_dir}/${_type}.sh" -a "${_arch}" show)"
         done
         echo
     done
@@ -132,7 +131,7 @@ _usage () {
     echo "    -x | --bash-debug            Enable bash debug mode(set -xv)"
     echo "         --channellist           Output the channel list and exit"
     echo "         --config                Load additional config file"
-    echo "         --gitversion            Add Git commit hash to image file version"
+    echo "         --[no]gitversion        Add Git commit hash to image file version"
     echo "         --logpath <file>        Set log file path (use with --log)"
     echo "         --[no]log               (No) log ;re-run script with tee"
     echo "         --msgdebug              Enables output debugging"
@@ -151,6 +150,7 @@ _usage () {
     echo "         --nopkgbuild            Ignore PKGBUILD (Use only for debugging)"
     echo "         --tar-type <comp_type>  Set compression type (gzip, lzma, lzo, xz, zstd)"
     echo "         --tar-opts <option>     Set tar command argument (Use with --tarball)"
+    echo "         --add-module <module>   Load additional modules (Separated by \",\")"
     echo
     echo " Many packages are installed from AUR, so specifying --noaur can cause problems."
     echo
@@ -158,7 +158,7 @@ _usage () {
 }
 
 # Unmount helper Usage: _umount <target>
-_umount() { if mountpoint -q "${1}"; then umount -lf "${1}"; fi; }
+_umount() { mountpoint -q "${1}" && umount -lf "${1}"; return 0; }
 
 # Mount helper Usage: _mount <source> <target>
 _mount() { ! mountpoint -q "${2}" && [[ -f "${1}" ]] && [[ -d "${2}" ]] && mount "${1}" "${2}"; return 0; }
@@ -180,13 +180,13 @@ mount_airootfs () {
 
 # Helper function to run make_*() only one time.
 run_once() {
-    set -eu
     if [[ ! -e "${lockfile_dir}/build.${1}" ]]; then
+        umount_work
         msg_debug "Running ${1} ..."
         mount_airootfs
         eval "${@}"
         mkdir -p "${lockfile_dir}"; touch "${lockfile_dir}/build.${1}"
-        umount_work
+        
     else
         msg_debug "Skipped because ${1} has already been executed."
     fi
@@ -246,7 +246,7 @@ _run_with_pacmanconf(){
 # コマンドをchrootで実行する
 _chroot_run() {
     msg_debug "Run command in chroot\nCommand: ${*}"
-    eval -- arch-chroot "${airootfs_dir}" "${@}"
+    arch-chroot "${airootfs_dir}" "${@}" || return "${?}"
 }
 
 _cleanup_common () {
@@ -334,7 +334,7 @@ prepare_env() {
     # Load loop kernel module
     if [[ "${noloopmod}" = false ]]; then
         [[ ! -d "/usr/lib/modules/$(uname -r)" ]] && msg_error "The currently running kernel module could not be found.\nProbably the system kernel has been updated.\nReboot your system to run the latest kernel." "1"
-        lsmod | getclm 1 | grep -x "loop" || modprobe loop
+        lsmod | getclm 1 | grep -qx "loop" || modprobe loop
     fi
 
     # Check work dir
@@ -407,6 +407,9 @@ prepare_build() {
     # Load configs
     load_config "${channel_dir}/config.any" "${channel_dir}/config.${arch}"
 
+    # Additional modules
+    modules+=("${additional_modules[@]}")
+
     # Legacy mode
     if [[ "$(bash "${tools_dir}/channel.sh" --version "${alteriso_version}" ver "${channel_name}")" = "3.0" ]]; then
         msg_warn "The module cannot be used because it works with Alter ISO3.0 compatibility."
@@ -416,7 +419,7 @@ prepare_build() {
 
     # Load presets
     local _modules=() module_check
-    for_module '[[ -f "${preset_dir}/{}" ]] && readarray -t -O "${#_modules[@]}" _modules < <(cat "${preset_dir}/{}") || _modules+=("{}")'
+    for_module '[[ -f "${preset_dir}/{}" ]] && readarray -t -O "${#_modules[@]}" _modules < <(grep -h -v ^'#' "${preset_dir}/{}") || _modules+=("{}")'
     modules=("${_modules[@]}")
     unset _modules
 
@@ -445,6 +448,7 @@ prepare_build() {
     [[ "${customized_password}" = false ]] && password="${defaultpassword}"
 
     # gitversion
+    [[ ! -d "${script_path}/.git" ]] && [[ "${gitversion}" = true ]] && msg_error "There is no git directory. You need to use git clone to use this feature." "1"
     [[ "${gitversion}" = true ]] && iso_version="${iso_version}-${gitrev}"
 
     # Generate tar file name
@@ -578,6 +582,7 @@ make_packages_aur() {
 
     # prepare for yay
     cp -rf --preserve=mode "${script_path}/system/aur.sh" "${airootfs_dir}/root/aur.sh"
+    _pacstrap --asdeps --needed "go" # --asdepsをつけているのでaur.shで削除される --neededをつけているので明示的にインストールされている場合削除されない
 
     # Run aur script
     _run_with_pacmanconf _chroot_run "bash" "/root/aur.sh" "${makepkg_script_args[@]}" "${_pkglist_aur[@]}"
@@ -654,10 +659,10 @@ make_customize_airootfs() {
     # -k changed in AlterISO3 from passing kernel name to passing kernel configuration.
 
     # Generate options of customize_airootfs.sh.
-    _airootfs_script_options="-p '${password}' -k '${kernel} ${kernel_filename} ${kernel_mkinitcpio_profile}' -u '${username}' -o '${os_name}' -i '${install_dir}' -s '${usershell}' -a '${arch}' -g '${locale_gen_name}' -l '${locale_name}' -z '${locale_time}' -t ${theme_name}"
-    [[ "${boot_splash}" = true ]] && _airootfs_script_options="${_airootfs_script_options} -b"
-    [[ "${debug}" = true       ]] && _airootfs_script_options="${_airootfs_script_options} -d"
-    [[ "${bash_debug}" = true  ]] && _airootfs_script_options="${_airootfs_script_options} -x"
+    _airootfs_script_options=(-p "${password}" -k "${kernel} ${kernel_filename} ${kernel_mkinitcpio_profile}" -u "${username}" -o "${os_name}" -i "${install_dir}" -s "${usershell}" -a "${arch}" -g "${locale_gen_name}" -l "${locale_name}" -z "${locale_time}" -t "${theme_name}")
+    [[ "${boot_splash}" = true ]] && _airootfs_script_options+=("-b")
+    [[ "${debug}" = true       ]] && _airootfs_script_options+=("-d")
+    [[ "${bash_debug}" = true  ]] && _airootfs_script_options+=("-x")
 
     _main_script="root/customize_airootfs.sh"
 
@@ -671,7 +676,7 @@ make_customize_airootfs() {
     # Create script
     for _script in "${_script_list[@]}"; do
         if [[ -f "${_script}" ]]; then
-            (echo && cat "${_script}")  >> "${airootfs_dir}/${_main_script}"
+            (echo -e "\n#--$(basename "${_script}")--#\n" && cat "${_script}")  >> "${airootfs_dir}/${_main_script}"
             remove "${_script}"
         else
             msg_debug "${_script} was not found."
@@ -679,8 +684,8 @@ make_customize_airootfs() {
     done
 
     chmod 755 "${airootfs_dir}/${_main_script}"
-    cp "${airootfs_dir}/${_main_script}" "${build_dir}/$(basename ${_main_script})"
-    _chroot_run "${_main_script} ${_airootfs_script_options}"
+    cp "${airootfs_dir}/${_main_script}" "${build_dir}/$(basename "${_main_script}")"
+    _chroot_run "${_main_script}" "${_airootfs_script_options[@]}"
     remove "${airootfs_dir}/${_main_script}"
 
     # /root permission https://github.com/archlinux/archiso/commit/d39e2ba41bf556674501062742190c29ee11cd59
@@ -702,17 +707,15 @@ make_setup_mkinitcpio() {
     sed -i "s|/usr/lib/initcpio/|/etc/initcpio/|g" "${airootfs_dir}/etc/initcpio/install/archiso_shutdown"
     cp "${script_path}/system/initcpio/install/archiso_kms" "${airootfs_dir}/etc/initcpio/install"
     cp "${script_path}/system/initcpio/archiso_shutdown" "${airootfs_dir}/etc/initcpio"
-    if [[ "${boot_splash}" = true ]]; then
-        cp "${script_path}/mkinitcpio/mkinitcpio-archiso-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
-    else
-        cp "${script_path}/mkinitcpio/mkinitcpio-archiso.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
-    fi
+    cp "${script_path}/mkinitcpio/mkinitcpio-archiso.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
+    [[ "${boot_splash}" = true ]] && cp "${script_path}/mkinitcpio/mkinitcpio-archiso-plymouth.conf" "${airootfs_dir}/etc/mkinitcpio-archiso.conf"
+
     if [[ "${gpg_key}" ]]; then
       gpg --export "${gpg_key}" >"${build_dir}/gpgkey"
       exec 17<>"${build_dir}/gpgkey"
     fi
 
-    _chroot_run "mkinitcpio -c /etc/mkinitcpio-archiso.conf -k /boot/${kernel_filename} -g /boot/archiso.img"
+    _chroot_run mkinitcpio -c "/etc/mkinitcpio-archiso.conf" -k "/boot/${kernel_filename}" -g "/boot/archiso.img"
 
     [[ "${gpg_key}" ]] && exec 17<&-
     
@@ -761,9 +764,7 @@ make_syslinux() {
     # 一時ディレクトリに設定ファイルをコピー
     mkdir -p "${build_dir}/syslinux/"
     cp -a "${script_path}/syslinux/"* "${build_dir}/syslinux/"
-    if [[ -d "${channel_dir}/syslinux" ]] && [[ "${customized_syslinux}" = true ]]; then
-        cp -af "${channel_dir}/syslinux"* "${build_dir}/syslinux/"
-    fi
+    [[ -d "${channel_dir}/syslinux" ]] && [[ "${customized_syslinux}" = true ]] && cp -af "${channel_dir}/syslinux"* "${build_dir}/syslinux/"
 
     # copy all syslinux config to work dir
     for _cfg in "${build_dir}/syslinux/"*.cfg; do
@@ -775,13 +776,10 @@ make_syslinux() {
     done
 
     # Replace the SYSLINUX configuration file with or without boot splash.
-    local _use_config_name _no_use_config_name _pxe_or_sys
+    local _use_config_name="nosplash" _no_use_config_name="splash" _pxe_or_sys
     if [[ "${boot_splash}" = true ]]; then
         _use_config_name=splash
         _no_use_config_name=nosplash
-    else
-        _use_config_name=nosplash
-        _no_use_config_name=splash
     fi
     for _pxe_or_sys in "sys" "pxe"; do
         remove "${isofs_dir}/syslinux/archiso_${_pxe_or_sys}_${_no_use_config_name}.cfg"
@@ -789,11 +787,8 @@ make_syslinux() {
     done
 
     # Set syslinux wallpaper
-    if [[ -f "${channel_dir}/splash.png" ]]; then
-        cp "${channel_dir}/splash.png" "${isofs_dir}/syslinux"
-    else
-        cp "${script_path}/syslinux/splash.png" "${isofs_dir}/syslinux"
-    fi
+    cp "${script_path}/syslinux/splash.png" "${isofs_dir}/syslinux"
+    [[ -f "${channel_dir}/splash.png" ]] && cp -f "${channel_dir}/splash.png" "${isofs_dir}/syslinux"
 
     # remove config
     local _remove_config
@@ -998,9 +993,9 @@ make_alteriso_info(){
     # iso version info
     if [[ "${include_info}" = true ]]; then
         local _info_file="${isofs_dir}/alteriso-info" _version="${iso_version}"
-        remove "${_info_file}"; touch "${_info_file}"
+        #remove "${_info_file}"; touch "${_info_file}"
         [[ -d "${script_path}/.git" ]] && [[ "${gitversion}" = false ]] && _version="${iso_version}-${gitrev}"
-        "${tools_dir}/alteriso-info.sh" -a "${arch}" -b "${boot_splash}" -c "${channel_name%.add}" -d "${iso_publisher}" -k "${kernel}" -o "${os_name}" -p "${password}" -u "${username}" -v "${_version}" > "${_info_file}"
+        "${tools_dir}/alteriso-info.sh" -a "${arch}" -b "${boot_splash}" -c "${channel_name%.add}" -d "${iso_publisher}" -k "${kernel}" -o "${os_name}" -p "${password}" -u "${username}" -v "${_version}" -m "$(printf "%s," "${modules[@]}")"
     fi
 
     return 0
@@ -1055,7 +1050,7 @@ make_iso() {
 # Parse options
 ARGUMENT=("${DEFAULT_ARGUMENT[@]}" "${@}")
 OPTS=("a:" "b" "c:" "d" "e" "g:" "h" "j" "k:" "l:" "o:" "p:" "r" "t:" "u:" "w:" "x")
-OPTL=("arch:" "boot-splash" "comp-type:" "debug" "cleaning" "cleanup" "gpgkey:" "help" "lang:" "japanese" "kernel:" "out:" "password:" "comp-opts:" "user:" "work:" "bash-debug" "nocolor" "noconfirm" "nodepend" "gitversion" "msgdebug" "noloopmod" "tarball" "noiso" "noaur" "nochkver" "channellist" "config:" "noefi" "nodebug" "nosigcheck" "normwork" "log" "logpath:" "nolog" "nopkgbuild" "pacman-debug" "confirm" "tar-type:" "tar-opts:")
+OPTL=("arch:" "boot-splash" "comp-type:" "debug" "cleaning" "cleanup" "gpgkey:" "help" "lang:" "japanese" "kernel:" "out:" "password:" "comp-opts:" "user:" "work:" "bash-debug" "nocolor" "noconfirm" "nodepend" "gitversion" "msgdebug" "noloopmod" "tarball" "noiso" "noaur" "nochkver" "channellist" "config:" "noefi" "nodebug" "nosigcheck" "normwork" "log" "logpath:" "nolog" "nopkgbuild" "pacman-debug" "confirm" "tar-type:" "tar-opts:" "add-module:" "nogitversion")
 OPT="$(getopt -o "$(printf "%s," "${OPTS[@]}")" -l "$(printf "%s," "${OPTL[@]}")" --  "${ARGUMENT[@]}")" || exit 1
 
 eval set -- "${OPT}"
@@ -1064,14 +1059,6 @@ unset OPT OPTS OPTL DEFAULT_ARGUMENT
 
 while true; do
     case "${1}" in
-        -a | --arch)
-            arch="${2}"
-            shift 2
-            ;;
-        -b | --boot-splash)
-            boot_splash=true
-            shift 1
-            ;;
         -c | --comp-type)
             case "${2}" in
                 "gzip" | "lzma" | "lzo" | "lz4" | "xz" | "zstd") sfs_comp="${2}" ;;
@@ -1079,21 +1066,6 @@ while true; do
             esac
             shift 2
             ;;
-        -d | --debug)
-            debug=true
-            shift 1
-            ;;
-        -e | --cleaning | --cleanup)
-            cleaning=true
-            shift 1
-            ;;
-        -g | --gpgkey)
-            gpg_key="${2}"
-            shift 2
-            ;;
-        -h | --help)
-            _usage 0
-            ;;
         -j | --japanese)
             msg_error "This option is obsolete in AlterISO 3. To use Japanese, use \"-l ja\"." "1"
             ;;
@@ -1102,23 +1074,11 @@ while true; do
             kernel="${2}"
             shift 2
             ;;
-        -l | --lang)
-            locale_name="${2}"
-            shift 2
-            ;;
-        -o | --out)
-            out_dir="${2}"
-            shift 2
-            ;;
         -p | --password)
             customized_password=true
             password="${2}"
             shift 2
             ;;
-        -r | --tarball)
-            tarball=true
-            shift 1
-            ;;
         -t | --comp-opts)
             if [[ "${2}" = "reset" ]]; then
                 sfs_comp_opt=()
@@ -1132,106 +1092,17 @@ while true; do
             username="$(echo -n "${2}" | sed 's/ //g' | tr '[:upper:]' '[:lower:]')"
             shift 2
             ;;
-        -w | --work)
-            work_dir="${2}"
-            shift 2
-            ;;
-        -x | --bash-debug)
-            debug=true
-            bash_debug=true
-            shift 1
-            ;;
-        --noconfirm)
-            noconfirm=true
-            shift 1
-            ;;
-        --confirm)
-            noconfirm=false
-            shift 1
-            ;;
-        --nodepend)
-            nodepend=true
-            shift 1
-            ;;
-        --nocolor)
-            nocolor=true
-            shift 1
-            ;;
-        --gitversion)
-            if [[ -d "${script_path}/.git" ]]; then
-                gitversion=true
-            else
-                msg_error "There is no git directory. You need to use git clone to use this feature." "1"
-            fi
-            shift 1
-            ;;
-        --msgdebug)
-            msgdebug=true;
-            shift 1
-            ;;
-        --noloopmod)
-            noloopmod=true
-            shift 1
-            ;;
-        --noiso)
-            noiso=true
-            shift 1
-            ;;
-        --noaur)
-            noaur=true
-            shift 1
-            ;;
-        --nochkver)
-            nochkver=true
-            shift 1
-            ;;
         --nodebug)
             debug=false
             msgdebug=false
             bash_debug=false
             shift 1
             ;;
-        --noefi)
-            noefi=true
-            shift 1
-            ;;
-        --channellist)
-            show_channel_list
-            exit 0
-            ;;
-        --config)
-            source "${2}"
-            shift 2
-            ;;
-        --pacman-debug)
-            pacman_debug=true
-            shift 1
-            ;;
-        --nosigcheck)
-            nosigcheck=true
-            shift 1
-            ;;
-        --normwork)
-            normwork=true
-            shift 1
-            ;;
-        --log)
-            logging=true
-            shift 1
-            ;;
         --logpath)
             logging="${2}"
             customized_logpath=true
             shift 2
             ;;
-        --nolog)
-            logging=false
-            shift 1
-            ;;
-        --nopkgbuild)
-            nopkgbuild=true
-            shift 1
-            ;;
         --tar-type)
             case "${2}" in
                 "gzip" | "lzma" | "lzo" | "lz4" | "xz" | "zstd") tar_comp="${2}" ;;
@@ -1243,10 +1114,43 @@ while true; do
             IFS=" " read -r -a tar_comp_opt <<< "${2}"
             shift 2
             ;;
-        --)
-            shift
-            break
+        --add-module)
+            readarray -t -O "${#additional_modules[@]}" additional_modules < <(echo "${2}" | tr "," "\n")
+            msg_debug "Added modules: ${additional_modules[*]}"
+            shift 2
             ;;
+        -g | --gpgkey               ) gpg_key="${2}"     && shift 2 ;;
+        -h | --help                 ) _usage 0                      ;;
+        -a | --arch                 ) arch="${2}"        && shift 2 ;;
+        -d | --debug                ) debug=true         && shift 1 ;;
+        -e | --cleaning | --cleanup ) cleaning=true      && shift 1 ;;
+        -b | --boot-splash          ) boot_splash=true   && shift 1 ;;
+        -l | --lang                 ) locale_name="${2}" && shift 2 ;;
+        -o | --out                  ) out_dir="${2}"     && shift 2 ;;
+        -r | --tarball              ) tarball=true       && shift 1 ;;
+        -w | --work                 ) work_dir="${2}"    && shift 2 ;;
+        -x | --bash-debug           ) bash_debug=true    && shift 1 ;;
+        --gitversion                ) gitversion=true    && shift 1 ;;
+        --noconfirm                 ) noconfirm=true     && shift 1 ;;
+        --confirm                   ) noconfirm=false    && shift 1 ;;
+        --nodepend                  ) nodepend=true      && shift 1 ;;
+        --nocolor                   ) nocolor=true       && shift 1 ;;
+        --msgdebug                  ) msgdebug=true      && shift 1 ;;
+        --noloopmod                 ) noloopmod=true     && shift 1 ;;
+        --noiso                     ) noiso=true         && shift 1 ;;
+        --noaur                     ) noaur=true         && shift 1 ;;
+        --nochkver                  ) nochkver=true      && shift 1 ;;
+        --noefi                     ) noefi=true         && shift 1 ;;
+        --channellist               ) show_channel_list  && exit 0  ;;
+        --config                    ) source "${2}"      && shift 2 ;;
+        --pacman-debug              ) pacman_debug=true  && shift 1 ;;
+        --nosigcheck                ) nosigcheck=true    && shift 1 ;;
+        --normwork                  ) normwork=true      && shift 1 ;;
+        --log                       ) logging=true       && shift 1 ;;
+        --nolog                     ) logging=false      && shift 1 ;;
+        --nopkgbuild                ) nopkgbuild=true    && shift 1 ;;
+        --nogitversion              ) gitversion=false   && shift 1 ;;
+        --                          ) shift 1            && break   ;;
         *)
             msg_error "Argument exception error '${1}'"
             msg_error "Please report this error to the developer." 1
@@ -1298,7 +1202,6 @@ for _dir in build_dir cache_dir airootfs_dir isofs_dir lockfile_dir out_dir; do
     eval "${_dir}=\"$(realpath "$(eval "echo \$${_dir}")")\""
 done
 
-
 # Set for special channels
 if [[ -d "${channel_dir}.add" ]]; then
     channel_name="${1}"
@@ -1319,8 +1222,6 @@ if [[ ! "$(bash "${tools_dir}/channel.sh" --version "${alteriso_version}" ver "$
     fi
 fi
 
-set -eu
-
 prepare_env
 prepare_build
 show_settings
diff --git a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome
index 339806974..86e82c7af 100644
--- a/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome
+++ b/channels/gnome/airootfs.any/etc/dconf/db/local.d/01-alter-gnome
@@ -67,25 +67,15 @@ app-picker-view=uint32 0
 disabled-extensions=['window-list@gnome-shell-extensions.gcampax.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'places-menu@gnome-shell-extensions.gcampax.github.com', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', 'apps-menu@gnome-shell-extensions.gcampax.github.com']
 enabled-extensions=['extensions@abteil.org', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'dash-to-panel@jderose9.github.com', 'ding@rastersoft.com', 'CoverflowAltTab@palatis.blogspot.com', 'workspace-indicator@gnome-shell-extensions.gcampax.github.com', 'windowsNavigator@gnome-shell-extensions.gcampax.github.com', 'horizontal-workspaces@gnome-shell-extensions.gcampax.github.com', 'CoverflowAltTab@dmo60.de', 'arcmenu@arcmenu.com', 'clipboard-indicator@tudmotu.com', 'appindicatorsupport@rgcjonas.gmail.com']
 favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'medit.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'gnome-control-center.desktop']
+welcome-dialog-last-shown-version='999999999'
 
 [org/gnome/shell/extensions/arc-menu]
-application-shortcuts-list=[['Software', 'system-software-install-symbolic', 'ArcMenu_Software'], ['Settings', 'preferences-system-symbolic', 'gnome-control-center.desktop'], ['Tweaks', 'org.gnome.tweaks-symbolic', 'org.gnome.tweaks.desktop'], ['Terminal', 'utilities-terminal-symbolic', 'org.gnome.Terminal.desktop']]
-arc-menu-placement='DTD'
 button-icon-padding=0
-custom-menu-button-icon='/usr/share/icons/hicolor/128x128/apps/alter.png'
-custom-menu-button-icon-size=24.0
-disable-activities-button=true
-disable-tooltips=false
 dtp-dtd-state=[true, true]
-enable-custom-arc-menu=false
 enable-menu-button-arrow=false
-menu-button-icon='Custom_Icon'
-pinned-app-list=['Chromium', 'chromium', 'chromium.desktop', 'LibreOffice', 'libreoffice-startcenter', 'libreoffice-startcenter.desktop', 'VLC Media Player', 'vlc', 'vlc.desktop', 'System Monitor', 'org.gnome.SystemMonitor', 'gnome-system-monitor.desktop', 'Terminal', 'org.gnome.Terminal', 'org.gnome.Terminal.desktop', 'Settings', 'org.gnome.Settings', 'gnome-control-center.desktop']
 position-in-panel='Left'
 recently-installed-apps=@as []
 show-external-devices=true
-show-lock-button=false
-show-logout-button=false
 show-suspend-button=false
 
 [org/gnome/shell/extensions/arcmenu]
@@ -105,6 +95,7 @@ enable-sub-menus=false
 extra-categories=[(0, true), (1, true), (2, true), (3, true), (4, false)]
 menu-button-icon='Custom_Icon'
 menu-height=550
+menu-hotkey='Super_L'
 menu-layout='Windows'
 menu-width=290
 pinned-app-list=['Chromium', '', 'chromium.desktop', 'Thunderbird', '', 'thunderbird.desktop', 'LibreOffice Writer', '', 'libreoffice-writer.desktop', 'LibreOffice Impress', '', 'libreoffice-impress.desktop', 'LibreOffice Calc', '', 'libreoffice-calc.desktop', 'System Monitor', '', 'gnome-system-monitor.desktop', 'Extensions', '', 'org.gnome.Extensions.desktop', 'VLC media player', '', 'vlc.desktop', 'medit', '', 'medit.desktop']
@@ -136,23 +127,30 @@ position='Bottom'
 switcher-style='Timeline'
 
 [org/gnome/shell/extensions/dash-to-panel]
-appicon-margin=4
+animate-appicon-hover-animation-extent={'RIPPLE': 4, 'PLANK': 4, 'SIMPLE': 1}
+appicon-padding=4
 available-monitors=[0]
 dot-position='BOTTOM'
 group-apps=true
 hotkeys-overlay-combo='TEMPORARILY'
 intellihide=false
 isolate-workspaces=true
-panel-element-positions='{"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"activitiesButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":true,"position":"stackedBR"}]}'
+leftbox-padding=-1
+panel-anchors='{"0":"MIDDLE"}'
+panel-element-positions='{"0":[{"element":"showAppsButton","visible":false,"position":"stackedTL"},{"element":"leftBox","visible":true,"position":"stackedTL"},{"element":"activitiesButton","visible":true,"position":"stackedTL"},{"element":"taskbar","visible":true,"position":"stackedTL"},{"element":"centerBox","visible":true,"position":"stackedBR"},{"element":"rightBox","visible":true,"position":"stackedBR"},{"element":"systemMenu","visible":true,"position":"stackedBR"},{"element":"dateMenu","visible":true,"position":"stackedBR"},{"element":"desktopButton","visible":true,"position":"stackedBR"}]}'
+panel-lengths='{"0":100}'
 panel-positions='{"0":"BOTTOM"}'
-panel-size=32
+panel-sizes='{"0":32}'
 secondarymenu-contains-showdetails=true
 show-appmenu=false
 show-apps-icon-file=''
+status-icon-padding=-1
 stockgs-keep-dash=true
 stockgs-keep-top-panel=false
 stockgs-panelbtn-click-only=false
 taskbar-locked=false
+tray-padding=-1
+window-preview-title-position='TOP'
 
 [org/gnome/shell/extensions/ding]
 icon-size='small'
diff --git a/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh b/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh
index c5f60decf..e1c5b261e 100755
--- a/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh
+++ b/channels/gnome/airootfs.any/root/customize_airootfs_gnome.sh
@@ -26,3 +26,10 @@ function remove_userfile() {
 }
 remove_userfile "Desktop/calamares.desktop"
 #remove_userfile ".config/autostart/genicon.desktop"
+
+# Optimize for i686
+if [[ "${arch}" = "i686" ]]; then
+    for _file in "/etc/dconf/db/local.d/01-alter-gnome" "/etc/dconf/db/local.d/02-live-installer-panel"; do
+        sed -i "s|chromium.desktop|firefox.desktop|g; s|Chromium|FireFox|g; s|chromium|firefox|g" "${_file}"
+    done
+fi
diff --git a/channels/gnome/architecture b/channels/gnome/architecture
index 84d09d348..664761fd1 100644
--- a/channels/gnome/architecture
+++ b/channels/gnome/architecture
@@ -8,3 +8,4 @@
 # Supported architecture list
 
 x86_64
+i686
diff --git a/channels/gnome/packages.i686/exclude b/channels/gnome/packages.i686/exclude
new file mode 100644
index 000000000..3400aad36
--- /dev/null
+++ b/channels/gnome/packages.i686/exclude
@@ -0,0 +1,3 @@
+xf86-input-synaptics
+alterlinux-medit-themes
+medit
diff --git a/channels/gnome/packages.i686/gedit.i686 b/channels/gnome/packages.i686/gedit.i686
new file mode 100644
index 000000000..6b164e17c
--- /dev/null
+++ b/channels/gnome/packages.i686/gedit.i686
@@ -0,0 +1,11 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+gedit
diff --git a/channels/gnome/packages.i686/gnome-extensions.i686 b/channels/gnome/packages.i686/gnome-extensions.i686
new file mode 100644
index 000000000..03488315e
--- /dev/null
+++ b/channels/gnome/packages.i686/gnome-extensions.i686
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Gnome extensions
+
+gnome-shell-extension-appindicator
diff --git a/channels/gnome/packages.i686/gnome.i686 b/channels/gnome/packages.i686/gnome.i686
new file mode 100644
index 000000000..d43932e08
--- /dev/null
+++ b/channels/gnome/packages.i686/gnome.i686
@@ -0,0 +1,58 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Gnome
+
+
+#-- gnome --#
+gnome-backgrounds
+gnome-boxes
+gnome-calculator
+gnome-calendar
+gnome-control-center
+gnome-common
+gnome-desktop
+gnome-disk-utility
+gnome-keyring
+gnome-logs
+gnome-menus
+gnome-remote-desktop
+gnome-screenshot
+gnome-session
+gnome-settings-daemon
+gnome-shell
+gnome-shell-extensions
+gnome-system-monitor
+gnome-terminal
+mutter
+nautilus
+sushi
+
+
+#-- gnome-extra --#
+dconf-editor
+gnome-tweaks
+
+
+#-- Display manager --#
+gdm
+
+#-- other --#
+gnome-bluetooth
+gnome-epub-thumbnailer
+
+#aur build
+meson
+ninja
+jq
+oniguruma
+
+# libinput
+xf86-input-libinput
+
diff --git a/channels/gnome/packages.i686/gtk-icon-theme.i686 b/channels/gnome/packages.i686/gtk-icon-theme.i686
new file mode 100644
index 000000000..12d9ce753
--- /dev/null
+++ b/channels/gnome/packages.i686/gtk-icon-theme.i686
@@ -0,0 +1,16 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# look and feel
+
+# icon
+papirus-icon-theme
+
+# theme
+materia-gtk-theme
diff --git a/channels/gnome/packages_aur.i686/gnome-extensions.i686 b/channels/gnome/packages_aur.i686/gnome-extensions.i686
new file mode 100644
index 000000000..961b6f533
--- /dev/null
+++ b/channels/gnome/packages_aur.i686/gnome-extensions.i686
@@ -0,0 +1,20 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Gnome extensions
+
+chrome-gnome-shell
+
+gnome-shell-extension-arc-menu
+gnome-shell-extension-clipboard-indicator
+gnome-shell-extension-coverflow-alt-tab
+gnome-shell-extension-dash-to-panel
+gnome-shell-extension-desktop-icons-ng
+gnome-shell-extension-extensions
+#gnome-shell-extension-topicons-redux
diff --git a/channels/gnome/packages_aur.i686/wallpapers.i686 b/channels/gnome/packages_aur.i686/wallpapers.i686
new file mode 100644
index 000000000..67eb9b097
--- /dev/null
+++ b/channels/gnome/packages_aur.i686/wallpapers.i686
@@ -0,0 +1,12 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+#-- wallpaper --#
+alterlinux-wallpapers
diff --git a/default.conf b/default.conf
index 619c932fc..2fbf5086c 100644
--- a/default.conf
+++ b/default.conf
@@ -285,6 +285,11 @@ gitversion=false
 # This setting cannot be changed by an argument.
 additional_exclude_pkg=()
 
+# Additional list of modules to load
+# Use this array for debugging only
+# This setting cannot be changed by an argument.
+additional_modules=()
+
 # Run with tee command
 # Set to "false" to disable logging
 # If not false, the log will be saved in the specified path.
diff --git a/docs/README.md b/docs/README.md
index dca7676e1..07772b589 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -60,28 +60,35 @@
 </b>
 
 <h2>〈Overview〉</h2>
-
 Alter Linux is a new OS developed based on Arch Linux.<br>
 Check the <a href="https://github.com/orgs/FascodeNet/projects/2">project board</a> for the latest status of Alter Linux.<br>
 Please see the <a href="https://fascode.net/projects/linux/alter/">official website</a> for information on announcements and bugs for users.
 
+<h2>〈Download〉</h2>
+The image file can be downloaded from the official <a href="https://fascode.net/projects/linux/alter/#downloads">website</a>.
+<br>
+<b>We are looking for a mirror server provider for repositories and image file distribution.</b>
+<br>
+If you would like us to provide a mirror please contact the developer's Twitter.
+
+<h2>〈Screenshots〉</h2>
 <h3>Xfce</h3>
-<img src="../images/screenshot/desktop-xfce.png" alt="screenshot">
+<img src="../images/screenshot/desktop-xfce.png" alt="screenshot" width="50%">
 
 <h3>Plasma</h3>
-<img src="../images/screenshot/desktop-plasma.png" alt="screenshot">
+<img src="../images/screenshot/desktop-plasma.png" alt="screenshot" width="50%">
 
 <h3>Lxde</h3>
-<img src="../images/screenshot/desktop-lxde.png" alt="screenshot">
+<img src="../images/screenshot/desktop-lxde.png" alt="screenshot" width="50%">
 
 <h3>Gnome</h3>
-<img src="../images/screenshot/desktop-gnome.png" alt="screenshot">
+<img src="../images/screenshot/desktop-gnome.png" alt="screenshot" width="50%">
 
 <h3>Cinnamon</h3>
-<img src="../images/screenshot/desktop-cinnamon.png" alt="screenshot">
+<img src="../images/screenshot/desktop-cinnamon.png" alt="screenshot" width="50%">
 
 <h3>i3wm</h3>
-<img src="../images/screenshot/desktop-i3wm.png" alt="screenshot">
+<img src="../images/screenshot/desktop-i3wm.png" alt="screenshot" width="50%">
 
 <h2>〈Feature〉</h2>
 <ul>
@@ -95,13 +102,6 @@ Please see the <a href="https://fascode.net/projects/linux/alter/">official webs
     <li>Easy development of derived OS by framework based on archiso</li>
 </ul>
 
-<h2>〈Download〉</h2>
-The image file can be downloaded from the official <a href="https://fascode.net/projects/linux/alter/#downloads">website</a>.
-<br>
-<b>We are looking for a mirror server provider for repositories and image file distribution.</b>
-<br>
-If you would like us to provide a mirror please contact the developer's Twitter.
-
 <h2>〈Branch〉</h2>
 These are a list of major branches. Other branches are temporary or used for specific purposes.
 
diff --git a/docs/README_jp.md b/docs/README_jp.md
index 875cc64be..24f0d27c7 100644
--- a/docs/README_jp.md
+++ b/docs/README_jp.md
@@ -57,28 +57,35 @@
 </table>
 
 <h2>〈概要〉</h2>
-
 Alter LinuxはArch Linuxをベースに開発されている新しいOSです。<br>
 Alter Linuxの最新の開発状況は<a href="https://github.com/orgs/FascodeNet/projects/2">プロジェクトボード</a>を確認してください。<br>
 ユーザ向けのアナウンスや不具合等の情報は<a href="https://fascode.net/projects/linux/alter/">公式サイト</a>をご覧ください。
 
+<h2>〈ダウンロード〉</h2>
+イメージファイルは<a href="https://fascode.net/projects/linux/alter/#downloads">公式サイト</a>からダウンロードできます。
+<br>
+<b>私達はリポジトリやイメージファイル配布用のミラーサーバ提供者を募集しております。</b>
+<br>
+もし私達にミラーを提供して頂ける場合は開発者のTwitterまでお願いします。
+
+<h2>〈Screenshots〉</h2>
 <h3>Xfce</h3>
-<img src="../images/screenshot/desktop-xfce.png" alt="screenshot">
+<img src="../images/screenshot/desktop-xfce.png" alt="screenshot" width="50%">
 
 <h3>Plasma</h3>
-<img src="../images/screenshot/desktop-plasma.png" alt="screenshot">
+<img src="../images/screenshot/desktop-plasma.png" alt="screenshot" width="50%">
 
 <h3>Lxde</h3>
-<img src="../images/screenshot/desktop-lxde.png" alt="screenshot">
+<img src="../images/screenshot/desktop-lxde.png" alt="screenshot" width="50%">
 
 <h3>Gnome</h3>
-<img src="../images/screenshot/desktop-gnome.png" alt="screenshot">
+<img src="../images/screenshot/desktop-gnome.png" alt="screenshot" width="50%">
 
 <h3>Cinnamon</h3>
-<img src="../images/screenshot/desktop-cinnamon.png" alt="screenshot">
+<img src="../images/screenshot/desktop-cinnamon.png" alt="screenshot" width="50%">
 
 <h3>i3wm</h3>
-<img src="../images/screenshot/desktop-i3wm.png" alt="screenshot">
+<img src="../images/screenshot/desktop-i3wm.png" alt="screenshot" width="50%">
 
 <h2>〈特徴〉</h2>
 <ul>
@@ -93,14 +100,6 @@ Alter Linuxの最新の開発状況は<a href="https://github.com/orgs/FascodeNe
     <li>archisoをベースとしたフレームワークにより簡単に派生OSを開発できます</li>
 </ul>
 
-<h2>〈ダウンロード〉</h2>
-イメージファイルは<a href="https://fascode.net/projects/linux/alter/#downloads">公式サイト</a>からダウンロードできます。
-<br>
-<b>私達はリポジトリやイメージファイル配布用のミラーサーバ提供者を募集しております。</b>
-<br>
-もし私達にミラーを提供して頂ける場合は開発者のTwitterまでお願いします。
-
-
 <h2>〈ブランチ〉</h2>
 主要なブランチは以下のとおりです。これ以外のブランチは一時的なものや特定の用途で使われているものです。
 
diff --git a/modules/gdm/airootfs.any/root/customize_airootfs_gdm.sh b/modules/gdm/airootfs.any/root/customize_airootfs_gdm.sh
index 17da72338..a2fdad13e 100755
--- a/modules/gdm/airootfs.any/root/customize_airootfs_gdm.sh
+++ b/modules/gdm/airootfs.any/root/customize_airootfs_gdm.sh
@@ -9,9 +9,10 @@
 
 # Enable gdm to auto login
 if [[ "${boot_splash}" =  true ]]; then
-    systemctl enable gdm-plymouth.service
+    _safe_systemctl enable gdm-plymouth.service
+    
 else
-    systemctl enable gdm.service
+    _safe_systemctl enable gdm.service
 fi
 
 
diff --git a/modules/kmscon/airootfs.any/etc/fonts/conf.d/99-kmscon.conf b/modules/kmscon/airootfs.any/etc/fonts/conf.d/99-kmscon.conf
new file mode 100644
index 000000000..1a2a8485d
--- /dev/null
+++ b/modules/kmscon/airootfs.any/etc/fonts/conf.d/99-kmscon.conf
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<match>
+    <test name="family"><string>monospace</string></test>
+    <edit name="family" mode="prepend" binding="strong">
+        <string>SauceCodePro Nerd Font Mono</string>
+        <string>DejaVu Sans Mono</string>
+        <string>IPAGothic</string>
+    </edit>
+</match>
+</fontconfig>
diff --git a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh
new file mode 100755
index 000000000..894d082a8
--- /dev/null
+++ b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+# Copy config file for getty@.service to kmsconvt@.service
+if [[ -f "/etc/systemd/system/getty@.service.d/autologin.conf" ]]; then
+    mkdir -p "/etc/systemd/system/kmsconvt@.service.d/"
+    cp "/etc/systemd/system/getty@.service.d/autologin.conf" "/etc/systemd/system/kmsconvt@.service.d/autologin.conf" 
+fi
+
+# Disable default tty
+_safe_systemctl disable "getty@tty1.service" "getty@.service"
+_safe_systemctl enable "kmsconvt@tty1.service"
+_safe_systemctl enable "kmsconvt@tty2.service"
+
+
+# Do not run setterm
+remove /etc/profile.d/disable-beep.sh
+
+# Run KMSCON for all tty
+ln -s "/usr/lib/systemd/system/kmsconvt@.service" "/etc/systemd/system/autovt@.service"
diff --git a/modules/kmscon/alteriso b/modules/kmscon/alteriso
new file mode 100644
index 000000000..9e793f364
--- /dev/null
+++ b/modules/kmscon/alteriso
@@ -0,0 +1 @@
+alteriso=3.1
diff --git a/modules/kmscon/architecture b/modules/kmscon/architecture
new file mode 100644
index 000000000..84d09d348
--- /dev/null
+++ b/modules/kmscon/architecture
@@ -0,0 +1,10 @@
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Supported architecture list
+
+x86_64
diff --git a/modules/kmscon/packages.i686/kmscon.x86_64 b/modules/kmscon/packages.i686/kmscon.x86_64
new file mode 100644
index 000000000..4b04eb38a
--- /dev/null
+++ b/modules/kmscon/packages.i686/kmscon.x86_64
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# kmscon packages
+
+#-- kmscon --#
+kmscon
diff --git a/modules/kmscon/packages.x86_64/kmscon.x86_64 b/modules/kmscon/packages.x86_64/kmscon.x86_64
new file mode 100644
index 000000000..4b04eb38a
--- /dev/null
+++ b/modules/kmscon/packages.x86_64/kmscon.x86_64
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# kmscon packages
+
+#-- kmscon --#
+kmscon
diff --git a/modules/kmscon/packages_aur.i686/kmscon.x86_64 b/modules/kmscon/packages_aur.i686/kmscon.x86_64
new file mode 100644
index 000000000..26d6099c2
--- /dev/null
+++ b/modules/kmscon/packages_aur.i686/kmscon.x86_64
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# kmscon packages
+
+#-- Fonts --#
+nerd-fonts-source-code-pro
diff --git a/modules/kmscon/packages_aur.x86_64/kmscon.x86_64 b/modules/kmscon/packages_aur.x86_64/kmscon.x86_64
new file mode 100644
index 000000000..26d6099c2
--- /dev/null
+++ b/modules/kmscon/packages_aur.x86_64/kmscon.x86_64
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# kmscon packages
+
+#-- Fonts --#
+nerd-fonts-source-code-pro
diff --git a/modules/pipewire/airootfs.any/root/customize_airootfs_pipewire.sh b/modules/pipewire/airootfs.any/root/customize_airootfs_pipewire.sh
index 12f037f7e..ba14a7036 100644
--- a/modules/pipewire/airootfs.any/root/customize_airootfs_pipewire.sh
+++ b/modules/pipewire/airootfs.any/root/customize_airootfs_pipewire.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Pipewire
-# Do not use _systemd_service because pipewire services are not system but user
+# Do not use _safe_systemctl because pipewire services are not system but user
 # Use flag "--user --global"
 # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/923
 for _service in "pipewire.service" "pipewire-pulse.service"; do
diff --git a/modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh b/modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh
index ee7d09e04..5fc6aa80f 100644
--- a/modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh
+++ b/modules/share-extra/airootfs.any/root/customize_airootfs_share-extra.sh
@@ -9,23 +9,23 @@
 
 # Bluetooth
 rfkill unblock all
-_systemd_service enable bluetooth
+_safe_systemctl enable bluetooth
 
 # Snap
-_systemd_service enable snapd.apparmor.service
-_systemd_service enable apparmor.service
-_systemd_service enable snapd.socket
-_systemd_service enable snapd.service
-_systemd_service enable ufw.service
+_safe_systemctl enable snapd.apparmor.service
+_safe_systemctl enable apparmor.service
+_safe_systemctl enable snapd.socket
+_safe_systemctl enable snapd.service
+_safe_systemctl enable ufw.service
 
 
 # Added autologin group to auto login
-groupadd autologin
+_groupadd autologin
 usermod -aG autologin ${username}
 
 
 # ntp
-_systemd_service enable systemd-timesyncd.service
+_safe_systemctl enable systemd-timesyncd.service
 
 
 # Update system datebase
diff --git a/modules/share-extra/airootfs.i686/etc/pacman.conf b/modules/share-extra/airootfs.i686/etc/pacman.conf
index b1af70b3c..4fc90941a 100644
--- a/modules/share-extra/airootfs.i686/etc/pacman.conf
+++ b/modules/share-extra/airootfs.i686/etc/pacman.conf
@@ -37,7 +37,7 @@ Architecture = i686
 
 # Misc options
 #UseSyslog
-#Color
+Color
 #NoProgressBar
 CheckSpace
 #VerbosePkgLists
diff --git a/modules/share-extra/airootfs.x86_64/etc/pacman.conf b/modules/share-extra/airootfs.x86_64/etc/pacman.conf
index 8510b39a4..fa97c89ce 100644
--- a/modules/share-extra/airootfs.x86_64/etc/pacman.conf
+++ b/modules/share-extra/airootfs.x86_64/etc/pacman.conf
@@ -37,7 +37,7 @@ Architecture = auto
 
 # Misc options
 #UseSyslog
-#Color
+Color
 #NoProgressBar
 CheckSpace
 #VerbosePkgLists
diff --git a/modules/share-extra/packages.i686/disk_management.i686 b/modules/share-extra/packages.i686/disk_management.i686
index d0a40f2df..be5d1ef90 100644
--- a/modules/share-extra/packages.i686/disk_management.i686
+++ b/modules/share-extra/packages.i686/disk_management.i686
@@ -9,14 +9,16 @@
 #
 # Disk management
 
+#-- GUI --#
+#baobab
+#gnome-disk-utility
+#gparted
 
-baobab
+#-- CLI --#
 clonezilla
 ddrescue
 dmraid
 fsarchiver
-gnome-disk-utility
-gparted
 gptfdisk
 hdparm
 lvm2
diff --git a/modules/share-extra/packages.x86_64/disk_management.x86_64 b/modules/share-extra/packages.x86_64/disk_management.x86_64
index d0a40f2df..be5d1ef90 100644
--- a/modules/share-extra/packages.x86_64/disk_management.x86_64
+++ b/modules/share-extra/packages.x86_64/disk_management.x86_64
@@ -9,14 +9,16 @@
 #
 # Disk management
 
+#-- GUI --#
+#baobab
+#gnome-disk-utility
+#gparted
 
-baobab
+#-- CLI --#
 clonezilla
 ddrescue
 dmraid
 fsarchiver
-gnome-disk-utility
-gparted
 gptfdisk
 hdparm
 lvm2
diff --git a/modules/share/airootfs.any/root/customize_airootfs.sh b/modules/share/airootfs.any/root/customize_airootfs.sh
index 885810e5e..e0516aac9 100755
--- a/modules/share/airootfs.any/root/customize_airootfs.sh
+++ b/modules/share/airootfs.any/root/customize_airootfs.sh
@@ -157,19 +157,19 @@ run_additional_command "gtk-update-icon-cache -f /usr/share/icons/hicolor"
 
 
 # Enable graphical.
-_systemd_service set-default graphical.target
+_safe_systemctl set-default graphical.target
 
 
 # Enable services.
-_systemd_service enable pacman-init.service
-_systemd_service enable cups.service
-_systemd_service enable NetworkManager.service
-_systemd_service enable alteriso-reflector.service
-_systemd_service disable reflector.service
+_safe_systemctl enable pacman-init.service
+_safe_systemctl enable cups.service
+_safe_systemctl enable NetworkManager.service
+_safe_systemctl enable alteriso-reflector.service
+_safe_systemctl disable reflector.service
 
 
 # TLP
 # See ArchWiki for details.
-_systemd_service enable tlp.service
-_systemd_service mask systemd-rfkill.service
-_systemd_service mask systemd-rfkill.socket
+_safe_systemctl enable tlp.service
+_safe_systemctl mask systemd-rfkill.service
+_safe_systemctl mask systemd-rfkill.socket
diff --git a/modules/share/airootfs.any/root/functions.sh b/modules/share/airootfs.any/root/functions.sh
index 00f248177..99691c00a 100644
--- a/modules/share/airootfs.any/root/functions.sh
+++ b/modules/share/airootfs.any/root/functions.sh
@@ -15,7 +15,7 @@
 # Check whether true or false is assigned to the variable.
 function check_bool() {
     local
-    case $(eval echo '$'${1}) in
+    case $(eval echo '$'"${1}") in
         true | false) : ;;
                    *) echo "The value ${boot_splash} set is invalid" >&2 ;;
     esac
@@ -52,16 +52,16 @@ function installedpkg () {
     fi
 }
 
+# Add group if it does not exist
+_groupadd(){
+    cut -d ":" -f 1 < "/etc/group" | grep -qx "${1}" && return 0 || groupadd "${1}"
+}
+
 # Create a user.
 # create_user <username> <password>
 function create_user () {
-    local _password
-    local _username
+    local _username="${1-""}" _password="${2-""}"
 
-    _username=${1}
-    _password=${2}
-
-    set +u
     if [[ -z "${_username}" ]]; then
         echo "User name is not specified." >&2
         return 1
@@ -70,32 +70,37 @@ function create_user () {
         echo "No password has been specified." >&2
         return 1
     fi
-    set -u
 
     if ! user_check "${_username}"; then
-        useradd -m -s ${usershell} ${_username}
-        groupadd sudo
-        usermod -U -g ${_username} ${_username}
-        usermod -aG sudo ${_username}
-        usermod -aG storage ${_username}
-        cp -aT /etc/skel/ /home/${_username}/
+        useradd -m -s "${usershell}" "${_username}"
+        _groupadd sudo
+        usermod -U -g "${_username}" "${_username}"
+        usermod -aG sudo "${_username}"
+        usermod -aG storage "${_username}"
+        cp -aT "/etc/skel/" "/home/${_username}/"
     fi
-    chmod 700 -R /home/${_username}
-    chown ${_username}:${_username} -R /home/${_username}
-    echo -e "${_password}\n${_password}" | passwd ${_username}
+    chmod 700 -R "/home/${_username}"
+    chown "${_username}:${_username}" -R "/home/${_username}"
+    echo -e "${_password}\n${_password}" | passwd "${_username}"
     set -u
 }
 
 # systemctl helper
 # Execute the subcommand only when the specified unit is available.
-# Usage: _systemd_service <systemctl subcommand> <service1> <service2> ...
-_systemd_service(){
+# Usage: _safe_systemctl <systemctl subcommand> <service1> <service2> ...
+_safe_systemctl(){
     local _service _command="${1}"
     shift 1
     for _service in "${@}"; do
         # https://unix.stackexchange.com/questions/539147/systemctl-check-if-a-unit-service-or-target-exists
         if (( "$(systemctl list-unit-files "${_service}" | wc -l)" > 3 )); then
-            systemctl ${_command} "${_service}"
+            if [[ "${_command}" = "enable" ]]; then
+                if [[ "$(systemctl is-enabled "${_service}")" = "enabled" ]]; then
+                    systemctl enable "${_service}"
+                fi
+            else
+                systemctl "${_command}" "${_service}"
+            fi
         else
             echo "${_service} was not found" >&2
         fi
diff --git a/presets/cli-modules b/presets/cli-modules
index cb2853e90..6ddc901a7 100644
--- a/presets/cli-modules
+++ b/presets/cli-modules
@@ -1,3 +1,4 @@
 base
 share
 zsh-powerline
+#kmscon
diff --git a/system/aur.sh b/system/aur.sh
index 702b75db4..2a0de9596 100755
--- a/system/aur.sh
+++ b/system/aur.sh
@@ -90,7 +90,7 @@ if ! pacman -Qq yay 1> /dev/null 2>&1; then
 
     # Install depends
     for _pkg in "${yay_depends[@]}"; do
-        if ! pacman -Qq "${_pkg}" | grep -q "${_pkg}"; then
+        if ! pacman -Qq "${_pkg}" > /dev/null 2>&1 | grep -q "${_pkg}"; then
             pacman -S --asdeps --needed "${pacman_args[@]}" "${_pkg}"
             remove_list+=("${_pkg}")
         fi
diff --git a/system/pacman-i486.conf b/system/pacman-i486.conf
index be0a10afe..14d2e0510 100644
--- a/system/pacman-i486.conf
+++ b/system/pacman-i486.conf
@@ -44,7 +44,7 @@ Architecture = i486
 #NoProgressBar
 CheckSpace
 #VerbosePkgLists
-ParallelDownloads = 5
+ParallelDownloads = 8
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
diff --git a/system/pacman-i686.conf b/system/pacman-i686.conf
index dcce743e8..d71da2d1f 100644
--- a/system/pacman-i686.conf
+++ b/system/pacman-i686.conf
@@ -44,7 +44,7 @@ Architecture = i686
 #NoProgressBar
 CheckSpace
 #VerbosePkgLists
-ParallelDownloads = 5
+ParallelDownloads = 8
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
diff --git a/system/pacman-x86_64.conf b/system/pacman-x86_64.conf
index bd0789eb9..ce34231c8 100644
--- a/system/pacman-x86_64.conf
+++ b/system/pacman-x86_64.conf
@@ -44,7 +44,7 @@ Architecture = auto
 #NoProgressBar
 CheckSpace
 #VerbosePkgLists
-ParallelDownloads = 5
+ParallelDownloads = 8
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -88,8 +88,8 @@ Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/s/se/serene/repo/$repo/$arc
 Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
 Server = https://fascodenet.github.io/$repo/$arch/
 
-[dvzrv]
-Server = https://pkgbuild.com/~dvzrv/repo/$arch
+#[dvzrv]
+#Server = https://pkgbuild.com/~dvzrv/repo/$arch
 
 #[testing]
 #Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
diff --git a/tools/alteriso-info.sh b/tools/alteriso-info.sh
index 4c18cf295..2e005c919 100755
--- a/tools/alteriso-info.sh
+++ b/tools/alteriso-info.sh
@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && cd .. && pwd )"
 tools_dir="${script_path}/tools"
+modules=()
 
 _help() {
     echo "usage ${0} [options]"
@@ -12,7 +13,8 @@ _help() {
     echo "    -b | --boot-splash  [bool]     Set plymouth status (true or false)"
     echo "    -c | --channel      [str]      Specify the channel"
     echo "    -d | --developer    [str]      Specify the developer"
-    echo "    -k | --kernel       [srt]      Specify the kernel name"
+    echo "    -k | --kernel       [str]      Specify the kernel name"
+    echo "    -m | --module       [str]      Specity the module (Separated by \",\")"
     echo "    -o | --os-name      [str]      Specify the application name"
     echo "    -p | --password     [str]      Specify the user password for livecd"
     echo "    -u | --username     [str]      Specify the user name for livecd"
@@ -21,8 +23,8 @@ _help() {
 }
 
 # Parse options
-OPTS="a:b:c:d:k:o:p:u:v:h"
-OPTL="arch:,boot-splash:,channel:,developer:,kernel:,os-name:,password:,username:,version:,help"
+OPTS="a:b:c:d:k:m:o:p:u:v:h"
+OPTL="arch:,boot-splash:,channel:,developer:,kernel:,module:,os-name:,password:,username:,version:,help"
 if ! OPT="$(getopt -o "${OPTS}" -l "${OPTL}" -- "${@}")"; then
     exit 1
 fi
@@ -57,6 +59,10 @@ while true; do
             kernel="${2}"
             shift 2
             ;;
+        -m | --module)
+            readarray -t -O "${#modules[@]}" modules < <(echo "${2}" | tr "," "\n")
+            shift 2
+            ;;
         -o | --os-name)
             iso_application="${2}"
             shift 2
@@ -85,6 +91,7 @@ while true; do
     esac
 done
 
+# Check values
 variable_list=( "arch" "boot_splash" "channel_name" "iso_publisher" "kernel" "iso_application" "password" "username" "iso_version")
 
 error=false
@@ -109,6 +116,7 @@ echo "Live user name : ${username}"
 echo "Live user pass : ${password}"
 echo "Kernel    name : ${kernel}"
 echo "Kernel    path : ${kernel_filename}"
+[[ "${#modules[@]}" != 0 ]] && echo "Loaded modules : ${modules[*]}"
 if [[ "${boot_splash}" = true ]]; then
     echo "Plymouth       : Yes"
 else
diff --git a/tools/clean.sh b/tools/clean.sh
index 457e023f3..64b2e2593 100755
--- a/tools/clean.sh
+++ b/tools/clean.sh
@@ -58,7 +58,8 @@ remove() {
 _umount() { if mountpoint -q "${1}"; then umount -lf "${1}"; fi; }
 
 # Unmount chroot dir
-umount_chroot () { "${tools_dir}/umount.sh" -d "${work_dir}" -m 3 "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")"; }
+#umount_chroot () { "${tools_dir}/umount.sh" -d "${work_dir}" -m 3 "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")"; }
+umount_chroot () { "${tools_dir}/umount.sh" "${work_dir}" -m 3 "$([[ "${nocolor}" = true ]] && printf "%s" "--nocolor")" "$([[ "${debug}" = true ]] && printf "%s" "-d")"; }
 
 # Usage: getclm <number>
 # 標準入力から値を受けとり、引数で指定された列を抽出します。