diff --git a/lib/hmi_widgets.dart b/lib/hmi_widgets.dart
index 9d6daff..b83525c 100644
--- a/lib/hmi_widgets.dart
+++ b/lib/hmi_widgets.dart
@@ -1,4 +1,36 @@
 library hmi_widgets;
 
+// Theme
+export 'src/theme/app_theme.dart';
 
-export 'domain/core/calculator.dart';
\ No newline at end of file
+// Dialogs
+export 'src/dialogs/complete_dialog.dart';
+export 'src/dialogs/delete_dialog.dart';
+export 'src/dialogs/failure_dialog.dart';
+
+// Buttons
+export 'src/buttons/circular_fab_widget.dart';
+export 'src/buttons/control_button/control_button.dart';
+export 'src/buttons/drop_down_control_button/drop_down_control_button.dart';
+
+// Popups
+export 'src/popups/popup_menu_button/popup_menu_button_custom.dart';
+
+// Indicators
+//     Status indicators
+export 'src/indicators/status_indicators/alarmed_status_indicator_widget.dart';
+export 'src/indicators/status_indicators/bool_color_indicator.dart';
+export 'src/indicators/status_indicators/dps_icon_indicator.dart';
+export 'src/indicators/status_indicators/invalid_status_indicator.dart';
+export 'src/indicators/status_indicators/sps_icon_indicator.dart';
+export 'src/indicators/status_indicators/status_indicator_widget.dart';
+//     Value indicators
+export 'src/indicators/value_indicators/circular_value_indicator.dart';
+export 'src/indicators/value_indicators/linear_value_indicator.dart';
+export 'src/indicators/value_indicators/text_value_indicator.dart';
+export 'src/indicators/value_indicators/text_value_indicator_widget.dart';
+
+// Charts
+export 'src/charts/crane_load_chart/crane_load_chart.dart';
+export 'src/charts/crane_position_chart/crane_position_chart.dart';
+export 'src/charts/live_chart/live_chart_widget.dart';
\ No newline at end of file