diff --git a/install/1merge/networkmanager/default/NetworkManager b/install/1merge/networkmanager/default/NetworkManager
index 0b530d9..108046e 100644
--- a/install/1merge/networkmanager/default/NetworkManager
+++ b/install/1merge/networkmanager/default/NetworkManager
@@ -1 +1 @@
-# Calculate link=/etc/init.d/NetworkManager symbolic
+# Calculate link=/etc/init.d/NetworkManager symbolic os_install_net_setup==networkmanager
diff --git a/install/1merge/networkmanager/default/NetworkManager.remove b/install/1merge/networkmanager/default/NetworkManager.remove
new file mode 100644
index 0000000..934e4bf
--- /dev/null
+++ b/install/1merge/networkmanager/default/NetworkManager.remove
@@ -0,0 +1 @@
+# Calculate name=NetworkManager append=remove os_install_net_setup!=networkmanager&&exists(/etc/runlevels/default/NetworkManager)!=
diff --git a/install/1merge/networkmanager/system-connections/.calculate_directory b/install/1merge/networkmanager/system-connections/.calculate_directory
new file mode 100644
index 0000000..4401bf6
--- /dev/null
+++ b/install/1merge/networkmanager/system-connections/.calculate_directory
@@ -0,0 +1 @@
+# Calculate path=/etc/NetworkManager exists(/etc/NetworkManager/system-connections,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
diff --git a/install/1merge/networkmanager/system-connections/Auto_eth0 b/install/1merge/networkmanager/system-connections/Auto_eth0
new file mode 100644
index 0000000..39ff89e
--- /dev/null
+++ b/install/1merge/networkmanager/system-connections/Auto_eth0
@@ -0,0 +1,23 @@
+# Calculate name=Auto_#-list(os_install_net_interfaces,0)-# cl_chroot_status==off&&list(os_install_net_interfaces,0)!=&&os_install_net_setup==networkmanager chmod=0600
+
+[802-3-ethernet]
+duplex=full
+mac-address=#-list(os_install_net_mac,0)-#
+
+[connection]
+id=Auto_#-list(os_install_net_interfaces,0)-# 
+uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
+type=802-3-ethernet
+
+[ipv6]
+method=ignore
+
+[ipv4]
+#?list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
+method=manual
+addresses1=#-list(os_install_net_ip,0)-#;#-list(os_install_net_cidr,0)-#;#-list(os_install_net_nmroute,0)-#
+#list#
+#?list(os_install_net_dhcp_set,0)==on#
+method=auto
+!addresses1=del
+#list#
diff --git a/install/1merge/networkmanager/system-connections/Auto_eth1 b/install/1merge/networkmanager/system-connections/Auto_eth1
new file mode 100644
index 0000000..207462f
--- /dev/null
+++ b/install/1merge/networkmanager/system-connections/Auto_eth1
@@ -0,0 +1,23 @@
+# Calculate name=Auto_#-list(os_install_net_interfaces,1)-# cl_chroot_status==off&&list(os_install_net_interfaces,1)!=&&os_install_net_setup==networkmanager chmod=0600
+
+[802-3-ethernet]
+duplex=full
+mac-address=#-list(os_install_net_mac,1)-#
+
+[connection]
+id=Auto_#-list(os_install_net_interfaces,1)-# 
+uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
+type=802-3-ethernet
+
+[ipv6]
+method=ignore
+
+[ipv4]
+#?list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
+method=manual
+addresses1=#-list(os_install_net_ip,1)-#;#-list(os_install_net_cidr,1)-#;#-list(os_install_net_nmroute,1)-#
+#list#
+#?list(os_install_net_dhcp_set,1)==on#
+method=auto
+!addresses1=del
+#list#
diff --git a/install/1merge/networkmanager/system-connections/Auto_eth2 b/install/1merge/networkmanager/system-connections/Auto_eth2
new file mode 100644
index 0000000..d124518
--- /dev/null
+++ b/install/1merge/networkmanager/system-connections/Auto_eth2
@@ -0,0 +1,23 @@
+# Calculate name=Auto_#-list(os_install_net_interfaces,2)-# cl_chroot_status==off&&list(os_install_net_interfaces,2)!=&&os_install_net_setup==networkmanager chmod=0600
+
+[802-3-ethernet]
+duplex=full
+mac-address=#-list(os_install_net_mac,2)-#
+
+[connection]
+id=Auto_#-list(os_install_net_interfaces,2)-# 
+uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
+type=802-3-ethernet
+
+[ipv6]
+method=ignore
+
+[ipv4]
+#?list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
+method=manual
+addresses1=#-list(os_install_net_ip,2)-#;#-list(os_install_net_cidr,2)-#;#-list(os_install_net_nmroute,2)-#
+#list#
+#?list(os_install_net_dhcp_set,2)==on#
+method=auto
+!addresses1=del
+#list#
diff --git a/install/1merge/networkmanager/system-connections/Auto_eth3 b/install/1merge/networkmanager/system-connections/Auto_eth3
new file mode 100644
index 0000000..15820fe
--- /dev/null
+++ b/install/1merge/networkmanager/system-connections/Auto_eth3
@@ -0,0 +1,23 @@
+# Calculate name=Auto_#-list(os_install_net_interfaces,3)-# cl_chroot_status==off&&list(os_install_net_interfaces,3)!=&&os_install_net_setup==networkmanager chmod=0600
+
+[802-3-ethernet]
+duplex=full
+mac-address=#-list(os_install_net_mac,3)-#
+
+[connection]
+id=Auto_#-list(os_install_net_interfaces,3)-# 
+uuid=#-rnd(uuid,8)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,4)-#-#-rnd(uuid,12)-#
+type=802-3-ethernet
+
+[ipv6]
+method=ignore
+
+[ipv4]
+#?list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
+method=manual
+addresses1=#-list(os_install_net_ip,3)-#;#-list(os_install_net_cidr,3)-#;#-list(os_install_net_nmroute,3)-#
+#list#
+#?list(os_install_net_dhcp_set,3)==on#
+method=auto
+!addresses1=del
+#list#
diff --git a/install/1merge/openrc/conf.d/net b/install/1merge/openrc/conf.d/net
index 5ec8d3c..7f28609 100644
--- a/install/1merge/openrc/conf.d/net
+++ b/install/1merge/openrc/conf.d/net
@@ -1,19 +1,19 @@
 # Calculate comment=# exists(/etc/conf.d/net,root)==&&cl_chroot_status==off&&os_install_root_type!=livecd||ac_install_system==up
 
