diff --git a/cypress/integration/Admin.DonationInfo/I_click_the_checkbox_show_donations_progress_bar_and_save.js b/cypress/integration/Admin.DonationInfo/I_click_the_checkbox_show_donations_progress_bar_and_save.js
index b4289dd5e..1806af807 100644
--- a/cypress/integration/Admin.DonationInfo/I_click_the_checkbox_show_donations_progress_bar_and_save.js
+++ b/cypress/integration/Admin.DonationInfo/I_click_the_checkbox_show_donations_progress_bar_and_save.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I click the checkbox show donations progress bar and save", () => {
   cy.get("#showDonations").click()
   cy.get(".donations-info-button").click()
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Admin.DonationInfo/the_donation_info_contains_goal_{string}_and_progress_{string}.js b/cypress/integration/Admin.DonationInfo/the_donation_info_contains_goal_{string}_and_progress_{string}.js
index cd2473800..454aea44b 100644
--- a/cypress/integration/Admin.DonationInfo/the_donation_info_contains_goal_{string}_and_progress_{string}.js
+++ b/cypress/integration/Admin.DonationInfo/the_donation_info_contains_goal_{string}_and_progress_{string}.js
@@ -1,8 +1,8 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("the donation info contains goal {string} and progress {string}", (goal, progress) => {
   cy.get('.top-info-bar')
     .should('contain', goal)
   cy.get('.top-info-bar')
     .should('contain', progress)
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Admin.DonationInfo/the_donation_info_is_{string}.js b/cypress/integration/Admin.DonationInfo/the_donation_info_is_{string}.js
index d259e6520..da231f23a 100644
--- a/cypress/integration/Admin.DonationInfo/the_donation_info_is_{string}.js
+++ b/cypress/integration/Admin.DonationInfo/the_donation_info_is_{string}.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the donation info is {string}", (visibility) => {
   cy.get('.top-info-bar')
     .should(visibility === 'visible' ? 'exist' : 'not.exist')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Admin.PinPost/I_open_the_content_menu_of_post_{string}.js b/cypress/integration/Admin.PinPost/I_open_the_content_menu_of_post_{string}.js
index a7be22495..2b8d00dc9 100644
--- a/cypress/integration/Admin.PinPost/I_open_the_content_menu_of_post_{string}.js
+++ b/cypress/integration/Admin.PinPost/I_open_the_content_menu_of_post_{string}.js
@@ -1,7 +1,7 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I open the content menu of post {string}", (title) => {
   cy.contains('.post-teaser', title)
     .find('.content-menu .base-button')
     .click()
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Admin.PinPost/the_post_with_title_{string}_has_a_ribbon_for_pinned_posts.js b/cypress/integration/Admin.PinPost/the_post_with_title_{string}_has_a_ribbon_for_pinned_posts.js
index 1db51d2b0..3e9f43bc3 100644
--- a/cypress/integration/Admin.PinPost/the_post_with_title_{string}_has_a_ribbon_for_pinned_posts.js
+++ b/cypress/integration/Admin.PinPost/the_post_with_title_{string}_has_a_ribbon_for_pinned_posts.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the post with title {string} has a ribbon for pinned posts", (title) => {
   cy.get(".post-teaser").contains(title)
@@ -6,4 +6,4 @@ Then("the post with title {string} has a ribbon for pinned posts", (title) => {
     .parent()
     .find(".ribbon.--pinned")
     .should("contain", "Announcement")
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Admin.PinPost/there_is_no_button_to_pin_a_post.js b/cypress/integration/Admin.PinPost/there_is_no_button_to_pin_a_post.js
index 859b9faf1..70535b920 100644
--- a/cypress/integration/Admin.PinPost/there_is_no_button_to_pin_a_post.js
+++ b/cypress/integration/Admin.PinPost/there_is_no_button_to_pin_a_post.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("there is no button to pin a post", () => {
   cy.get("a.ds-menu-item-link")
     .should('contain', "Report Post") // sanity check
     .should('not.contain', "Pin post")
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Internationalization/I_see_a_button_with_the_label_{string}.js b/cypress/integration/Internationalization/I_see_a_button_with_the_label_{string}.js
index a67f9d7df..73a4a5e50 100644
--- a/cypress/integration/Internationalization/I_see_a_button_with_the_label_{string}.js
+++ b/cypress/integration/Internationalization/I_see_a_button_with_the_label_{string}.js
@@ -1,5 +1,5 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I see a button with the label {string}", label => {
   cy.contains("button", label);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Internationalization/I_select_{string}_in_the_language_menu.js b/cypress/integration/Internationalization/I_select_{string}_in_the_language_menu.js
index b850a7573..ba89fd3f5 100644
--- a/cypress/integration/Internationalization/I_select_{string}_in_the_language_menu.js
+++ b/cypress/integration/Internationalization/I_select_{string}_in_the_language_menu.js
@@ -1,8 +1,8 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I select {string} in the language menu", language => {
     cy.get(".locale-menu")
       .click();
     cy.contains(".locale-menu-popover a", language)
       .click();
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Internationalization/the_whole_user_interface_appears_in_{string}.js b/cypress/integration/Internationalization/the_whole_user_interface_appears_in_{string}.js
index 4d80b8a0d..d5a8ac95c 100644
--- a/cypress/integration/Internationalization/the_whole_user_interface_appears_in_{string}.js
+++ b/cypress/integration/Internationalization/the_whole_user_interface_appears_in_{string}.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
-import locales from '../../../webapp/locales'
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
+import locales from '../../../../webapp/locales'
 
 Then("the whole user interface appears in {string}", language => {
   const { code } = locales.find((entry) => entry.name === language);
   cy.get(`html[lang=${code}]`);
   cy.getCookie("locale").should("have.property", "value", code);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Moderation.HidePost/I_should_see_only_{int}_posts_on_the_newsfeed.js b/cypress/integration/Moderation.HidePost/I_should_see_only_{int}_posts_on_the_newsfeed.js
index 611365bb0..26221ae66 100644
--- a/cypress/integration/Moderation.HidePost/I_should_see_only_{int}_posts_on_the_newsfeed.js
+++ b/cypress/integration/Moderation.HidePost/I_should_see_only_{int}_posts_on_the_newsfeed.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see only {int} posts on the newsfeed", posts => {
   cy.get(".post-teaser")
     .should("have.length", posts);
 });
-  
\ No newline at end of file
+  
diff --git a/cypress/integration/Moderation.HidePost/the_page_{string}_returns_a_404_error_with_a_message.js b/cypress/integration/Moderation.HidePost/the_page_{string}_returns_a_404_error_with_a_message.js
index 6d9cfb2ef..538e8a64d 100644
--- a/cypress/integration/Moderation.HidePost/the_page_{string}_returns_a_404_error_with_a_message.js
+++ b/cypress/integration/Moderation.HidePost/the_page_{string}_returns_a_404_error_with_a_message.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the page {string} returns a 404 error with a message:", (route, message) => {
   cy.request({
@@ -11,4 +11,4 @@ Then("the page {string} returns a 404 error with a message:", (route, message) =
     failOnStatusCode: false
     });
   cy.get(".error-message").should("contain", message);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Moderation.ReportContent/I_can_t_see_the_moderation_menu_item.js b/cypress/integration/Moderation.ReportContent/I_can_t_see_the_moderation_menu_item.js
index 96706281a..fcb1cb686 100644
--- a/cypress/integration/Moderation.ReportContent/I_can_t_see_the_moderation_menu_item.js
+++ b/cypress/integration/Moderation.ReportContent/I_can_t_see_the_moderation_menu_item.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then(`I can't see the moderation menu item`, () => {
   cy.get('.avatar-menu-popover')
@@ -8,4 +8,4 @@ Then(`I can't see the moderation menu item`, () => {
   cy.get('.avatar-menu-popover')
     .find('a[href="/moderation"]', 'Moderation')
     .should('not.exist')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Moderation.ReportContent/I_can_visit_the_post_page.js b/cypress/integration/Moderation.ReportContent/I_can_visit_the_post_page.js
index 8ca69da50..ce846c39a 100644
--- a/cypress/integration/Moderation.ReportContent/I_can_visit_the_post_page.js
+++ b/cypress/integration/Moderation.ReportContent/I_can_visit_the_post_page.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I can visit the post page', () => {
   cy.contains('Fake news').click()
   cy.location('pathname').should('contain', '/post')
     .get('.base-card .title').should('contain', 'Fake news')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Moderation.ReportContent/I_click_on_Report_Post_from_the_content_menu_of_the_post.js b/cypress/integration/Moderation.ReportContent/I_click_on_Report_Post_from_the_content_menu_of_the_post.js
index 30682b009..a5da04bfd 100644
--- a/cypress/integration/Moderation.ReportContent/I_click_on_Report_Post_from_the_content_menu_of_the_post.js
+++ b/cypress/integration/Moderation.ReportContent/I_click_on_Report_Post_from_the_content_menu_of_the_post.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I click on "Report Post" from the content menu of the post', () => {
   cy.contains('.base-card', 'The Truth about the Holocaust')
@@ -8,4 +8,4 @@ When('I click on "Report Post" from the content menu of the post', () => {
   cy.get('.popover .ds-menu-item-link')
     .contains('Report Post')
     .click()
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Moderation.ReportContent/I_click_on_the_author.js b/cypress/integration/Moderation.ReportContent/I_click_on_the_author.js
index fad21e1a6..049eb8e72 100644
--- a/cypress/integration/Moderation.ReportContent/I_click_on_the_author.js
+++ b/cypress/integration/Moderation.ReportContent/I_click_on_the_author.js
@@ -1,7 +1,7 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I click on the author', () => {
   cy.get('[data-test="avatarUserLink"]')
     .click()
     .url().should('include', '/profile/')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Moderation.ReportContent/I_click_on_the_avatar_menu_in_the_top_right_corner.js b/cypress/integration/Moderation.ReportContent/I_click_on_the_avatar_menu_in_the_top_right_corner.js
index 27830b239..b23ba1912 100644
--- a/cypress/integration/Moderation.ReportContent/I_click_on_the_avatar_menu_in_the_top_right_corner.js
+++ b/cypress/integration/Moderation.ReportContent/I_click_on_the_avatar_menu_in_the_top_right_corner.js
@@ -1,5 +1,5 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I click on the avatar menu in the top right corner", () => {
   cy.get(".avatar-menu").click();
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Moderation.ReportContent/I_confirm_the_reporting_dialog.js b/cypress/integration/Moderation.ReportContent/I_confirm_the_reporting_dialog.js
index 4009fa4e8..970c61c00 100644
--- a/cypress/integration/Moderation.ReportContent/I_confirm_the_reporting_dialog.js
+++ b/cypress/integration/Moderation.ReportContent/I_confirm_the_reporting_dialog.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When(/^I confirm the reporting dialog .*:$/, message => {
   cy.contains(message) // wait for element to become visible
@@ -13,4 +13,4 @@ When(/^I confirm the reporting dialog .*:$/, message => {
         .contains('Report')
         .click()
     })
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Moderation.ReportContent/I_see_all_the_reported_posts_including_from_the_user_who_muted_me.js b/cypress/integration/Moderation.ReportContent/I_see_all_the_reported_posts_including_from_the_user_who_muted_me.js
index 522cd6c78..8989ecf68 100644
--- a/cypress/integration/Moderation.ReportContent/I_see_all_the_reported_posts_including_from_the_user_who_muted_me.js
+++ b/cypress/integration/Moderation.ReportContent/I_see_all_the_reported_posts_including_from_the_user_who_muted_me.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I see all the reported posts including from the user who muted me', () => {
   cy.get('table tbody').within(() => {
     cy.contains('tr', 'Fake news')
   })
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Moderation.ReportContent/I_see_all_the_reported_posts_including_the_one_from_above.js b/cypress/integration/Moderation.ReportContent/I_see_all_the_reported_posts_including_the_one_from_above.js
index 66c9baf61..849f7f1a9 100644
--- a/cypress/integration/Moderation.ReportContent/I_see_all_the_reported_posts_including_the_one_from_above.js
+++ b/cypress/integration/Moderation.ReportContent/I_see_all_the_reported_posts_including_the_one_from_above.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I see all the reported posts including the one from above', () => {
   cy.get('table tbody').within(() => {
     cy.contains('tr', 'The Truth about the Holocaust')
   })
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Moderation.ReportContent/each_list_item_links_to_the_post_page.js b/cypress/integration/Moderation.ReportContent/each_list_item_links_to_the_post_page.js
index 9ce69d6de..e174113fc 100644
--- a/cypress/integration/Moderation.ReportContent/each_list_item_links_to_the_post_page.js
+++ b/cypress/integration/Moderation.ReportContent/each_list_item_links_to_the_post_page.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('each list item links to the post page', () => {
   cy.contains('The Truth about the Holocaust').click();
   cy.location('pathname').should('contain', '/post')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js b/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js
index ce876a081..46ab8f3bd 100644
--- a/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js
+++ b/cypress/integration/Moderation.ReportContent/somebody_reported_the_following_posts.js
@@ -1,5 +1,5 @@
-import { Given } from "cypress-cucumber-preprocessor/steps";
-import { gql } from '../../../backend/src/helpers/jest'
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
+import { gql } from '../../../../backend/src/helpers/jest'
 
 Given('somebody reported the following posts:', table => {
   table.hashes().forEach(({ submitterEmail, resourceId, reasonCategory, reasonDescription }) => {
@@ -20,4 +20,4 @@ Given('somebody reported the following posts:', table => {
         reasonDescription
       })
   })
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Moderation.ReportContent/there_is_an_annoying_user_who_has_muted_me.js b/cypress/integration/Moderation.ReportContent/there_is_an_annoying_user_who_has_muted_me.js
index 8d475ee43..011e15d81 100644
--- a/cypress/integration/Moderation.ReportContent/there_is_an_annoying_user_who_has_muted_me.js
+++ b/cypress/integration/Moderation.ReportContent/there_is_an_annoying_user_who_has_muted_me.js
@@ -1,3 +1,5 @@
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
+
 Given("there is an annoying user who has muted me", () => {
   cy.neode()
     .first("User", {
@@ -10,4 +12,4 @@ Given("there is an annoying user who has muted me", () => {
         })
       .relateTo(mutedUser, "muted");
     });
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Notification.Mention/I_start_to_write_a_new_post_with_the_title_{string}_beginning_with.js b/cypress/integration/Notification.Mention/I_start_to_write_a_new_post_with_the_title_{string}_beginning_with.js
index fde5042c1..b8e705c82 100644
--- a/cypress/integration/Notification.Mention/I_start_to_write_a_new_post_with_the_title_{string}_beginning_with.js
+++ b/cypress/integration/Notification.Mention/I_start_to_write_a_new_post_with_the_title_{string}_beginning_with.js
@@ -1,8 +1,8 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I start to write a new post with the title {string} beginning with:", (title, intro) => {
   cy.get('input[name="title"]')
     .type(title);
   cy.get(".ProseMirror")
     .type(intro);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Notification.Mention/mention_{string}_in_the_text.js b/cypress/integration/Notification.Mention/mention_{string}_in_the_text.js
index fa8a29d4a..e1bd19da0 100644
--- a/cypress/integration/Notification.Mention/mention_{string}_in_the_text.js
+++ b/cypress/integration/Notification.Mention/mention_{string}_in_the_text.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("mention {string} in the text", mention => {
   cy.get(".ProseMirror")
@@ -6,4 +6,4 @@ When("mention {string} in the text", mention => {
   cy.get(".suggestion-list__item")
     .contains(mention)
     .click();
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Notification.Mention/open_the_notification_menu_and_click_on_the_first_item.js b/cypress/integration/Notification.Mention/open_the_notification_menu_and_click_on_the_first_item.js
index 0d3917f38..0143d1ac5 100644
--- a/cypress/integration/Notification.Mention/open_the_notification_menu_and_click_on_the_first_item.js
+++ b/cypress/integration/Notification.Mention/open_the_notification_menu_and_click_on_the_first_item.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("open the notification menu and click on the first item", () => {
   cy.get(".notifications-menu")
@@ -7,4 +7,4 @@ When("open the notification menu and click on the first item", () => {
   cy.get(".notification .link")
     .first()
     .click({force: true});
-});  
\ No newline at end of file
+});  
diff --git a/cypress/integration/Notification.Mention/see_{int}_unread_notifications_in_the_top_menu.js b/cypress/integration/Notification.Mention/see_{int}_unread_notifications_in_the_top_menu.js
index 124b61873..ae1644cef 100644
--- a/cypress/integration/Notification.Mention/see_{int}_unread_notifications_in_the_top_menu.js
+++ b/cypress/integration/Notification.Mention/see_{int}_unread_notifications_in_the_top_menu.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("see {int} unread notifications in the top menu", count => {
   cy.get(".notifications-menu")
     .should("contain", count);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Notification.Mention/the_notification_menu_button_links_to_the_all_notifications_page.js b/cypress/integration/Notification.Mention/the_notification_menu_button_links_to_the_all_notifications_page.js
index e40827a16..a7204978e 100644
--- a/cypress/integration/Notification.Mention/the_notification_menu_button_links_to_the_all_notifications_page.js
+++ b/cypress/integration/Notification.Mention/the_notification_menu_button_links_to_the_all_notifications_page.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the notification menu button links to the all notifications page", () => {
   cy.get(".notifications-menu")
     .click();
   cy.location("pathname")
     .should("contain", "/notifications");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Notification.Mention/the_unread_counter_is_removed.js b/cypress/integration/Notification.Mention/the_unread_counter_is_removed.js
index 3859103e8..6c7ff96f0 100644
--- a/cypress/integration/Notification.Mention/the_unread_counter_is_removed.js
+++ b/cypress/integration/Notification.Mention/the_unread_counter_is_removed.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the unread counter is removed", () => {
   cy.get('.notifications-menu .counter-icon')
     .should('not.exist');
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Post.Comment/I_comment_the_following.js b/cypress/integration/Post.Comment/I_comment_the_following.js
index 0f5a5049c..5a64ded50 100644
--- a/cypress/integration/Post.Comment/I_comment_the_following.js
+++ b/cypress/integration/Post.Comment/I_comment_the_following.js
@@ -1,7 +1,7 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I comment the following:", async text => {
   const comment = text.replace("\n", " ")
   cy.task('pushValue', { name: 'lastComment', value: comment })
   cy.get(".editor .ProseMirror").type(comment);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Post.Comment/I_should_see_an_abbreviated_version_of_my_comment.js b/cypress/integration/Post.Comment/I_should_see_an_abbreviated_version_of_my_comment.js
index d0b7940f0..67dc9bef8 100644
--- a/cypress/integration/Post.Comment/I_should_see_an_abbreviated_version_of_my_comment.js
+++ b/cypress/integration/Post.Comment/I_should_see_an_abbreviated_version_of_my_comment.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see an abbreviated version of my comment", () => {
   cy.get("article.comment-card")
     .should("contain", "show more")
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Post.Comment/I_should_see_my_comment.js b/cypress/integration/Post.Comment/I_should_see_my_comment.js
index 8d439b112..7b30ee82d 100644
--- a/cypress/integration/Post.Comment/I_should_see_my_comment.js
+++ b/cypress/integration/Post.Comment/I_should_see_my_comment.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see my comment", () => {
   cy.get("article.comment-card p")
@@ -10,4 +10,4 @@ Then("I should see my comment", () => {
     .and("contain", 'https://') // some url
     .get(".user-teaser > .info > .text")
     .should("contain", "today at");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Post.Comment/I_should_see_the_entirety_of_my_comment.js b/cypress/integration/Post.Comment/I_should_see_the_entirety_of_my_comment.js
index a903fa4d0..9ea48fa05 100644
--- a/cypress/integration/Post.Comment/I_should_see_the_entirety_of_my_comment.js
+++ b/cypress/integration/Post.Comment/I_should_see_the_entirety_of_my_comment.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see the entirety of my comment", () => {
   cy.get("article.comment-card")
     .should("not.contain", "show more")
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Post.Comment/I_type_in_a_comment_with_{int}_characters.js b/cypress/integration/Post.Comment/I_type_in_a_comment_with_{int}_characters.js
index 1522c0e64..ef39bdbf4 100644
--- a/cypress/integration/Post.Comment/I_type_in_a_comment_with_{int}_characters.js
+++ b/cypress/integration/Post.Comment/I_type_in_a_comment_with_{int}_characters.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I type in a comment with {int} characters", size => {
   var c="";
@@ -6,4 +6,4 @@ When("I type in a comment with {int} characters", size => {
     c += "c"
   }
   cy.get(".editor .ProseMirror").type(c);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Post.Comment/it_should_create_a_mention_in_the_CommentForm.js b/cypress/integration/Post.Comment/it_should_create_a_mention_in_the_CommentForm.js
index 3468badad..0e52e0f7a 100644
--- a/cypress/integration/Post.Comment/it_should_create_a_mention_in_the_CommentForm.js
+++ b/cypress/integration/Post.Comment/it_should_create_a_mention_in_the_CommentForm.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("it should create a mention in the CommentForm", () => {
   cy.get(".ProseMirror a")
     .should('have.class', 'mention')
     .should('contain', '@peter-pan')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Post.Comment/my_comment_should_be_successfully_created.js b/cypress/integration/Post.Comment/my_comment_should_be_successfully_created.js
index 766106ddf..acb94f216 100644
--- a/cypress/integration/Post.Comment/my_comment_should_be_successfully_created.js
+++ b/cypress/integration/Post.Comment/my_comment_should_be_successfully_created.js
@@ -1,5 +1,5 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("my comment should be successfully created", () => {
   cy.get(".iziToast-message").contains("Comment submitted!");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Post.Comment/the_editor_should_be_cleared.js b/cypress/integration/Post.Comment/the_editor_should_be_cleared.js
index 579fc2ca9..f6e47313a 100644
--- a/cypress/integration/Post.Comment/the_editor_should_be_cleared.js
+++ b/cypress/integration/Post.Comment/the_editor_should_be_cleared.js
@@ -1,5 +1,5 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the editor should be cleared", () => {
   cy.get(".ProseMirror p").should("have.class", "is-empty");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Post.Create/I_choose_{string}_as_the_title.js b/cypress/integration/Post.Create/I_choose_{string}_as_the_title.js
index 9fbf8e58f..a5a292a0c 100644
--- a/cypress/integration/Post.Create/I_choose_{string}_as_the_title.js
+++ b/cypress/integration/Post.Create/I_choose_{string}_as_the_title.js
@@ -1,8 +1,8 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I choose {string} as the title", async title => {
   const lastPost = {}
   lastPost.title = title.replace("\n", " ");
   cy.task('pushValue', { name: 'lastPost', value: lastPost })
   cy.get('input[name="title"]').type(lastPost.title);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Post.Create/the_post_was_saved_successfully.js b/cypress/integration/Post.Create/the_post_was_saved_successfully.js
index eec2f819b..987e477d4 100644
--- a/cypress/integration/Post.Create/the_post_was_saved_successfully.js
+++ b/cypress/integration/Post.Create/the_post_was_saved_successfully.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the post was saved successfully", async () => {
   cy.task('getValue', 'lastPost').then(lastPost => {
     cy.get(".base-card > .title").should("contain", lastPost.title);
     cy.get(".content").should("contain", lastPost.content);
   })
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Post.Images/I_add_all_required_fields.js b/cypress/integration/Post.Images/I_add_all_required_fields.js
index 52a95ab52..ce2e88a83 100644
--- a/cypress/integration/Post.Images/I_add_all_required_fields.js
+++ b/cypress/integration/Post.Images/I_add_all_required_fields.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I add all required fields", () => {
   cy.get('input[name="title"]')
     .type('new post')
     .get(".editor .ProseMirror")
     .type('new post content')
-  })
\ No newline at end of file
+  })
diff --git a/cypress/integration/Post.Images/I_should_be_able_to_{string}_a_teaser_image.js b/cypress/integration/Post.Images/I_should_be_able_to_{string}_a_teaser_image.js
index ce5b54f25..019cc956a 100644
--- a/cypress/integration/Post.Images/I_should_be_able_to_{string}_a_teaser_image.js
+++ b/cypress/integration/Post.Images/I_should_be_able_to_{string}_a_teaser_image.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should be able to {string} a teaser image", condition => {
   // cy.reload()
@@ -27,4 +27,4 @@ Then("I should be able to {string} a teaser image", condition => {
       break;
   }
   
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Post.Images/my_post_has_a_teaser_image.js b/cypress/integration/Post.Images/my_post_has_a_teaser_image.js
index 66ff3c31d..b9ce4b3c7 100644
--- a/cypress/integration/Post.Images/my_post_has_a_teaser_image.js
+++ b/cypress/integration/Post.Images/my_post_has_a_teaser_image.js
@@ -1,7 +1,7 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('my post has a teaser image', () => {
   cy.get('.contribution-form .image')
     .should('exist')
     .and('have.attr', 'src')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Post.Images/the_first_image_should_not_be_displayed_anymore.js b/cypress/integration/Post.Images/the_first_image_should_not_be_displayed_anymore.js
index 867c97fdf..6388f4458 100644
--- a/cypress/integration/Post.Images/the_first_image_should_not_be_displayed_anymore.js
+++ b/cypress/integration/Post.Images/the_first_image_should_not_be_displayed_anymore.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the first image should not be displayed anymore", () => {
   cy.get(".hero-image")
@@ -6,4 +6,4 @@ Then("the first image should not be displayed anymore", () => {
     .get('.hero-image > .image')
     .should('have.length', 1)
     .and('have.attr', 'src')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Post.Images/the_post_was_saved_successfully_with_the_{string}_teaser_image.js b/cypress/integration/Post.Images/the_post_was_saved_successfully_with_the_{string}_teaser_image.js
index ece83d878..c0571068e 100644
--- a/cypress/integration/Post.Images/the_post_was_saved_successfully_with_the_{string}_teaser_image.js
+++ b/cypress/integration/Post.Images/the_post_was_saved_successfully_with_the_{string}_teaser_image.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the post was saved successfully with the {string} teaser image", condition => {
   cy.get(".base-card > .title")
@@ -8,4 +8,4 @@ Then("the post was saved successfully with the {string} teaser image", condition
     .get('.post-page img')
     .should("have.attr", "src")
     .and("contains", condition === 'updated' ? 'humanconnection' : 'onourjourney')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Post.Images/the_{string}_post_was_saved_successfully_without_a_teaser_image.js b/cypress/integration/Post.Images/the_{string}_post_was_saved_successfully_without_a_teaser_image.js
index abafcf0cc..40245df2b 100644
--- a/cypress/integration/Post.Images/the_{string}_post_was_saved_successfully_without_a_teaser_image.js
+++ b/cypress/integration/Post.Images/the_{string}_post_was_saved_successfully_without_a_teaser_image.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('the {string} post was saved successfully without a teaser image', condition => {
   cy.get(".base-card > .title")
@@ -9,4 +9,4 @@ Then('the {string} post was saved successfully without a teaser image', conditio
     .should('exist')
     .get('.hero-image > .image')
     .should('not.exist')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Post/the_post_shows_up_on_the_newsfeed_at_position_{int}.js b/cypress/integration/Post/the_post_shows_up_on_the_newsfeed_at_position_{int}.js
index 3b42ea58e..f10896a33 100644
--- a/cypress/integration/Post/the_post_shows_up_on_the_newsfeed_at_position_{int}.js
+++ b/cypress/integration/Post/the_post_shows_up_on_the_newsfeed_at_position_{int}.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the post shows up on the newsfeed at position {int}", index => {
   const selector = `.post-teaser:nth-child(${index}) > .base-card`;
   cy.get(selector).should("contain", 'previously created post');
   cy.get(selector).should("contain", 'with some content');
   
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Search/I_select_a_post_entry.js b/cypress/integration/Search/I_select_a_post_entry.js
index 25611f91e..26e673499 100644
--- a/cypress/integration/Search/I_select_a_post_entry.js
+++ b/cypress/integration/Search/I_select_a_post_entry.js
@@ -1,7 +1,7 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I select a post entry", () => {
   cy.get(".searchable-input .search-post")
     .first()
     .trigger("click");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Search/I_select_a_user_entry.js b/cypress/integration/Search/I_select_a_user_entry.js
index b7222b2fb..3d186ffd8 100644
--- a/cypress/integration/Search/I_select_a_user_entry.js
+++ b/cypress/integration/Search/I_select_a_user_entry.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I select a user entry", () => {
   cy.get(".searchable-input .user-teaser")
     .first()
     .trigger("click");
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/Search/I_should_have_one_item_in_the_select_dropdown.js b/cypress/integration/Search/I_should_have_one_item_in_the_select_dropdown.js
index 7e5188ab6..148bb8195 100644
--- a/cypress/integration/Search/I_should_have_one_item_in_the_select_dropdown.js
+++ b/cypress/integration/Search/I_should_have_one_item_in_the_select_dropdown.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should have one item in the select dropdown", () => {
   cy.get(".searchable-input .ds-select-dropdown").should($li => {
     expect($li).to.have.length(1);
   });
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Search/I_should_not_see_posts_without_the_searched-for_term_in_the_select_dropdown.js b/cypress/integration/Search/I_should_not_see_posts_without_the_searched-for_term_in_the_select_dropdown.js
index a76ed6a5d..d2a2bc1df 100644
--- a/cypress/integration/Search/I_should_not_see_posts_without_the_searched-for_term_in_the_select_dropdown.js
+++ b/cypress/integration/Search/I_should_not_see_posts_without_the_searched-for_term_in_the_select_dropdown.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should not see posts without the searched-for term in the select dropdown", () => {
   cy.get(".ds-select-dropdown")
     .should("not.contain","No searched for content");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Search/I_should_see_posts_with_the_searched-for_term_in_the_select_dropdown.js b/cypress/integration/Search/I_should_see_posts_with_the_searched-for_term_in_the_select_dropdown.js
index ce755abb0..41c132dea 100644
--- a/cypress/integration/Search/I_should_see_posts_with_the_searched-for_term_in_the_select_dropdown.js
+++ b/cypress/integration/Search/I_should_see_posts_with_the_searched-for_term_in_the_select_dropdown.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see posts with the searched-for term in the select dropdown", () => {
   cy.get(".ds-select-dropdown")
     .should("contain","101 Essays that will change the way you think");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Search/I_should_see_the_following_posts_on_the_search_results_page.js b/cypress/integration/Search/I_should_see_the_following_posts_on_the_search_results_page.js
index f703a04f5..3e5da72f7 100644
--- a/cypress/integration/Search/I_should_see_the_following_posts_on_the_search_results_page.js
+++ b/cypress/integration/Search/I_should_see_the_following_posts_on_the_search_results_page.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see the following posts on the search results page:", table => {
   table.hashes().forEach(({ title }) => {  
     cy.get(".post-teaser")
       .should("contain",title)
   });
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Search/I_should_see_the_following_users_in_the_select_dropdown.js b/cypress/integration/Search/I_should_see_the_following_users_in_the_select_dropdown.js
index 3e5e14043..830e19a8d 100644
--- a/cypress/integration/Search/I_should_see_the_following_users_in_the_select_dropdown.js
+++ b/cypress/integration/Search/I_should_see_the_following_users_in_the_select_dropdown.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see the following users in the select dropdown:", table => {
   cy.get(".search-heading").should("contain", "Users");
   table.hashes().forEach(({ slug }) => {
     cy.get(".ds-select-dropdown").should("contain", slug);
   });
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Search/I_type_{string}_and_press_Enter.js b/cypress/integration/Search/I_type_{string}_and_press_Enter.js
index 1a0fc6d42..796820ba0 100644
--- a/cypress/integration/Search/I_type_{string}_and_press_Enter.js
+++ b/cypress/integration/Search/I_type_{string}_and_press_Enter.js
@@ -1,8 +1,8 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I type {string} and press Enter", value => {
   cy.get(".searchable-input .ds-select input")
     .focus()
     .type(value)
     .type("{enter}", { force: true });
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Search/I_type_{string}_and_press_escape.js b/cypress/integration/Search/I_type_{string}_and_press_escape.js
index a3cde6cda..3e2e67be8 100644
--- a/cypress/integration/Search/I_type_{string}_and_press_escape.js
+++ b/cypress/integration/Search/I_type_{string}_and_press_escape.js
@@ -1,8 +1,8 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I type {string} and press escape", value => {
   cy.get(".searchable-input .ds-select input")
     .focus()
     .type(value)
     .type("{esc}");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Search/the_search_field_should_clear.js b/cypress/integration/Search/the_search_field_should_clear.js
index f571cdbd4..10f73959f 100644
--- a/cypress/integration/Search/the_search_field_should_clear.js
+++ b/cypress/integration/Search/the_search_field_should_clear.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the search field should clear", () => {
   cy.get(".searchable-input .ds-select input")
     .should("have.text", "");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/Search/the_search_parameter_equals_{string}.js b/cypress/integration/Search/the_search_parameter_equals_{string}.js
index b8473584c..0f433cf1f 100644
--- a/cypress/integration/Search/the_search_parameter_equals_{string}.js
+++ b/cypress/integration/Search/the_search_parameter_equals_{string}.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the search parameter equals {string}", search => {
   cy.location("search")
     .should("eq", search);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/User.Authentication/I_am_logged_in_with_username_{string}.js b/cypress/integration/User.Authentication/I_am_logged_in_with_username_{string}.js
index 4383282bd..d4af04ff6 100644
--- a/cypress/integration/User.Authentication/I_am_logged_in_with_username_{string}.js
+++ b/cypress/integration/User.Authentication/I_am_logged_in_with_username_{string}.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I am logged in with username {string}", name => {
   cy.get(".avatar-menu").click();
   cy.get(".avatar-menu-popover").contains(name);
   cy.get(".avatar-menu").click(); // Close menu again
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/User.Block/I_block_the_user_{string}.js b/cypress/integration/User.Block/I_block_the_user_{string}.js
index cde1d96b9..6bbca8ece 100644
--- a/cypress/integration/User.Block/I_block_the_user_{string}.js
+++ b/cypress/integration/User.Block/I_block_the_user_{string}.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I block the user {string}", name => {
   cy.neode()
@@ -8,4 +8,4 @@ When("I block the user {string}", name => {
         .first("User", {id: "id-of-peter-pan"})
         .relateTo(blockedUser, "blocked");
     });
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/User.Block/I_should_not_see_{string}_button.js b/cypress/integration/User.Block/I_should_not_see_{string}_button.js
index 5bf0b7a68..791a5aaaf 100644
--- a/cypress/integration/User.Block/I_should_not_see_{string}_button.js
+++ b/cypress/integration/User.Block/I_should_not_see_{string}_button.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I should not see {string} button', button => {
   cy.get('.base-card .action-buttons')
     .should('have.length', 1)
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/User.Block/I_should_see_no_users_in_my_blocked_users_list.js b/cypress/integration/User.Block/I_should_see_no_users_in_my_blocked_users_list.js
index 11161ef2f..3e4813fbc 100644
--- a/cypress/integration/User.Block/I_should_see_no_users_in_my_blocked_users_list.js
+++ b/cypress/integration/User.Block/I_should_see_no_users_in_my_blocked_users_list.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see no users in my blocked users list", () => {
   cy.get('.ds-placeholder')
     .should('contain', "So far, you have not blocked anybody.")
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/User.Block/I_should_see_the_{string}_button.js b/cypress/integration/User.Block/I_should_see_the_{string}_button.js
index 373800870..7e6b7eacb 100644
--- a/cypress/integration/User.Block/I_should_see_the_{string}_button.js
+++ b/cypress/integration/User.Block/I_should_see_the_{string}_button.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I should see the {string} button', button => {
   cy.get('.base-card .action-buttons .base-button')
     .should('contain', button)
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/User.Block/I_{string}_see_{string}_from_the_content_menu_in_the_user_info_box.js b/cypress/integration/User.Block/I_{string}_see_{string}_from_the_content_menu_in_the_user_info_box.js
index 0f44b5192..bcfd9bd7a 100644
--- a/cypress/integration/User.Block/I_{string}_see_{string}_from_the_content_menu_in_the_user_info_box.js
+++ b/cypress/integration/User.Block/I_{string}_see_{string}_from_the_content_menu_in_the_user_info_box.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I {string} see {string} from the content menu in the user info box", (condition, link) => {
   cy.get(".user-content-menu .base-button").click()
   cy.get(".popover .ds-menu-item-link")
     .should(condition === 'should' ? 'contain' : 'not.contain', link)
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/User.Block/a_user_has_blocked_me.js b/cypress/integration/User.Block/a_user_has_blocked_me.js
index d1703407f..8a68f6e65 100644
--- a/cypress/integration/User.Block/a_user_has_blocked_me.js
+++ b/cypress/integration/User.Block/a_user_has_blocked_me.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("a user has blocked me", () => {
   cy.neode()
@@ -12,4 +12,4 @@ When("a user has blocked me", () => {
         })
         .relateTo(blockedUser, "blocked");
     });
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/User.Block/they_should_not_see_the_comment_form.js b/cypress/integration/User.Block/they_should_not_see_the_comment_form.js
index 962934994..34aa86aaf 100644
--- a/cypress/integration/User.Block/they_should_not_see_the_comment_form.js
+++ b/cypress/integration/User.Block/they_should_not_see_the_comment_form.js
@@ -1,5 +1,5 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("they should not see the comment form", () => {
   cy.get(".base-card").children().should('not.have.class', 'comment-form')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/User.Block/they_should_see_a_text_explaining_why_commenting_is_not_possible.js b/cypress/integration/User.Block/they_should_see_a_text_explaining_why_commenting_is_not_possible.js
index d95f3229c..64f0f0fd1 100644
--- a/cypress/integration/User.Block/they_should_see_a_text_explaining_why_commenting_is_not_possible.js
+++ b/cypress/integration/User.Block/they_should_see_a_text_explaining_why_commenting_is_not_possible.js
@@ -1,5 +1,5 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("they should see a text explaining why commenting is not possible", () => {
   cy.get('.ds-placeholder').should('contain', "Commenting is not possible at this time on this post.")
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/User.Mute/I_mute_the_user_{string}.js b/cypress/integration/User.Mute/I_mute_the_user_{string}.js
index e0ed382cb..449aa87d8 100644
--- a/cypress/integration/User.Mute/I_mute_the_user_{string}.js
+++ b/cypress/integration/User.Mute/I_mute_the_user_{string}.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I mute the user {string}", name => {
   cy.neode()
@@ -10,4 +10,4 @@ When("I mute the user {string}", name => {
         })
         .relateTo(mutedUser, "muted");
     });
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/User.Mute/the_list_of_posts_of_this_user_is_empty.js b/cypress/integration/User.Mute/the_list_of_posts_of_this_user_is_empty.js
index 038ca2168..66ac3bdb8 100644
--- a/cypress/integration/User.Mute/the_list_of_posts_of_this_user_is_empty.js
+++ b/cypress/integration/User.Mute/the_list_of_posts_of_this_user_is_empty.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the list of posts of this user is empty", () => {
   cy.get(".base-card").not(".post-link");
   cy.get(".main-container").find(".ds-space.hc-empty");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/User.Mute/the_search_should_contain_the_annoying_user.js b/cypress/integration/User.Mute/the_search_should_contain_the_annoying_user.js
index d29eafc2f..7d47c48aa 100644
--- a/cypress/integration/User.Mute/the_search_should_contain_the_annoying_user.js
+++ b/cypress/integration/User.Mute/the_search_should_contain_the_annoying_user.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the search should contain the annoying user", () => {
   cy.get(".searchable-input .ds-select-dropdown")
@@ -10,4 +10,4 @@ Then("the search should contain the annoying user", () => {
   cy.get(".searchable-input .ds-select input")
     .focus()
     .type("{esc}");
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/User.Mute/the_search_should_not_contain_posts_by_the_annoying_user.js b/cypress/integration/User.Mute/the_search_should_not_contain_posts_by_the_annoying_user.js
index a2f0a01d7..1dad99678 100644
--- a/cypress/integration/User.Mute/the_search_should_not_contain_posts_by_the_annoying_user.js
+++ b/cypress/integration/User.Mute/the_search_should_not_contain_posts_by_the_annoying_user.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the search should not contain posts by the annoying user", () => {
   cy.get(".searchable-input .ds-select-dropdown").should($li => {
@@ -7,4 +7,4 @@ Then("the search should not contain posts by the annoying user", () => {
   cy.get(".ds-select-dropdown")
     .should("not.have.class", '.search-post')
     .should("not.contain", 'Spam')
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/User.SettingNotifications/I_click_on_element_with_ID_{string}.js b/cypress/integration/User.SettingNotifications/I_click_on_element_with_ID_{string}.js
index 251c38941..7bdb20e5d 100644
--- a/cypress/integration/User.SettingNotifications/I_click_on_element_with_ID_{string}.js
+++ b/cypress/integration/User.SettingNotifications/I_click_on_element_with_ID_{string}.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I click on element with ID {string}", (id) => {
   cy.get('#' + id).click()
diff --git a/cypress/integration/User.SettingNotifications/I_click_save.js b/cypress/integration/User.SettingNotifications/I_click_save.js
index 32d702f1e..9412d7912 100644
--- a/cypress/integration/User.SettingNotifications/I_click_save.js
+++ b/cypress/integration/User.SettingNotifications/I_click_save.js
@@ -1,5 +1,5 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I click save", () => {
   cy.get(".save-button").click()
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/User.SettingNotifications/I_click_the_checkbox_show_donations_progress_bar_and_save.js b/cypress/integration/User.SettingNotifications/I_click_the_checkbox_show_donations_progress_bar_and_save.js
index b4289dd5e..1806af807 100644
--- a/cypress/integration/User.SettingNotifications/I_click_the_checkbox_show_donations_progress_bar_and_save.js
+++ b/cypress/integration/User.SettingNotifications/I_click_the_checkbox_show_donations_progress_bar_and_save.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I click the checkbox show donations progress bar and save", () => {
   cy.get("#showDonations").click()
   cy.get(".donations-info-button").click()
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.Avatar/I_cannot_upload_a_picture.js b/cypress/integration/UserProfile.Avatar/I_cannot_upload_a_picture.js
index 8b501f3f5..9e44b55ba 100644
--- a/cypress/integration/UserProfile.Avatar/I_cannot_upload_a_picture.js
+++ b/cypress/integration/UserProfile.Avatar/I_cannot_upload_a_picture.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I cannot upload a picture", () => {
   cy.get(".base-card")
     .children()
     .should("not.have.id", "customdropzone")
     .should("have.class", "profile-avatar");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/UserProfile.Avatar/I_should_be_able_to_change_my_profile_picture.js b/cypress/integration/UserProfile.Avatar/I_should_be_able_to_change_my_profile_picture.js
index 366fd8292..27be5a99d 100644
--- a/cypress/integration/UserProfile.Avatar/I_should_be_able_to_change_my_profile_picture.js
+++ b/cypress/integration/UserProfile.Avatar/I_should_be_able_to_change_my_profile_picture.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should be able to change my profile picture", () => {
   const avatarUpload = "onourjourney.png";
@@ -14,4 +14,4 @@ Then("I should be able to change my profile picture", () => {
     .and("contains", "onourjourney");
   cy.contains(".iziToast-message", "Upload successful")
     .should("have.length",1);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/UserProfile.ChangePassword/I_can_login_successfully.js b/cypress/integration/UserProfile.ChangePassword/I_can_login_successfully.js
index d1a62cc4d..1349b5eb9 100644
--- a/cypress/integration/UserProfile.ChangePassword/I_can_login_successfully.js
+++ b/cypress/integration/UserProfile.ChangePassword/I_can_login_successfully.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I can login successfully", () => {
   // cy.reload();
   cy.get(".iziToast-wrapper")
      .should("contain", "You are logged in!");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/UserProfile.ChangePassword/I_cannot_login_anymore.js b/cypress/integration/UserProfile.ChangePassword/I_cannot_login_anymore.js
index ff381d891..f6159c79b 100644
--- a/cypress/integration/UserProfile.ChangePassword/I_cannot_login_anymore.js
+++ b/cypress/integration/UserProfile.ChangePassword/I_cannot_login_anymore.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I cannot login anymore", password => {
   //cy.reload();
   cy.get(".iziToast-wrapper")
     .should("contain", "Incorrect email address or password.");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/UserProfile.ChangePassword/I_cannot_submit_the_form.js b/cypress/integration/UserProfile.ChangePassword/I_cannot_submit_the_form.js
index 657d38bd8..02a2c7d83 100644
--- a/cypress/integration/UserProfile.ChangePassword/I_cannot_submit_the_form.js
+++ b/cypress/integration/UserProfile.ChangePassword/I_cannot_submit_the_form.js
@@ -1,6 +1,6 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I cannot submit the form", () => {
   cy.get("button[type=submit]")
     .should('be.disabled');
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/UserProfile.ChangePassword/I_fill_the_password_form_with.js b/cypress/integration/UserProfile.ChangePassword/I_fill_the_password_form_with.js
index 69345ecc6..af0c6639b 100644
--- a/cypress/integration/UserProfile.ChangePassword/I_fill_the_password_form_with.js
+++ b/cypress/integration/UserProfile.ChangePassword/I_fill_the_password_form_with.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I fill the password form with:", table => {
   table = table.rowsHash();
@@ -8,4 +8,4 @@ When("I fill the password form with:", table => {
     .type(table["Your new password"])
     .get("input[id=passwordConfirmation]")
     .type(table["Confirm new password"]);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/UserProfile.ChangePassword/I_submit_the_form.js b/cypress/integration/UserProfile.ChangePassword/I_submit_the_form.js
index 18349cff8..8b17f6de1 100644
--- a/cypress/integration/UserProfile.ChangePassword/I_submit_the_form.js
+++ b/cypress/integration/UserProfile.ChangePassword/I_submit_the_form.js
@@ -1,5 +1,5 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I submit the form", () => {
   cy.get("form").submit();
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/UserProfile.NameDescriptionLocation/I_can_see_my_new_name_{string}_when_I_click_on_my_profile_picture_in_the_top_right.js b/cypress/integration/UserProfile.NameDescriptionLocation/I_can_see_my_new_name_{string}_when_I_click_on_my_profile_picture_in_the_top_right.js
index b9e97a304..221a13414 100644
--- a/cypress/integration/UserProfile.NameDescriptionLocation/I_can_see_my_new_name_{string}_when_I_click_on_my_profile_picture_in_the_top_right.js
+++ b/cypress/integration/UserProfile.NameDescriptionLocation/I_can_see_my_new_name_{string}_when_I_click_on_my_profile_picture_in_the_top_right.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I can see my new name {string} when I click on my profile picture in the top right', name => {
   cy.get('.avatar-menu').click() // open
   cy.get('.avatar-menu-popover').contains(name)
   cy.get('.avatar-menu').click() // close again
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.NameDescriptionLocation/I_have_the_following_self-description.js b/cypress/integration/UserProfile.NameDescriptionLocation/I_have_the_following_self-description.js
index a1bc1c524..f0f6ba4da 100644
--- a/cypress/integration/UserProfile.NameDescriptionLocation/I_have_the_following_self-description.js
+++ b/cypress/integration/UserProfile.NameDescriptionLocation/I_have_the_following_self-description.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I have the following self-description:', text => {
     cy.get('textarea[id=about]')
@@ -9,4 +9,4 @@ When('I have the following self-description:', text => {
       .not('[disabled]')
     cy.get('.iziToast-message')
       .should('contain', 'Your data was successfully updated')
-  })
\ No newline at end of file
+  })
diff --git a/cypress/integration/UserProfile.NameDescriptionLocation/I_save_{string}_as_my_location.js b/cypress/integration/UserProfile.NameDescriptionLocation/I_save_{string}_as_my_location.js
index de5143b9f..00d5141f8 100644
--- a/cypress/integration/UserProfile.NameDescriptionLocation/I_save_{string}_as_my_location.js
+++ b/cypress/integration/UserProfile.NameDescriptionLocation/I_save_{string}_as_my_location.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I save {string} as my location', location => {
     cy.get('input[id=city]').type(location)
@@ -10,4 +10,4 @@ When('I save {string} as my location', location => {
       .not('[disabled]')
     cy.get('.iziToast-message')
       .should('contain', 'Your data was successfully updated')
-  })
\ No newline at end of file
+  })
diff --git a/cypress/integration/UserProfile.NameDescriptionLocation/I_save_{string}_as_my_new_name.js b/cypress/integration/UserProfile.NameDescriptionLocation/I_save_{string}_as_my_new_name.js
index 22e26cbc5..b94683a5b 100644
--- a/cypress/integration/UserProfile.NameDescriptionLocation/I_save_{string}_as_my_new_name.js
+++ b/cypress/integration/UserProfile.NameDescriptionLocation/I_save_{string}_as_my_new_name.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I save {string} as my new name', name => {
   cy.get('input[id=name]')
@@ -9,4 +9,4 @@ When('I save {string} as my new name', name => {
     .not('[disabled]')
   cy.get('.iziToast-message')
     .should('contain', 'Your data was successfully updated')
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.NameDescriptionLocation/they_can_see_the_following_text_in_the_info_box_below_my_avatar.js b/cypress/integration/UserProfile.NameDescriptionLocation/they_can_see_the_following_text_in_the_info_box_below_my_avatar.js
index 6d375a406..d416c8d10 100644
--- a/cypress/integration/UserProfile.NameDescriptionLocation/they_can_see_the_following_text_in_the_info_box_below_my_avatar.js
+++ b/cypress/integration/UserProfile.NameDescriptionLocation/they_can_see_the_following_text_in_the_info_box_below_my_avatar.js
@@ -1,5 +1,5 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('they can see the following text in the info box below my avatar:', text => {
   cy.contains(text)
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.NameDescriptionLocation/they_can_see_{string}_in_the_info_box_below_my_avatar.js b/cypress/integration/UserProfile.NameDescriptionLocation/they_can_see_{string}_in_the_info_box_below_my_avatar.js
index ea328f441..ea8cf2158 100644
--- a/cypress/integration/UserProfile.NameDescriptionLocation/they_can_see_{string}_in_the_info_box_below_my_avatar.js
+++ b/cypress/integration/UserProfile.NameDescriptionLocation/they_can_see_{string}_in_the_info_box_below_my_avatar.js
@@ -1,5 +1,5 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('they can see {string} in the info box below my avatar', location => {
   cy.contains(location)
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.SocialMedia/I_add_a_social_media_link.js b/cypress/integration/UserProfile.SocialMedia/I_add_a_social_media_link.js
index ca2e36818..58d29b49e 100644
--- a/cypress/integration/UserProfile.SocialMedia/I_add_a_social_media_link.js
+++ b/cypress/integration/UserProfile.SocialMedia/I_add_a_social_media_link.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I add a social media link', () => {
   cy.get('button')
@@ -9,4 +9,4 @@ When('I add a social media link', () => {
     .get('button')
     .contains('Save')
     .click()
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.SocialMedia/I_can_cancel_editing.js b/cypress/integration/UserProfile.SocialMedia/I_can_cancel_editing.js
index 03d60c44a..72d83c9a3 100644
--- a/cypress/integration/UserProfile.SocialMedia/I_can_cancel_editing.js
+++ b/cypress/integration/UserProfile.SocialMedia/I_can_cancel_editing.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I can cancel editing', () => {
   cy.get('button#cancel')
     .click()
     .get('input#editSocialMedia')
     .should('have.length', 0)
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.SocialMedia/I_delete_a_social_media_link.js b/cypress/integration/UserProfile.SocialMedia/I_delete_a_social_media_link.js
index 10daffca1..1f0f3e22e 100644
--- a/cypress/integration/UserProfile.SocialMedia/I_delete_a_social_media_link.js
+++ b/cypress/integration/UserProfile.SocialMedia/I_delete_a_social_media_link.js
@@ -1,6 +1,6 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I delete a social media link', () => {
   cy.get(".base-button[title='Delete']")
     .click()
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.SocialMedia/I_edit_and_save_the_link.js b/cypress/integration/UserProfile.SocialMedia/I_edit_and_save_the_link.js
index 714e6b701..cd90480e0 100644
--- a/cypress/integration/UserProfile.SocialMedia/I_edit_and_save_the_link.js
+++ b/cypress/integration/UserProfile.SocialMedia/I_edit_and_save_the_link.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I edit and save the link', () => {
   cy.get('input#editSocialMedia')
@@ -7,4 +7,4 @@ When('I edit and save the link', () => {
     .get('button')
     .contains('Save')
     .click()
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.SocialMedia/I_have_added_a_social_media_link.js b/cypress/integration/UserProfile.SocialMedia/I_have_added_a_social_media_link.js
index 93e35bf28..b1eb698de 100644
--- a/cypress/integration/UserProfile.SocialMedia/I_have_added_a_social_media_link.js
+++ b/cypress/integration/UserProfile.SocialMedia/I_have_added_a_social_media_link.js
@@ -1,4 +1,4 @@
-import { Given } from "cypress-cucumber-preprocessor/steps";
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
 
 Given('I have added a social media link', () => {
   cy.visit('/settings/my-social-media')
@@ -10,4 +10,4 @@ Given('I have added a social media link', () => {
     .get('button')
     .contains('Save')
     .click()
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.SocialMedia/I_start_editing_a_social_media_link.js b/cypress/integration/UserProfile.SocialMedia/I_start_editing_a_social_media_link.js
index 1da05cfa5..760536bd2 100644
--- a/cypress/integration/UserProfile.SocialMedia/I_start_editing_a_social_media_link.js
+++ b/cypress/integration/UserProfile.SocialMedia/I_start_editing_a_social_media_link.js
@@ -1,6 +1,6 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I start editing a social media link', () => {
   cy.get(".base-button[title='Edit']")
     .click()
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.SocialMedia/the_new_social_media_link_shows_up_on_the_page.js b/cypress/integration/UserProfile.SocialMedia/the_new_social_media_link_shows_up_on_the_page.js
index e72546f2a..fd1bf9350 100644
--- a/cypress/integration/UserProfile.SocialMedia/the_new_social_media_link_shows_up_on_the_page.js
+++ b/cypress/integration/UserProfile.SocialMedia/the_new_social_media_link_shows_up_on_the_page.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('the new social media link shows up on the page', () => {
   cy.get('a[href="https://freeradical.zone/peter-pan"]')
     .should('have.length', 1)
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.SocialMedia/the_new_url_is_displayed.js b/cypress/integration/UserProfile.SocialMedia/the_new_url_is_displayed.js
index c25e6f0bb..c9c7dd906 100644
--- a/cypress/integration/UserProfile.SocialMedia/the_new_url_is_displayed.js
+++ b/cypress/integration/UserProfile.SocialMedia/the_new_url_is_displayed.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('the new url is displayed', () => {
   cy.get("a[href='https://freeradical.zone/tinkerbell']")
     .should('have.length', 1)
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/UserProfile.SocialMedia/the_old_url_is_not_displayed.js b/cypress/integration/UserProfile.SocialMedia/the_old_url_is_not_displayed.js
index b3e804124..c0941f600 100644
--- a/cypress/integration/UserProfile.SocialMedia/the_old_url_is_not_displayed.js
+++ b/cypress/integration/UserProfile.SocialMedia/the_old_url_is_not_displayed.js
@@ -1,7 +1,7 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('the old url is not displayed', () => {
   cy.get("a[href='https://freeradical.zone/peter-pan']")
     .should('have.length', 0)
 })
-  
\ No newline at end of file
+  
diff --git a/cypress/integration/UserProfile.SocialMedia/they_should_be_able_to_see_my_social_media_links.js b/cypress/integration/UserProfile.SocialMedia/they_should_be_able_to_see_my_social_media_links.js
index 249e4f420..23b167d95 100644
--- a/cypress/integration/UserProfile.SocialMedia/they_should_be_able_to_see_my_social_media_links.js
+++ b/cypress/integration/UserProfile.SocialMedia/they_should_be_able_to_see_my_social_media_links.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('they should be able to see my social media links', () => {
   cy.get('.base-card')
     .contains('Where else can I find Peter Pan?')
     .get('a[href="https://freeradical.zone/peter-pan"]')
     .should('have.length', 1)
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/common/I_am_logged_in_as_{string}.js b/cypress/integration/common/I_am_logged_in_as_{string}.js
index 96d1c28ab..309194fd5 100644
--- a/cypress/integration/common/I_am_logged_in_as_{string}.js
+++ b/cypress/integration/common/I_am_logged_in_as_{string}.js
@@ -1,5 +1,5 @@
-import { Given } from "cypress-cucumber-preprocessor/steps";
-import encode from '../../../backend/src/jwt/encode'
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
+import encode from '../../../../backend/src/jwt/encode'
 
 Given("I am logged in as {string}", slug => {
   cy.neode()
@@ -15,4 +15,4 @@ Given("I am logged in as {string}", slug => {
     .then(user => {
       cy.setCookie('ocelot-social-token', encode(user))
     })
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_am_on_page_{string}.js b/cypress/integration/common/I_am_on_page_{string}.js
index 5ef1b9852..44b10c4c4 100644
--- a/cypress/integration/common/I_am_on_page_{string}.js
+++ b/cypress/integration/common/I_am_on_page_{string}.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I am on page {string}", page => {
   cy.location("pathname")
     .should("match", new RegExp(page));
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_can_see_the_following_table.js b/cypress/integration/common/I_can_see_the_following_table.js
index 9ebe1208c..f62e1a99a 100644
--- a/cypress/integration/common/I_can_see_the_following_table.js
+++ b/cypress/integration/common/I_can_see_the_following_table.js
@@ -1,4 +1,4 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then('I can see the following table:', table => {
   const headers = table.raw()[0]
@@ -13,4 +13,4 @@ Then('I can see the following table:', table => {
       .eq(i)
       .should('contain', expected)
   })
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/common/I_choose_the_following_text_as_content.js b/cypress/integration/common/I_choose_the_following_text_as_content.js
index 62b5426d5..0cb974004 100644
--- a/cypress/integration/common/I_choose_the_following_text_as_content.js
+++ b/cypress/integration/common/I_choose_the_following_text_as_content.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I choose the following text as content:", async text => {
   cy.task('getValue', 'lastPost').then(lastPost => {
@@ -6,4 +6,4 @@ When("I choose the following text as content:", async text => {
     cy.task('pushValue', { name: 'lastPost', value: lastPost })
     cy.get(".editor .ProseMirror").type(lastPost.content);
   })
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_click_on_{string}.js b/cypress/integration/common/I_click_on_{string}.js
index 5f43eb912..9d51f27f7 100644
--- a/cypress/integration/common/I_click_on_{string}.js
+++ b/cypress/integration/common/I_click_on_{string}.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I click on {string}", element => {
   const elementSelectors = {
@@ -16,4 +16,4 @@ When("I click on {string}", element => {
   cy.get(elementSelectors[element])
     .click()
     .wait(750);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_click_on_{string}_from_the_content_menu_in_the_user_info_box.js b/cypress/integration/common/I_click_on_{string}_from_the_content_menu_in_the_user_info_box.js
index f1a859bfe..66373037e 100644
--- a/cypress/integration/common/I_click_on_{string}_from_the_content_menu_in_the_user_info_box.js
+++ b/cypress/integration/common/I_click_on_{string}_from_the_content_menu_in_the_user_info_box.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I click on {string} from the content menu in the user info box",
   button => {
@@ -9,4 +9,4 @@ When("I click on {string} from the content menu in the user info box",
         force: true
       });
     }
-);
\ No newline at end of file
+);
diff --git a/cypress/integration/common/I_fill_in_my_credentials_{string}_{string}.js b/cypress/integration/common/I_fill_in_my_credentials_{string}_{string}.js
index e2227f454..3c0b0d02e 100644
--- a/cypress/integration/common/I_fill_in_my_credentials_{string}_{string}.js
+++ b/cypress/integration/common/I_fill_in_my_credentials_{string}_{string}.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I fill in my credentials {string} {string}", (email,password) => {
   cy.get("input[name=email]")
@@ -9,4 +9,4 @@ When("I fill in my credentials {string} {string}", (email,password) => {
     .trigger("focus")
     .type('{selectall}{backspace}')
     .type(password);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_follow_the_user_{string}.js b/cypress/integration/common/I_follow_the_user_{string}.js
index 56d50a5ae..deb5f1ba6 100644
--- a/cypress/integration/common/I_follow_the_user_{string}.js
+++ b/cypress/integration/common/I_follow_the_user_{string}.js
@@ -1,3 +1,5 @@
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
+
 Given("I follow the user {string}", name => {
   cy.neode()
     .first("User", {name})
@@ -8,4 +10,4 @@ Given("I follow the user {string}", name => {
         })
         .relateTo(followed, "following");
     });
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_get_removed_from_his_follower_collection.js b/cypress/integration/common/I_get_removed_from_his_follower_collection.js
index b32ca5961..7721efda0 100644
--- a/cypress/integration/common/I_get_removed_from_his_follower_collection.js
+++ b/cypress/integration/common/I_get_removed_from_his_follower_collection.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I get removed from his follower collection", () => {
   cy.get(".base-card")
     .not(".post-link");
   cy.get(".main-container")
     .contains(".base-card","is not followed by anyone");
-  });
\ No newline at end of file
+  });
diff --git a/cypress/integration/common/I_log_out.js b/cypress/integration/common/I_log_out.js
index 51605f17e..41594d3ab 100644
--- a/cypress/integration/common/I_log_out.js
+++ b/cypress/integration/common/I_log_out.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I log out", () => {
   cy.get(".avatar-menu")
@@ -6,4 +6,4 @@ When("I log out", () => {
   cy.get(".avatar-menu-popover")
     .find('a[href="/logout"]')
     .click();
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_navigate_to_my_{string}_settings_page.js b/cypress/integration/common/I_navigate_to_my_{string}_settings_page.js
index 4d369eab2..91a3b58d9 100644
--- a/cypress/integration/common/I_navigate_to_my_{string}_settings_page.js
+++ b/cypress/integration/common/I_navigate_to_my_{string}_settings_page.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I navigate to my {string} settings page", settingsPage => {
   cy.get(".avatar-menu-trigger").click();
@@ -7,4 +7,4 @@ When("I navigate to my {string} settings page", settingsPage => {
     .contains("Settings")
     .click();
   cy.contains(".ds-menu-item-link", settingsPage).click();
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_navigate_to_page_{string}.js b/cypress/integration/common/I_navigate_to_page_{string}.js
index aa929c80a..72cf90b6a 100644
--- a/cypress/integration/common/I_navigate_to_page_{string}.js
+++ b/cypress/integration/common/I_navigate_to_page_{string}.js
@@ -1,5 +1,5 @@
-import { Given } from "cypress-cucumber-preprocessor/steps";
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
 
 Given("I navigate to page {string}", page => {
   cy.visit(page);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_refresh_the_page.js b/cypress/integration/common/I_refresh_the_page.js
index 1ac655cb4..47e493fe4 100644
--- a/cypress/integration/common/I_refresh_the_page.js
+++ b/cypress/integration/common/I_refresh_the_page.js
@@ -1,6 +1,6 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When('I refresh the page', () => {
   cy.visit('/')
     .reload();
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_search_for_{string}.js b/cypress/integration/common/I_search_for_{string}.js
index eaad481f7..f91959182 100644
--- a/cypress/integration/common/I_search_for_{string}.js
+++ b/cypress/integration/common/I_search_for_{string}.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I search for {string}", value => {
   cy.intercept({
@@ -9,4 +9,4 @@ When("I search for {string}", value => {
     .focus()
     .type(value);
   cy.wait("@graphqlRequest");
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_see_a_toaster_with_{string}.js b/cypress/integration/common/I_see_a_toaster_with_{string}.js
index 1cf7da285..e1496b8de 100644
--- a/cypress/integration/common/I_see_a_toaster_with_{string}.js
+++ b/cypress/integration/common/I_see_a_toaster_with_{string}.js
@@ -1,5 +1,5 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I see a toaster with {string}", (title) => {
   cy.get(".iziToast-message").should("contain", title);
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/common/I_see_a_{string}_message.js b/cypress/integration/common/I_see_a_{string}_message.js
index 6cc2cbf6b..cc8deca5f 100644
--- a/cypress/integration/common/I_see_a_{string}_message.js
+++ b/cypress/integration/common/I_see_a_{string}_message.js
@@ -1,5 +1,5 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I see a {string} message:", (_type, message) => {
   cy.contains(message);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_should_see_the_following_posts_in_the_select_dropdown.js b/cypress/integration/common/I_should_see_the_following_posts_in_the_select_dropdown.js
index 420c3376a..88e18a280 100644
--- a/cypress/integration/common/I_should_see_the_following_posts_in_the_select_dropdown.js
+++ b/cypress/integration/common/I_should_see_the_following_posts_in_the_select_dropdown.js
@@ -1,8 +1,8 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("I should see the following posts in the select dropdown:", table => {
   table.hashes().forEach(({ title }) => {
     cy.get(".ds-select-dropdown")
       .should("contain", title);
   });
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/I_wait_for_{int}_milliseconds.js b/cypress/integration/common/I_wait_for_{int}_milliseconds.js
index bc8ef906a..2ed462340 100644
--- a/cypress/integration/common/I_wait_for_{int}_milliseconds.js
+++ b/cypress/integration/common/I_wait_for_{int}_milliseconds.js
@@ -1,5 +1,5 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("I wait for {int} milliseconds", time => {
   cy.wait(time)
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/the_checkbox_with_ID_{string}_should_{string}.js b/cypress/integration/common/the_checkbox_with_ID_{string}_should_{string}.js
index ad3f7f3cc..603524804 100644
--- a/cypress/integration/common/the_checkbox_with_ID_{string}_should_{string}.js
+++ b/cypress/integration/common/the_checkbox_with_ID_{string}_should_{string}.js
@@ -1,4 +1,4 @@
-import { When } from "cypress-cucumber-preprocessor/steps";
+import { When } from "@badeball/cypress-cucumber-preprocessor";
 
 When("the checkbox with ID {string} should {string}", (id, value) => {
   cy.get('#' + id).should(value)
diff --git a/cypress/integration/common/the_first_post_on_the_newsfeed_has_the_title.js b/cypress/integration/common/the_first_post_on_the_newsfeed_has_the_title.js
index afe370e90..ba98a7a8e 100644
--- a/cypress/integration/common/the_first_post_on_the_newsfeed_has_the_title.js
+++ b/cypress/integration/common/the_first_post_on_the_newsfeed_has_the_title.js
@@ -1,6 +1,6 @@
-import { Then } from "cypress-cucumber-preprocessor/steps";
+import { Then } from "@badeball/cypress-cucumber-preprocessor";
 
 Then("the first post on the newsfeed has the title:", title => {
   cy.get(".post-teaser:first")
     .should("contain", title);
-});
\ No newline at end of file
+});
diff --git a/cypress/integration/common/the_following_{string}_are_in_the_database.js b/cypress/integration/common/the_following_{string}_are_in_the_database.js
index e03a705f4..8e41afa2a 100644
--- a/cypress/integration/common/the_following_{string}_are_in_the_database.js
+++ b/cypress/integration/common/the_following_{string}_are_in_the_database.js
@@ -1,4 +1,4 @@
-import { Given } from "cypress-cucumber-preprocessor/steps";
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
 
 Given("the following {string} are in the database:", (table,data) => {
   switch(table){
@@ -37,4 +37,4 @@ Given("the following {string} are in the database:", (table,data) => {
       });
       break
   }
-})
\ No newline at end of file
+})
diff --git a/cypress/integration/common/{string}_wrote_a_post_{string}.js b/cypress/integration/common/{string}_wrote_a_post_{string}.js
index 42ac98028..0da055951 100644
--- a/cypress/integration/common/{string}_wrote_a_post_{string}.js
+++ b/cypress/integration/common/{string}_wrote_a_post_{string}.js
@@ -1,4 +1,4 @@
-import { Given } from "cypress-cucumber-preprocessor/steps";
+import { Given } from "@badeball/cypress-cucumber-preprocessor";
 
 Given('{string} wrote a post {string}', (author, title) => {
   cy.factory()
@@ -7,4 +7,4 @@ Given('{string} wrote a post {string}', (author, title) => {
     }, {
       authorId: author,
     });
-});
\ No newline at end of file
+});