diff --git a/Makefile b/Makefile
index 3788263..0973707 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,6 @@ DESTDIR =
 prefix = /usr
 exec_prefix = ${prefix}
 sysconfdir = /etc
-sbindir = ${exec_prefix}/sbin
 bindir = ${exec_prefix}/bin
 datadir = ${prefix}/share
 ifeq ($(ARCH), x86_64)
@@ -33,7 +32,6 @@ initrddir = ${sysconfdir}/rc.d/init.d
 mandir = ${prefix}/usr/share/man
 sysconfigdir= ${sysconfdir}/sysconfig
 profiledir = ${sysconfdir}/profile.d
-mambaimagesdir = ${datadir}/openmamba/images
 iconsdir = ${datadir}/icons/hicolor
 localesdir = ${datadir}/locale
 pck_desktop = $(wildcard desktop/*.bz2)
@@ -103,18 +101,17 @@ install-locales: locales
 	   $(INSTALL_DATA) $${f/.po/.mo} $$dir/openmamba-update.mo;\
 	done
 
-install-kde-distro-addons: dist-update
+install-system-files: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(sysconfdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(bindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(datadir)
-	@$(INSTALL_DIR) $(DESTDIR)$(sbindir)
 	@$(INSTALL_DIR) $(DESTDIR)$(distrobindir)
-	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
 	cp -r etc/polkit-1 $(DESTDIR)$(sysconfdir)/
 	cp -r etc/prelink.conf.d $(DESTDIR)$(sysconfdir)/
 	cp -r etc/profile.d $(DESTDIR)$(sysconfdir)/
 	cp -r etc/sudoers.d $(DESTDIR)$(sysconfdir)/
 	cp -r etc/sysconfig $(DESTDIR)$(sysconfdir)/
+	cp -r usr $(DESTDIR)/
 
 install-os-makereport:
 	$(INSTALL_SCRIPT) os-makereport/os-makereport $(DESTDIR)$(bindir)
@@ -132,7 +129,7 @@ install-openmamba-update:
 	$(INSTALL_SCRIPT) openmamba-update/openmamba-update $(DESTDIR)$(bindir)
 
 install: $(pck_infiles:.in=) \
-	install-kde-distro-addons \
+	install-system-files \
 	install-desktop \
 	install-openmamba-update \
 	install-os-makereport \
diff --git a/usr/bin/service b/usr/bin/service
new file mode 100755
index 0000000..443dc6a
--- /dev/null
+++ b/usr/bin/service
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# Simple service execution tool
+
+USAGE=$"Usage: ""$0 [service_name [start|stop|restart|..]]"
+VERSION="${0##*/} ver. 0.61"
+
+INITDDIR="/etc/init.d"
+SERVICE=
+OPTIONS=
+
+if [ $# -eq 0 ]; then
+   echo "${USAGE}" >&2
+   exit 1
+fi
+
+while [ $# -gt 0 ]; do
+   case "$1" in
+   --help | -h)
+      echo "${USAGE}" >&2
+      exit 0
+      ;;
+   --version | -V)
+      echo "${VERSION}" >&2
+      exit 0
+      ;;
+   *)
+      if [ -z "${SERVICE}" ]; then
+         SERVICE="${1}"
+      else
+         OPTIONS="${OPTIONS} ${1}"
+      fi
+      shift
+      ;;
+   esac
+done
+
+if [ -d /run/systemd ]; then
+   systemctl ${OPTIONS} ${SERVICE}.service
+elif [ -x "${INITDDIR}/${SERVICE}" ]; then
+   env -i PATH="$PATH" TERM="$TERM" "${INITDDIR}/${SERVICE}" ${OPTIONS}
+else
+   echo "${SERVICE}: "$"unrecognized service" >&2
+   exit 1
+fi
diff --git a/usr/lib/modprobe.d/blacklist-net.conf b/usr/lib/modprobe.d/blacklist-net.conf
new file mode 100644
index 0000000..cf9008b
--- /dev/null
+++ b/usr/lib/modprobe.d/blacklist-net.conf
@@ -0,0 +1,5 @@
+# Disable obscure network protocols
+blacklist ax25
+blacklist netrom
+blacklist x25
+blacklist rose
diff --git a/usr/lib/modprobe.d/lp.conf b/usr/lib/modprobe.d/lp.conf
new file mode 100644
index 0000000..0391b74
--- /dev/null
+++ b/usr/lib/modprobe.d/lp.conf
@@ -0,0 +1 @@
+install parport_pc /sbin/modprobe -i parport_pc; /sbin/modprobe lp
diff --git a/usr/lib/modprobe.d/rtl8192ce.conf b/usr/lib/modprobe.d/rtl8192ce.conf
new file mode 100644
index 0000000..c3881e7
--- /dev/null
+++ b/usr/lib/modprobe.d/rtl8192ce.conf
@@ -0,0 +1 @@
+options rtl8192ce ips=0 fwlps=0
diff --git a/usr/lib/sysctl.d/40-openmamba.conf b/usr/lib/sysctl.d/40-openmamba.conf
new file mode 100644
index 0000000..c20ddc1
--- /dev/null
+++ b/usr/lib/sysctl.d/40-openmamba.conf
@@ -0,0 +1,45 @@
+#
+# Kernel sysctl configuration file
+#
+# /etc/sysctl.conf - Configuration file for setting system variables
+# See sysctl(8) and sysctl.conf (5) for more details.
+
+# Enable IP packet forwarding between interfaces (act as a firewall, or router)
+#net.ipv4.ip_forward = 1
+
+# Disable ICMP redirect messages
+net.ipv4.conf.all.accept_redirects = 0
+
+# Do not accept source routing
+net.ipv4.conf.all.accept_source_route = 0
+
+# Log packages that have source addresses with no known route ("martians")
+net.ipv4.conf.all.log_martians = 1
+
+# Controls source route verification
+net.ipv4.conf.all.rp_filter = 1
+
+# Enable ECN (Explicit Congestion Notification) in TCP connections
+net.ipv4.tcp_ecn = 2
+
+# Enable syncookies to hosts when the kernels syn backlog queue is overflowed
+net.ipv4.tcp_syncookies = 1
+
+# Ignore ICMP messages sent to broadcast or multicast addresses
+net.ipv4.icmp_echo_ignore_broadcasts = 1
+
+# Do not log bogus responses to broadcast frames send by hosts that ignore RFC 1122
+#net.ipv4.icmp_ignore_bogus_error_responses = 1
+
+# Ensure TCP window scaling is enabled
+net.ipv4.tcp_window_scaling = 1
+
+# Controls the System Request debugging functionality of the kernel
+# kernel.sysrq = 0
+
+# Controls whether core dumps will append the PID to the core filename.
+# Useful for debugging multi-threaded applications.
+kernel.core_uses_pid = 1
+
+# Increment default user inotify watches limit
+fs.inotify.max_user_watches=524288