diff --git a/.travis.yml b/.travis.yml
index 81af4fd78..e4a0f669d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,3 @@
-import:
-  - source: Alfresco/alfresco-build-tools:.travis.docker_hub_login.yml@v1.1.1
-  - source: .travis/env.yml
-    mode: deep_merge_prepend
 # =================
 # merge anchor
 # =================
@@ -58,7 +54,7 @@ jobs:
       name: 'Build (without animation)'
       before_script: npx @alfresco/adf-cli update-commit-sha --pointer "HEAD" --pathPackage "$(pwd)"
       script: npm ci && npm run build.e2e
-      after_success: ./scripts/ci/utils/artifact-to-s3.sh -a ./dist/app -o "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2"
+      after_success: ./scripts/ci/utils/artifact-to-s3.sh -a ./dist/app -o "$S3_DBP_FOLDER/alfresco-content-app.tar.bz2" || travis_terminate 1
       cache: false
 
     - stage: Quality and Unit tests
diff --git a/package-lock.json b/package-lock.json
index faefcf329..4e77c8fcd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@alfresco/adf-cli": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.6.0.tgz",
-      "integrity": "sha512-sgZ00R2PZSHTiBK0fORVtpj+Vj5uHQldd9Rvs126UVM5TOut5jI4ZTRiO21ZrptrfJLYBMNRI+BB74ARWvypHg==",
+      "version": "4.7.0-33442",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-cli/-/adf-cli-4.7.0-33442.tgz",
+      "integrity": "sha512-W6e3UA1ri9CS2HskhRAN0kQFp+KKRr2Q58akEtFUPCaAygzsQJQHmFWCiMYEjZ3ndXUWtB5tRtDVV00Zmsd+Aw==",
       "dev": true,
       "requires": {
         "@alfresco/js-api": "4.6.0",
@@ -30,34 +30,34 @@
       }
     },
     "@alfresco/adf-content-services": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.6.0.tgz",
-      "integrity": "sha512-Rn7M2Y9oISFA9HiyUK5mhfVClWfQ2KRBb1fVtIq9M3q43O9kJA4NmIZx1vw+Fa006rZ4r7AA+cK/XU9ITWweRg==",
+      "version": "4.7.0-33442",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-4.7.0-33442.tgz",
+      "integrity": "sha512-EINIDQ92QMsSyhQ8BbreLXxeNsrJ75duow0fwj0xDMCfxAx5WSSRLGOeF1T6E8aqXrK45syijqtyaOH7oWyB6A==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@alfresco/adf-core": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.6.0.tgz",
-      "integrity": "sha512-r0UyxyYrVzZBAHpJoWM0bPkZkJNkGyL6QuJ02L2DbF/8CRXH0wHgvL3msNwJVfKHGnuGsoH9ROMRnUnuSMpAFA==",
+      "version": "4.7.0-33442",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-4.7.0-33442.tgz",
+      "integrity": "sha512-Do1evc2ZwBJN78XkAIC7F8fyyN6wgOCEDuwkS1h17tJuLJdHnHfM1Jv3xw7NZBQliBwi2dKw52bPsOxaRRVkPA==",
       "requires": {
         "cropperjs": "1.5.11",
         "tslib": "^2.0.0"
       }
     },
     "@alfresco/adf-extensions": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.6.0.tgz",
-      "integrity": "sha512-9uwbbXZ+0CT1TroodMiT1TKb1LDE8LXQnqEumI+Yf6OID/wep+/w6SpnVdg++dlNYM0UuS7MoYDve3PUtcL9Eg==",
+      "version": "4.7.0-33442",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-4.7.0-33442.tgz",
+      "integrity": "sha512-0TrjQ25MV6pbNTpU967pyPaus5TmHY7YhSkuPxgj5wM8xm0DwIt3HRq9pP20JxsskzQd6Np72XAm/+sgHoZu3Q==",
       "requires": {
         "tslib": "^2.0.0"
       }
     },
     "@alfresco/adf-testing": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.6.0.tgz",
-      "integrity": "sha512-aAjFHPJprqBJN8sS3xpv6jRacynbzXWutHFt0/zgKrO0AiKLV0oRRndPLKWXHjaJx3dmDkl6rsd9FKqluW2cRQ==",
+      "version": "4.7.0-33442",
+      "resolved": "https://registry.npmjs.org/@alfresco/adf-testing/-/adf-testing-4.7.0-33442.tgz",
+      "integrity": "sha512-IhG0Z0EI99mbhO6MPMspy23SjMbaZbk1u4Sdh7K6jIC+Wr06cTN+ouagdBzrZnOGVmAt/JZM5hSiStSdnHGqLg==",
       "dev": true,
       "requires": {
         "tslib": "^2.0.0"
@@ -5044,9 +5044,9 @@
       "dev": true
     },
     "cookiejar": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz",
-      "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA=="
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.3.tgz",
+      "integrity": "sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ=="
     },
     "copy-anything": {
       "version": "2.0.1",
diff --git a/package.json b/package.json
index ac1256b95..5c0c5420d 100644
--- a/package.json
+++ b/package.json
@@ -24,9 +24,9 @@
   },
   "private": true,
   "dependencies": {
-    "@alfresco/adf-content-services": "4.6.0",
-    "@alfresco/adf-core": "4.6.0",
-    "@alfresco/adf-extensions": "4.6.0",
+    "@alfresco/adf-content-services": "4.7.0-33442",
+    "@alfresco/adf-core": "4.7.0-33442",
+    "@alfresco/adf-extensions": "4.7.0-33442",
     "@alfresco/js-api": "4.6.0",
     "@angular/animations": "10.0.4",
     "@angular/cdk": "^10.0.2",
@@ -56,8 +56,8 @@
     "zone.js": "~0.10.2"
   },
   "devDependencies": {
-    "@alfresco/adf-cli": "4.6.0",
-    "@alfresco/adf-testing": "4.6.0",
+    "@alfresco/adf-cli": "4.7.0-33442",
+    "@alfresco/adf-testing": "4.7.0-33442",
     "@angular-custom-builders/lite-serve": "^0.2.3",
     "@angular-devkit/build-angular": "^0.1002.0",
     "@angular-devkit/build-ng-packagr": "^0.1002.0",
diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss
index d51e2dab7..416dfe8eb 100644
--- a/src/app/ui/custom-theme.scss
+++ b/src/app/ui/custom-theme.scss
@@ -1,5 +1,4 @@
 @import '~@angular/material/theming';
-@import '~@alfresco/adf-content-services/theming';
 @import './overrides/adf-style-fixes.theme';
 @import 'colors';
 
@@ -17,7 +16,6 @@ $primary: map-get($custom-theme, primary);
 
 @mixin custom-theme($theme) {
   @include angular-material-theme($theme);
-  @include adf-content-services-theme($theme);
   @include adf-core-theme($theme);
   @include adf-style-fixes($theme);
 
diff --git a/src/app/ui/theme.scss b/src/app/ui/theme.scss
index 45dd97fd9..03e26e94d 100644
--- a/src/app/ui/theme.scss
+++ b/src/app/ui/theme.scss
@@ -1,8 +1,5 @@
 @import '~@angular/material/theming';
-
-@import '~@alfresco/adf-content-services/theming';
 @import '~@alfresco/adf-core/theming';
-
 @import 'custom-theme';
 
 @include mat-core($alfresco-typography);