diff --git a/create-lx-container.sh b/create-lx-container.sh
index d3acec4..b23e8eb 100755
--- a/create-lx-container.sh
+++ b/create-lx-container.sh
@@ -468,7 +468,7 @@ fi
 
 echo "   # Insert first IPv6 Address for the new LX Containers."
 echo "   #"
-echo "   # Type 'None' if no ipv6-address should be assigned"
+echo -e "   # Type \033[33mNone\033[m if no ipv6-address should be assigned"
 echo "   #"
 echo ""
 echononl "\033[1mFirst IPv6 Address:\033[m "
@@ -559,7 +559,7 @@ if [[ -n "$IPV6_ADDRESS_1" ]] ; then
    echo "   IPv6 Address (first).................: $IPV6_ADDRESS_1"
    echo "   IPv6 Gateway Address (first).........: $IPV6_GATEWAY_1"
 else
-   echo "   IPv6 Address (first).................: - Not set - "
+   echo -e "   IPv6 Address (first).................: - \033[33mNot set\033[m - "
 fi
 echo "   Netmask first IPv4 Address...........: $IPV4_NETMASK_1"
 echo "   CIDR (IPv4 Prefix) of netmask........: $IPV4_PREFIX_1"
@@ -756,7 +756,8 @@ else
 #lxc.network.ipv6.gateway = $IPV6_GATEWAY_1
 EOF
 
-EOF
+fi
+
 if [[ $? -ne 0 ]]; then
 	_failed=true
 fi
@@ -1616,7 +1617,7 @@ if [[ -f "${working_dir}/supported-files/templates_root/.profile" ]]; then
       error "$(cat $err_msg)"
    fi
 else
-	echo -e "\033[1G   [ \033[30m\033[1mskip\033[m ]  $msg"
+   echo -e "\033[1G   [ \033[30m\033[1mskip\033[m ] $msg"
 fi
 
 
@@ -1658,7 +1659,7 @@ if [[ -f "${working_dir}/supported-files/templates_root/.vimrc" ]]; then
       error "$(cat $err_msg)"
    fi
 else
-	echo -e "\033[1G   [ \033[30m\033[1mskip\033[m ]  $msg"
+   echo -e "\033[1G   [ \033[30m\033[1mskip\033[m ] $msg"
 fi
 
 
@@ -1808,7 +1809,7 @@ if [[ -f "${working_dir}/supported-files/templates_root/.ssh/authorized_keys2" ]
       error "$(cat $err_msg)"
    fi
 else
-	echo -e "\033[1G   [ \033[30m\033[1mskip\033[m ]  $msg"
+   echo -e "\033[1G   [ \033[30m\033[1mskip\033[m ] $msg"
 fi
 
 
@@ -1885,21 +1886,41 @@ if [[ $? -ne 0 ]]; then
    _failed=true
 fi
 
+if [[ "$IPV6_ADDRESS_1" ]]; then
+cat << EOF >> ${working_dir}/conf/${LXC_NAME}.conf 2>> $err_msg
+IPV6_ADDRESS_1=$IPV6_ADDRESS_1/$IPV6_PREFIX_1
+IPV6_GATEWAY_1=$IPV6_GATEWAY_1
+EOF
+   if [[ $? -ne 0 ]]; then
+      _failed=true
+   fi
+fi
+
 if $_second_ipv4 ; then
    cat << EOF >> ${working_dir}/conf/${LXC_NAME}.conf 2>> $err_msg
+
 MAC_ADDRESS_2=$MAC_ADDRESS_2
 IPV4_ADDRESS_2=$IPV4_ADDRESS_2
 IPV4_NETMASK_2=$IPV4_NETMASK_2
 IPV4_GATEWAY_2=$IPV4_GATEWAY_2
 IPV4_PREFIX_2=$IPV4_PREFIX_2
-
 EOF
-	if [[ $? -ne 0 ]]; then
-		_failed=true
-	fi
+   if [[ $? -ne 0 ]]; then
+      _failed=true
+   fi
+fi
+
+if [[ "$IPV6_ADDRESS_2" ]]; then
+cat << EOF >> ${working_dir}/conf/${LXC_NAME}.conf 2>> $err_msg
+IPV6_ADDRESS_2=$IPV6_ADDRESS_2/$IPV6_PREFIX_2
+EOF
+   if [[ $? -ne 0 ]]; then
+      _failed=true
+   fi
 fi
 
 cat << EOF >> ${working_dir}/conf/${LXC_NAME}.conf 2>> $err_msg
+
 HOSTNAME=$HOSTNAME
 FQ_HOSTNAME=$FQ_HOSTNAME
 EOF