-#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on#
-config_#-list(os_install_net_interfaces,0)-#=( "#-list(os_install_net_ip,0)-# netmask #-list(os_install_net_mask,0)-#" )
+#?list(os_install_net_interfaces,0)!=&&list(os_install_net_dhcp_set,0)!=on&&list(os_install_net_ip,0)!=#
+config_#-list(os_install_net_interfaces,0)-#=( "#-list(os_install_net_ip,0)-#/#-list(os_install_net_cidr,0)-#" )
 routes_#-list(os_install_net_interfaces,0)-#="#-list(os_install_net_route,0)-#"
 #list#
-#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on#
-config_#-list(os_install_net_interfaces,1)-#=( "#-list(os_install_net_ip,1)-# netmask #-list(os_install_net_mask,1)-#" )
+#?list(os_install_net_interfaces,1)!=&&list(os_install_net_dhcp_set,1)!=on&&list(os_install_net_ip,1)!=#
+config_#-list(os_install_net_interfaces,1)-#=( "#-list(os_install_net_ip,1)-#/#-list(os_install_net_cidr,1)-#" )
 routes_#-list(os_install_net_interfaces,1)-#="#-list(os_install_net_route,1)-#"
 #list#
-#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on#
-config_#-list(os_install_net_interfaces,2)-#=( "#-list(os_install_net_ip,2)-# netmask #-list(os_install_net_mask,2)-#" )
+#?list(os_install_net_interfaces,2)!=&&list(os_install_net_dhcp_set,2)!=on&&list(os_install_net_ip,2)!=#
+config_#-list(os_install_net_interfaces,2)-#=( "#-list(os_install_net_ip,2)-#/#-list(os_install_net_cidr,2)-#" )
 routes_#-list(os_install_net_interfaces,2)-#="#-list(os_install_net_route,2)-#"
 #list#
-#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on#
-config_#-list(os_install_net_interfaces,3)-#=( "#-list(os_install_net_ip,3)-# netmask #-list(os_install_net_mask,3)-#" )
+#?list(os_install_net_interfaces,3)!=&&list(os_install_net_dhcp_set,3)!=on&&list(os_install_net_ip,3)!=#
+config_#-list(os_install_net_interfaces,3)-#=( "#-list(os_install_net_ip,3)-#/#-list(os_install_net_cidr,3)-#" )
 routes_#-list(os_install_net_interfaces,3)-#="#-list(os_install_net_route,3)-#"
 #list#
 #?os_install_net_dns!=#
