diff --git a/src/add-ons/screen_savers/gravity/ColorItem.h b/headers/private/shared/ColorItem.h
similarity index 76%
rename from src/add-ons/screen_savers/gravity/ColorItem.h
rename to headers/private/shared/ColorItem.h
index 7939c37566..81d1a528a4 100644
--- a/src/add-ons/screen_savers/gravity/ColorItem.h
+++ b/headers/private/shared/ColorItem.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Haiku, Inc. All rights reserved.
+ * Copyright 2016-2022 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -20,7 +20,8 @@ public:
 							ColorItem(const char* string, rgb_color color);
 
 	virtual	void			DrawItem(BView* owner, BRect frame, bool complete);
-	virtual	void			SetColor(rgb_color color);
+			void			SetColor(rgb_color color) { fColor = color; }
+			rgb_color		Color() const { return fColor; }
 
 private:
 			rgb_color		fColor;
diff --git a/src/add-ons/screen_savers/gravity/Jamfile b/src/add-ons/screen_savers/gravity/Jamfile
index dd4f7ca2ad..defd95d8ed 100644
--- a/src/add-ons/screen_savers/gravity/Jamfile
+++ b/src/add-ons/screen_savers/gravity/Jamfile
@@ -1,6 +1,7 @@
 SubDir HAIKU_TOP src add-ons screen_savers gravity ;
 UseBuildFeatureHeaders glu ;
 UseBuildFeatureHeaders mesa ;
+UsePrivateHeaders shared ;
 
 # For GCC2
 if $(TARGET_CC_IS_LEGACY_GCC_$(TARGET_PACKAGING_ARCH)) = 1 {
@@ -10,7 +11,6 @@ if $(TARGET_CC_IS_LEGACY_GCC_$(TARGET_PACKAGING_ARCH)) = 1 {
 AddResources Gravity : Gravity.rdef ;
 
 local sources =
-	ColorItem.cpp
 	ConfigView.cpp
 	Gravity.cpp
 	GravitySource.cpp
@@ -30,7 +30,7 @@ Includes [ FGristFiles $(sources) ] :
 ScreenSaver Gravity :
 	$(sources)
 	:
-	be screensaver localestub [ TargetLibstdc++ ]
+	be screensaver shared localestub [ TargetLibstdc++ ]
 	[ BuildFeatureAttribute glu : library ]
 	[ BuildFeatureAttribute mesa : library ]
 ;
diff --git a/src/add-ons/screen_savers/gravity/ColorItem.cpp b/src/kits/shared/ColorItem.cpp
similarity index 94%
rename from src/add-ons/screen_savers/gravity/ColorItem.cpp
rename to src/kits/shared/ColorItem.cpp
index 586283a655..0c1b0df212 100644
--- a/src/add-ons/screen_savers/gravity/ColorItem.cpp
+++ b/src/kits/shared/ColorItem.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 Haiku, Inc. All rights reserved.
+ * Copyright 2016-2022 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -87,10 +87,3 @@ ColorItem::DrawItem(BView* owner, BRect frame, bool complete)
 	owner->SetHighColor(highColor);
 	owner->SetLowColor(lowColor);
 }
-
-
-void
-ColorItem::SetColor(rgb_color color)
-{
-	fColor = color;
-}
diff --git a/src/kits/shared/Jamfile b/src/kits/shared/Jamfile
index ebf144fa13..aea432cbe7 100644
--- a/src/kits/shared/Jamfile
+++ b/src/kits/shared/Jamfile
@@ -30,6 +30,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
 			AttributeUtilities.cpp
 			BitmapButton.cpp
 			CalendarView.cpp
+			ColorItem.cpp
 			ColorQuantizer.cpp
 			CommandPipe.cpp
 			DateTimeEdit.cpp