Travis sc fixes

diff --git a/.travis.yml b/.travis.yml
index c0d63001..642ac913 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,16 +8,16 @@ os:
   - osx

 env:
-  - TARGET=linux64 ENABLE_WEBENGINE=OFF
-  - TARGET=linux64 ENABLE_WEBENGINE=ON
+  - TARGET=linux64 ENABLE_WEBKIT=OFF
+  - TARGET=linux64 ENABLE_WEBKIT=ON
   - TARGET=macos64 ENABLE_WEBENGINE=OFF
   - TARGET=macos64 ENABLE_WEBENGINE=ON

 matrix:
   exclude:
-    - env: TARGET=linux64 ENABLE_WEBENGINE=OFF
+    - env: TARGET=linux64 ENABLE_WEBKIT=OFF
       os: osx
-    - env: TARGET=linux64 ENABLE_WEBENGINE=ON
+    - env: TARGET=linux64 ENABLE_WEBKIT=ON
       os: osx
     - env: TARGET=macos64 ENABLE_WEBENGINE=OFF
       os: linux
diff --git a/mac/build-using-homebrew.sh b/mac/build-using-homebrew.sh
index 069053be..f0577abe 100755
--- a/mac/build-using-homebrew.sh
+++ b/mac/build-using-homebrew.sh
@@ -50,13 +50,13 @@ TOOLCHAIN_FILE="${CUR_DIR}/homebrew-toolchain.cmake"
     ENABLE_PLUGINS="ON" || \
     ENABLE_PLUGINS="OFF"

-[ -z "${ENABLE_WEBENGINE}" ] && ENABLE_WEBENGINE="OFF"
+[ -z "${ENABLE_WEBENGINE}" ] && \
+     CHAT_TYPE="basic" || \
+     CHAT_TYPE="webengine"

 BUILD_OPTIONS="-DCMAKE_BUILD_TYPE=Release \
                -DENABLE_PLUGINS=${ENABLE_PLUGINS} \
-               -DENABLE_WEBKIT=${ENABLE_WEBENGINE} \
-               -DUSE_WEBENGINE=${ENABLE_WEBENGINE} \
-               -DUSE_WEBKIT=OFF \
+               -DCHAT_TYPE=${CHAT_TYPE} \
                -DUSE_HUNSPELL=ON \
                -DUSE_KEYCHAIN=ON \
                -DUSE_SPARKLE=OFF \
diff --git a/tests/travis-ci/build-in-ubuntu.sh b/tests/travis-ci/build-in-ubuntu.sh
index 21dbe530..90020c67 100755
--- a/tests/travis-ci/build-in-ubuntu.sh
+++ b/tests/travis-ci/build-in-ubuntu.sh
@@ -17,16 +17,14 @@ LDFLAGS="$(dpkg-buildflags --get LDFLAGS) -Wl,--as-needed"
     ENABLE_PLUGINS="ON" || \
     ENABLE_PLUGINS="OFF"

-[ "${WITHOUT_WEBKIT}" = "true" ] && \
-    ENABLE_WEBKIT="OFF" || \
-    ENABLE_WEBKIT="ON"
+[ "${ENABLE_WEBKIT}" = "true" ] && \
+    CHAT_TYPE="basic" || \
+    CHAT_TYPE="webkit"

 BUILD_OPTIONS="-DCMAKE_INSTALL_PREFIX=/usr \
                -DCMAKE_BUILD_TYPE=Release \
                -DENABLE_PLUGINS=${ENABLE_PLUGINS} \
-               -DENABLE_WEBKIT=${ENABLE_WEBKIT} \
-               -DUSE_WEBKIT=${ENABLE_WEBKIT} \
-               -DUSE_WEBENGINE=OFF \
+               -DCHAT_TYPE=${CHAT_TYPE} \
                -DUSE_HUNSPELL=ON \
                -DUSE_KEYCHAIN=ON \
                -DUSE_SPARKLE=OFF \