diff --git a/install/1merge/openrc/init.d/net.eth0 b/install/1merge/openrc/init.d/net.eth0
index 54d4b92..2954f98 100644
--- a/install/1merge/openrc/init.d/net.eth0
+++ b/install/1merge/openrc/init.d/net.eth0
@@ -1 +1 @@
-# Calculate pkg(net-misc/wicd)==||pkg(net-misc/networkmanager)== link=net.lo symbolic
+# Calculate name=net.#-list(os_install_net_interfaces,0)-# cl_chroot_status==off&&list(os_install_net_interfaces,0)!=&&os_install_net_setup==openrc link=net.lo symbolic
diff --git a/install/1merge/openrc/init.d/net.eth0.del b/install/1merge/openrc/init.d/net.eth0.del
index fe54400..ac34178 100644
--- a/install/1merge/openrc/init.d/net.eth0.del
+++ b/install/1merge/openrc/init.d/net.eth0.del
@@ -1 +1 @@
-# Calculate name=net.eth0 pkg(net-misc/wicd)!=||pkg(net-misc/networkmanager)!= append=remove
+# Calculate append=remove name=net.#-list(os_install_net_interfaces,0)-# cl_chroot_status==off&&list(os_install_net_interfaces,0)!=&&os_install_net_setup!=openrc
diff --git a/install/1merge/openrc/init.d/net.eth1 b/install/1merge/openrc/init.d/net.eth1
new file mode 100644
index 0000000..3afc137
--- /dev/null
+++ b/install/1merge/openrc/init.d/net.eth1
@@ -0,0 +1 @@
+# Calculate name=net.#-list(os_install_net_interfaces,1)-# cl_chroot_status==off&&list(os_install_net_interfaces,1)!=&&os_install_net_setup==openrc link=net.lo symbolic
diff --git a/install/1merge/openrc/init.d/net.eth1.del b/install/1merge/openrc/init.d/net.eth1.del
new file mode 100644
index 0000000..c9f9a47
--- /dev/null
+++ b/install/1merge/openrc/init.d/net.eth1.del
@@ -0,0 +1 @@
+# Calculate append=remove name=net.#-list(os_install_net_interfaces,1)-# cl_chroot_status==off&&list(os_install_net_interfaces,1)!=&&os_install_net_setup!=openrc
diff --git a/install/1merge/openrc/init.d/net.eth2 b/install/1merge/openrc/init.d/net.eth2
new file mode 100644
index 0000000..550c8c5
--- /dev/null
+++ b/install/1merge/openrc/init.d/net.eth2
@@ -0,0 +1 @@
+# Calculate name=net.#-list(os_install_net_interfaces,2)-# cl_chroot_status==off&&list(os_install_net_interfaces,2)!=&&os_install_net_setup==openrc link=net.lo symbolic
diff --git a/install/1merge/openrc/init.d/net.eth2.del b/install/1merge/openrc/init.d/net.eth2.del
new file mode 100644
index 0000000..9678b5a
--- /dev/null
+++ b/install/1merge/openrc/init.d/net.eth2.del
@@ -0,0 +1 @@
+# Calculate append=remove name=net.#-list(os_install_net_interfaces,2)-# cl_chroot_status==off&&list(os_install_net_interfaces,2)!=&&os_install_net_setup!=openrc
diff --git a/install/1merge/openrc/init.d/net.eth3 b/install/1merge/openrc/init.d/net.eth3
new file mode 100644
index 0000000..6fa981a
--- /dev/null
+++ b/install/1merge/openrc/init.d/net.eth3
@@ -0,0 +1 @@
+# Calculate name=net.#-list(os_install_net_interfaces,3)-# cl_chroot_status==off&&list(os_install_net_interfaces,3)!=&&os_install_net_setup==openrc link=net.lo symbolic
diff --git a/install/1merge/openrc/init.d/net.eth3.del b/install/1merge/openrc/init.d/net.eth3.del
new file mode 100644
index 0000000..fa3d8b4
--- /dev/null
+++ b/install/1merge/openrc/init.d/net.eth3.del
@@ -0,0 +1 @@
+# Calculate append=remove name=net.#-list(os_install_net_interfaces,3)-# cl_chroot_status==off&&list(os_install_net_interfaces,3)!=&&os_install_net_setup!=openrc