diff --git a/src/apps/debuganalyzer/MessageCodes.h b/src/apps/debuganalyzer/MessageCodes.h
index 52de0b0da6..4070a204e4 100644
--- a/src/apps/debuganalyzer/MessageCodes.h
+++ b/src/apps/debuganalyzer/MessageCodes.h
@@ -11,7 +11,12 @@ enum {
 	MSG_MODEL_LOADED_FAILED			= 'mlfl',
 	MSG_MODEL_LOADED_ABORTED		= 'mlab',
 
-	MSG_WINDOW_QUIT					= 'wiqt'
+	MSG_WINDOW_QUIT					= 'wiqt',
+
+	MSG_CHECK_BOX_RUN_TIME			= 'chkr',
+	MSG_CHECK_BOX_WAIT_TIME			= 'chkw',
+	MSG_CHECK_BOX_PREEMPTION_TIME	= 'chkp',
+	MSG_CHECK_BOX_LATENCY_TIME		= 'chkl'
 };
 
 
diff --git a/src/apps/debuganalyzer/gui/thread_window/ActivityPage.cpp b/src/apps/debuganalyzer/gui/thread_window/ActivityPage.cpp
index 206020c3a3..c4f965d857 100644
--- a/src/apps/debuganalyzer/gui/thread_window/ActivityPage.cpp
+++ b/src/apps/debuganalyzer/gui/thread_window/ActivityPage.cpp
@@ -7,11 +7,15 @@
 
 #include <new>
 
+#include <GridLayoutBuilder.h>
 #include <GroupLayoutBuilder.h>
+#include <Message.h>
 #include <ScrollView.h>
 
 #include <AutoDeleter.h>
 
+#include "ColorCheckBox.h"
+#include "MessageCodes.h"
 #include "ThreadModel.h"
 
 #include "chart/BigtimeChartAxisLegendSource.h"
@@ -32,6 +36,11 @@ enum {
 	TIME_TYPE_COUNT		= 5
 };
 
