diff --git a/main.go b/main.go
index eb651bf..1d5ff72 100644
--- a/main.go
+++ b/main.go
@@ -173,16 +173,28 @@ func (web *Web) watchView(c *gin.Context) {
 	watch.CronEntry = &entry
 
 	var values []FilterOutput
-	web.db.Model(&FilterOutput{}).Where("watch_id = ?", watch.ID).Find(&values)
+	web.db.Model(&FilterOutput{}).Order("time asc").Where("watch_id = ?", watch.ID).Find(&values)
 
 	valueMap := make(map[string][]FilterOutput, len(values))
+	names := make(map[string]bool, 5)
 	for _, value := range values {
+		names[value.Name] = true
 		valueMap[value.Name] = append(valueMap[value.Name], value)
 	}
 
+	colorMap := make(map[string]int, len(names))
+	index := 0
+	for name, _ := range names {
+		colorMap[name] = index % 16 // only 16 colors
+		index += 1
+	}
+
+	//data := make([]map[string]string, len(valueMap))
+
 	c.HTML(http.StatusOK, "watchView", gin.H{
 		"Watch":    watch,
 		"ValueMap": valueMap,
+		"colorMap": colorMap,
 	})
 }
 
diff --git a/templates/watch/view.html b/templates/watch/view.html
index 640b759..cec45be 100644
--- a/templates/watch/view.html
+++ b/templates/watch/view.html
@@ -35,25 +35,45 @@
 <script>
     function canvasInit() {
         const ctx = document.getElementById("chartCanvas").getContext('2d');
+        const colors = [
+            "rgba(255, 0, 41, 1)",
+            "rgba(55, 126, 184, 1)",
+            "rgba(102, 166, 30, 1)",
+            "rgba(152, 78, 163, 1)",
+            "rgba(0, 210, 213, 1)",
+            "rgba(255, 127, 0, 1)",
+            "rgba(175, 141, 0, 1)",
+            "rgba(127, 128. 205, 1)",
+            "rgba(179, 233, 0, 1)",
+            "rgba(196, 46, 96, 1)",
+            "rgba(166, 86, 40, 1)",
+            "rgba(247, 129, 191, 1)",
+            "rgba(141, 211, 199, 1)",
+            "rgba(190, 186, 218, 1)",
+            "rgba(251, 128, 114, 1)",
+            "rgba(128. 177, 211, 1)"
+        ];
         const chart = new Chart(ctx, {
             type: 'line',
             data: {
-                datasets:[{
+                datasets:[
                     {{ range $name, $values := .ValueMap }}
+                    {
                         label: {{ $name }},
+                        fill: false,
+                        borderColor: colors[{{ index $.colorMap $name}}],
                         data: [
                             {{ range $value := $values }}
                                 {x: luxon.DateTime.fromISO('{{ $value.Time.Format "2006-01-02T15:04:05Z07:00" }}'), y: '{{ $value.Value }}'},
                             {{ end }}
                         ],
-                    {{ end }}
-                }]
+                    },
+                    {{ end }}]
             },
             options: {
                 scales: {
                     x: {
-                        type: 'time',
-                        distribution: 'series',
+                        type: 'time'
                     },
                     y: {
                         beginAtZero: true,
diff --git a/todo.md b/todo.md
index 6c5dfe8..8a83af2 100644
--- a/todo.md
+++ b/todo.md
@@ -1,8 +1,10 @@
 # Todo
-- page for viewing history, with graph?
+- add last/next run of watch to front page
+    - ability to pause watches?
 - refactor everything under the Web struct ?
     - init func that calls:
         - func to set routes
         - func to set pages
         - func to init crons, track watch.name -> cron id
-- refactor getFilterResult so it's just part of web ?
\ No newline at end of file
+- refactor getFilterResult so it's just part of web ?
+- add timer to run watch ?