diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f517e05..a5e598c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,57 +1,3 @@
 class ApplicationController < ActionController::Base
-  include Kiqr::SetCurrentAttributes
-  include Kiqr::CurrentHelper
-
-  before_action :authenticate_user!
-  before_action :ensure_onboarded, unless: :devise_controller?
-  before_action :setup_locale
-
-  private
-
-  # Automatically include account_id in all URL options if it is already present in the params.
-  # This is used to ensure that all routes are scoped to the current team. Personal account
-  # routes are not affected.
-  def default_url_options
-    {account_id: params[:account_id]}
-  end
-
-  # Redirect to onboarding if user is not onboarded
-  def ensure_onboarded
-    redirect_to onboarding_path if user_signed_in? && !current_user.onboarded?
-  end
-
-  # Get the options for the locale form select field
-  def options_for_locale
-    I18n.available_locales.map do |locale|
-      [I18n.t("languages.#{locale}"), locale]
-    end
-  end
-  helper_method :options_for_locale
-
-  # Override the method to change the sign-in redirect path
-  def after_sign_in_path_for(resource)
-    if session[:after_sign_in_path].present?
-      session.delete(:after_sign_in_path)
-    elsif current_user.accounts.any?
-      select_account_path
-    else
-      dashboard_path
-    end
-  end
-
-  # Override the method to change the sign-out redirect path
-  def after_sign_out_path_for(resource_or_scope)
-    # Generate the root path without default URL options
-    uri = URI.parse(root_url)
-    uri.query = nil # Remove any query parameters
-    uri.to_s
-  end
-
-  # The locale is set to the user's locale if present, otherwise it is set to the default locale
-  # Get available locales and default_locale from Kiqr::Config
-  def setup_locale
-    I18n.default_locale = Kiqr::Config.default_locale
-    I18n.available_locales = Kiqr::Config.available_locales
-    I18n.locale = current_user&.locale&.to_sym || I18n.default_locale
-  end
+  include Kiqr::Framework
 end
diff --git a/gems/kiqr/app/helpers/kiqr/form_helper.rb b/gems/kiqr/app/helpers/kiqr/form_helper.rb
new file mode 100644
index 0000000..2bb0488
--- /dev/null
+++ b/gems/kiqr/app/helpers/kiqr/form_helper.rb
@@ -0,0 +1,10 @@
+module Kiqr
+  module FormHelper
+    # Get the options for the locale form select field
+    def options_for_locale
+      I18n.available_locales.map do |locale|
+        [I18n.t("languages.#{locale}"), locale]
+      end
+    end
+  end
+end
diff --git a/gems/kiqr/lib/kiqr.rb b/gems/kiqr/lib/kiqr.rb
index 1402207..28c92ca 100644
--- a/gems/kiqr/lib/kiqr.rb
+++ b/gems/kiqr/lib/kiqr.rb
@@ -11,6 +11,7 @@
 module Kiqr
   autoload :ApplicationService, "kiqr/application_service"
   autoload :Config, "kiqr/config"
+  autoload :Framework, "kiqr/framework"
 
   module Services
     module Teams
diff --git a/gems/kiqr/lib/kiqr/framework.rb b/gems/kiqr/lib/kiqr/framework.rb
new file mode 100644
index 0000000..45f01db
--- /dev/null
+++ b/gems/kiqr/lib/kiqr/framework.rb
@@ -0,0 +1,55 @@
+module Kiqr
+  module Framework
+    extend ActiveSupport::Concern
+
+    included do
+      before_action :authenticate_user!
+      before_action :ensure_onboarded, unless: :devise_controller?
+      before_action :setup_locale
+
+      include Kiqr::SetCurrentAttributes
+      include Kiqr::CurrentHelper
+    end
+
+    private
+
+    # Automatically include account_id in all URL options if it is already present in the params.
+    # This is used to ensure that all routes are scoped to the current team. Personal account
+    # routes are not affected.
+    def default_url_options
+      {account_id: params[:account_id]}
+    end
+
+    # Redirect to onboarding if user is not onboarded
+    def ensure_onboarded
+      redirect_to onboarding_path if user_signed_in? && !current_user.onboarded?
+    end
+
+    # Override the method to change the sign-in redirect path
+    def after_sign_in_path_for(resource)
+      if session[:after_sign_in_path].present?
+        session.delete(:after_sign_in_path)
+      elsif current_user.accounts.any?
+        select_account_path
+      else
+        dashboard_path
+      end
+    end
+
+    # Override the method to change the sign-out redirect path
+    def after_sign_out_path_for(resource_or_scope)
+      # Generate the root path without default URL options
+      uri = URI.parse(root_url)
+      uri.query = nil # Remove any query parameters
+      uri.to_s
+    end
+
+    # The locale is set to the user's locale if present, otherwise it is set to the default locale
+    # Get available locales and default_locale from Kiqr::Config
+    def setup_locale
+      I18n.default_locale = Kiqr::Config.default_locale
+      I18n.available_locales = Kiqr::Config.available_locales
+      I18n.locale = current_user&.locale&.to_sym || I18n.default_locale
+    end
+  end
+end