+static const rgb_color kRunTimeColor		= {0, 0, 0, 255};
+static const rgb_color kWaitTimeColor		= {0, 255, 0, 255};
+static const rgb_color kPreemptionTimeColor	= {0, 0, 255, 255};
+static const rgb_color kLatencyTimeColor	= {255, 0, 0, 255};
+
 
 class ThreadWindow::ActivityPage::ThreadActivityData
 	: public ChartDataSource {
@@ -303,8 +312,8 @@ ThreadWindow::ActivityPage::ActivityPage()
 	fActivityChartRenderer(NULL),
 	fRunTimeData(NULL),
 	fWaitTimeData(NULL),
-	fLatencyTimeData(NULL),
-	fPreemptionTimeData(NULL)
+	fPreemptionTimeData(NULL),
+	fLatencyTimeData(NULL)
 {
 	SetName("Activity");
 
@@ -320,10 +329,29 @@ ThreadWindow::ActivityPage::ActivityPage()
 	BGroupLayoutBuilder(this)
 		.Add(new BScrollView("activity scroll", fActivityChart, 0, true, false))
 		.AddStrut(20)
+		.Add(BGridLayoutBuilder()
+			.Add(fRunTimeCheckBox = new ColorCheckBox("Run Time", kRunTimeColor,
+					new BMessage(MSG_CHECK_BOX_RUN_TIME)),
+				0, 0)
+			.Add(fWaitTimeCheckBox = new ColorCheckBox("Wait Time",
+					kWaitTimeColor, new BMessage(MSG_CHECK_BOX_WAIT_TIME)),
+				1, 0)
+			.Add(fPreemptionTimeCheckBox = new ColorCheckBox("Latency Time",
+					kPreemptionTimeColor,
+					new BMessage(MSG_CHECK_BOX_PREEMPTION_TIME)),
+				0, 1)
+			.Add(fLatencyTimeCheckBox = new ColorCheckBox("Preemption Time",
+					kLatencyTimeColor,
+					new BMessage(MSG_CHECK_BOX_LATENCY_TIME)),
+				1, 1)
+		)
 	;
 
 	rendererDeleter.Detach();
 
+	// enable the run time chart data
+	fRunTimeCheckBox->CheckBox()->SetValue(B_CONTROL_ON);
+
 // TODO: Allocation management...
 	LegendChartAxis* axis = new LegendChartAxis(
 		new BigtimeChartAxisLegendSource, new StringChartLegendRenderer);
@@ -374,36 +402,95 @@ ThreadWindow::ActivityPage::SetModel(ThreadModel* model)
 	fThreadModel = model;
 
 	if (fThreadModel != NULL) {
-		// run time
-		LineChartRendererDataSourceConfig runConfig(
-			rgb_color().set_to(0, 0, 0, 255));
-
-		fRunTimeData = new(std::nothrow) ThreadActivityData(fThreadModel,
-			RUN_TIME);
-		fActivityChart->AddDataSource(fRunTimeData, &runConfig);
-
-		// wait time
-		LineChartRendererDataSourceConfig waitConfig(
-			rgb_color().set_to(0, 255, 0, 255));
-
-		fWaitTimeData = new(std::nothrow) ThreadActivityData(fThreadModel,
-			WAIT_TIME);
-		fActivityChart->AddDataSource(fWaitTimeData, &waitConfig);
-
-		// preemption time
-		LineChartRendererDataSourceConfig preemptionConfig(
-			rgb_color().set_to(0, 0, 255, 255));
-
-		fLatencyTimeData = new(std::nothrow) ThreadActivityData(fThreadModel,
-			PREEMPTION_TIME);
-		fActivityChart->AddDataSource(fLatencyTimeData, &preemptionConfig);
-
-		// latency time
-		LineChartRendererDataSourceConfig latencyConfig(
-			rgb_color().set_to(255, 0, 0, 255));
-
-		fPreemptionTimeData = new(std::nothrow) ThreadActivityData(fThreadModel,
-			LATENCY_TIME);
-		fActivityChart->AddDataSource(fPreemptionTimeData, &latencyConfig);
+		_UpdateChartDataEnabled(RUN_TIME);
+		_UpdateChartDataEnabled(WAIT_TIME);
+		_UpdateChartDataEnabled(PREEMPTION_TIME);
+		_UpdateChartDataEnabled(LATENCY_TIME);
+	}
+}
+
+
+void
+ThreadWindow::ActivityPage::MessageReceived(BMessage* message)
+{
+	switch (message->what) {
+		case MSG_CHECK_BOX_RUN_TIME:
+			_UpdateChartDataEnabled(RUN_TIME);
+			break;
+		case MSG_CHECK_BOX_WAIT_TIME:
+			_UpdateChartDataEnabled(WAIT_TIME);
+			break;
+		case MSG_CHECK_BOX_PREEMPTION_TIME:
+			_UpdateChartDataEnabled(PREEMPTION_TIME);
+			break;
+		case MSG_CHECK_BOX_LATENCY_TIME:
+			_UpdateChartDataEnabled(LATENCY_TIME);
+			break;
+		default:
+			BGroupView::MessageReceived(message);
+			break;
+	}
+}
+
+
+void
+ThreadWindow::ActivityPage::AttachedToWindow()
+{
+	fRunTimeCheckBox->SetTarget(this);
+	fWaitTimeCheckBox->SetTarget(this);
+	fPreemptionTimeCheckBox->SetTarget(this);
+	fLatencyTimeCheckBox->SetTarget(this);
+}
+
+
+void
+ThreadWindow::ActivityPage::_UpdateChartDataEnabled(int timeType)
+{
+	ThreadActivityData** data;
+	ColorCheckBox* checkBox;
+	rgb_color color;
+
+	switch (timeType) {
+		case RUN_TIME:
+			data = &fRunTimeData;
+			checkBox = fRunTimeCheckBox;
+			color = kRunTimeColor;
+			break;
+		case WAIT_TIME:
+			data = &fWaitTimeData;
+			checkBox = fWaitTimeCheckBox;
+			color = kWaitTimeColor;
+			break;
+		case PREEMPTION_TIME:
+			data = &fPreemptionTimeData;
+			checkBox = fPreemptionTimeCheckBox;
+			color = kPreemptionTimeColor;
+			break;
+		case LATENCY_TIME:
+			data = &fLatencyTimeData;
+			checkBox = fLatencyTimeCheckBox;
+			color = kLatencyTimeColor;
+			break;
+		default:
+			return;
+	}
+
+	bool enabled = checkBox->CheckBox()->Value() == B_CONTROL_ON;
+
+	if ((*data != NULL) == enabled)
+		return;
+
+	if (enabled) {
+		LineChartRendererDataSourceConfig config(color);
+
+		*data = new(std::nothrow) ThreadActivityData(fThreadModel, timeType);
+		if (*data == NULL)
+			return;
+
+		fActivityChart->AddDataSource(*data, &config);
+	} else {
+		fActivityChart->RemoveDataSource(*data);
+		delete *data;
+		*data = NULL;
 	}
 }
diff --git a/src/apps/debuganalyzer/gui/thread_window/ActivityPage.h b/src/apps/debuganalyzer/gui/thread_window/ActivityPage.h
index 432b8f9f87..a410cd8182 100644
--- a/src/apps/debuganalyzer/gui/thread_window/ActivityPage.h
+++ b/src/apps/debuganalyzer/gui/thread_window/ActivityPage.h
@@ -12,6 +12,7 @@
 
 class Chart;
 class ChartRenderer;
+class ColorCheckBox;
 
 
 class ThreadWindow::ActivityPage : public BGroupView {
@@ -21,19 +22,28 @@ public:
 
 			void				SetModel(ThreadModel* model);
 
+	virtual	void				MessageReceived(BMessage* message);
+	virtual	void				AttachedToWindow();
+
 private:
 			class ThreadActivityData;
 
+private:
+			void				_UpdateChartDataEnabled(int timeType);
+
 private:
 			ThreadModel*		fThreadModel;
 			Chart*				fActivityChart;
 			ChartRenderer*		fActivityChartRenderer;
 			ThreadActivityData*	fRunTimeData;
 			ThreadActivityData*	fWaitTimeData;
-			ThreadActivityData*	fLatencyTimeData;
 			ThreadActivityData*	fPreemptionTimeData;
+			ThreadActivityData*	fLatencyTimeData;
+			ColorCheckBox*		fRunTimeCheckBox;
+			ColorCheckBox*		fWaitTimeCheckBox;
+			ColorCheckBox*		fPreemptionTimeCheckBox;
+			ColorCheckBox*		fLatencyTimeCheckBox;
 };
 
 
-
 #endif	// THREAD_ACTIVITY_PAGE_H