diff --git a/packages/neon/neon/lib/settings.dart b/packages/neon/neon/lib/settings.dart
index e8d9b756..15823bf3 100644
--- a/packages/neon/neon/lib/settings.dart
+++ b/packages/neon/neon/lib/settings.dart
@@ -1,3 +1,4 @@
+export 'package:neon/src/models/label_builder.dart';
 export 'package:neon/src/settings/models/nextcloud_app_options.dart';
 export 'package:neon/src/settings/models/options_category.dart';
 export 'package:neon/src/settings/models/select_option.dart';
diff --git a/packages/neon/neon/lib/sort_box.dart b/packages/neon/neon/lib/sort_box.dart
index e66072f2..65ffbafd 100644
--- a/packages/neon/neon/lib/sort_box.dart
+++ b/packages/neon/neon/lib/sort_box.dart
@@ -1,3 +1,4 @@
+export 'package:neon/src/models/label_builder.dart';
 export 'package:neon/src/sort_box/sort_box_builder.dart';
 export 'package:neon/src/sort_box/sort_box_order_option_values.dart';
 export 'package:sort_box/sort_box.dart';
diff --git a/packages/neon/neon/lib/src/settings/widgets/label_builder.dart b/packages/neon/neon/lib/src/models/label_builder.dart
similarity index 68%
rename from packages/neon/neon/lib/src/settings/widgets/label_builder.dart
rename to packages/neon/neon/lib/src/models/label_builder.dart
index 76f20caf..82baa178 100644
--- a/packages/neon/neon/lib/src/settings/widgets/label_builder.dart
+++ b/packages/neon/neon/lib/src/models/label_builder.dart
@@ -1,5 +1,3 @@
 import 'package:flutter/widgets.dart';
-import 'package:meta/meta.dart';
 
-@internal
 typedef LabelBuilder = String Function(BuildContext);
diff --git a/packages/neon/neon/lib/src/settings/models/option.dart b/packages/neon/neon/lib/src/settings/models/option.dart
index 0668d38e..5e9d57e9 100644
--- a/packages/neon/neon/lib/src/settings/models/option.dart
+++ b/packages/neon/neon/lib/src/settings/models/option.dart
@@ -2,9 +2,9 @@ import 'dart:async';
 
 import 'package:flutter/foundation.dart';
 import 'package:meta/meta.dart';
+import 'package:neon/src/models/label_builder.dart';
 import 'package:neon/src/settings/models/options_category.dart';
 import 'package:neon/src/settings/models/storage.dart';
-import 'package:neon/src/settings/widgets/label_builder.dart';
 import 'package:rxdart/rxdart.dart';
 
 @internal
diff --git a/packages/neon/neon/lib/src/settings/models/options_category.dart b/packages/neon/neon/lib/src/settings/models/options_category.dart
index d057552f..d563c210 100644
--- a/packages/neon/neon/lib/src/settings/models/options_category.dart
+++ b/packages/neon/neon/lib/src/settings/models/options_category.dart
@@ -1,4 +1,4 @@
-import 'package:neon/src/settings/widgets/label_builder.dart';
+import 'package:neon/src/models/label_builder.dart';
 
 class OptionsCategory {
   OptionsCategory({
diff --git a/packages/neon/neon/lib/src/settings/models/select_option.dart b/packages/neon/neon/lib/src/settings/models/select_option.dart
index 1d3bd47f..5d3fc7da 100644
--- a/packages/neon/neon/lib/src/settings/models/select_option.dart
+++ b/packages/neon/neon/lib/src/settings/models/select_option.dart
@@ -1,8 +1,8 @@
 import 'dart:async';
 
 import 'package:collection/collection.dart';
+import 'package:neon/src/models/label_builder.dart';
 import 'package:neon/src/settings/models/option.dart';
-import 'package:neon/src/settings/widgets/label_builder.dart';
 
 class SelectOption<T> extends Option<T> {
   /// Creates a SelectOption
diff --git a/packages/neon/neon/lib/src/sort_box/sort_box_order_option_values.dart b/packages/neon/neon/lib/src/sort_box/sort_box_order_option_values.dart
index f6f4d5c5..2d69f581 100644
--- a/packages/neon/neon/lib/src/sort_box/sort_box_order_option_values.dart
+++ b/packages/neon/neon/lib/src/sort_box/sort_box_order_option_values.dart
@@ -1,5 +1,5 @@
 import 'package:neon/l10n/localizations.dart';
-import 'package:neon/src/settings/widgets/label_builder.dart';
+import 'package:neon/src/models/label_builder.dart';
 import 'package:sort_box/sort_box.dart';
 
 final sortBoxOrderOptionValues = <SortBoxOrder, LabelBuilder>{