diff --git a/.kdiff3rc b/.kdiff3rc
index 771a735a..dc44fc6b 100644
--- a/.kdiff3rc
+++ b/.kdiff3rc
@@ -98,7 +98,7 @@ Height 768=769
 Height 900=901
 Height 975=976
 Height 985=986
-State=AAAA/wAAAAD9AAAAAAAAB4AAAAO8AAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
+State=AAAA/wAAAAD9AAAAAAAAB4AAAANTAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
 ToolBarsMovable=Disabled
 Width 1366=1367
 Width 1440=1441
diff --git a/.travis.yml b/.travis.yml
index 7b008b70..0160c98b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,10 +5,10 @@ script:
     - ./test 
 
 env:
-    - DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base
+    - DETECTED_OS=fedora:24     DOCKER_IMAGE=cyplo/fedora24_base
     - DETECTED_OS=debian:jessie DOCKER_IMAGE=cyplo/jessie_base
-    - DETECTED_OS=ubuntu:trusty
-    - DETECTED_OS=ubuntu:xenial
+    - DETECTED_OS=ubuntu:trusty DOCKER_IMAGE=cyplo/trusty_base
+    - DETECTED_OS=ubuntu:xenial DOCKER_IMAGE=cyplo/xenial_base
 
 sudo: required
 
diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index 86bbb68f..9969c1d3 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -98,10 +98,12 @@ if [[ -z $NORUST ]]; then
         git pull
         git submodule update --init --recursive
     fi
-    cargo install -j $jobs_count -f rustfmt
-    cargo install -j $jobs_count -f racer
-    cargo install -j $jobs_count -f rustsym
-    cargo install -j $jobs_count -f ripgrep
+set +e
+    cargo install rustfmt
+    cargo install racer
+    cargo install rustsym
+    cargo install ripgrep
+set -e
 fi
 
 if [[ -z $NORUBY ]]; then
diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system
index bb0a9b6a..fbc2a611 100755
--- a/fedora/configure_fresh_system
+++ b/fedora/configure_fresh_system
@@ -5,12 +5,11 @@ set -e
 if [[ -z $NOUPGRADE ]]; then
     sudo dnf -y upgrade --best --allowerasing
 fi
-sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs npm terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel zeal qt5-linguist qtkeychain-qt5-devel
-FEDORA_VERSION=`rpm -E %fedora`
-sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm
-sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm
-sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp mono-devel keepass mplayer golang ncurses-compat-libs kicad retext
+
+sudo dnf -y --best --allowerasing install tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv nodejs terminator gsmartcontrol python-pip mercurial python3-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils util-linux-user ncurses-devel zeal qt5-linguist qtkeychain-qt5-devel archivemount keepass splix gutenprint-cups cups-bjnp
+
 sudo dnf -y groupinstall "C Development Tools and Libraries"
+sudo dnf -y groupinstall "Development Tools"
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"