diff --git a/internal/classify/rules.go b/internal/classify/rules.go
index 4fc08b8e6..f805784a9 100644
--- a/internal/classify/rules.go
+++ b/internal/classify/rules.go
@@ -208,15 +208,15 @@ var rules = LabelRules{
 	},
 	"analog clock": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
 	"anemone fish": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.700000,
 		Priority:   0,
-		Categories: []string{"water", "animal"},
+		Categories: []string{},
 	},
 	"angora": {
 		Label:      "rabbit",
@@ -226,7 +226,7 @@ var rules = LabelRules{
 	},
 	"ant": {
 		Label:      "insect",
-		Threshold:  0.300000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"animal"},
 	},
@@ -442,13 +442,13 @@ var rules = LabelRules{
 	},
 	"barometer": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
 	"barracouta": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.430000,
 		Priority:   0,
 		Categories: []string{"water", "animal"},
 	},
@@ -532,7 +532,7 @@ var rules = LabelRules{
 	},
 	"beacon": {
 		Label:      "",
-		Threshold:  0.790000,
+		Threshold:  0.810000,
 		Priority:   0,
 		Categories: []string{"tower", "architecture"},
 	},
@@ -544,7 +544,7 @@ var rules = LabelRules{
 	},
 	"beaker": {
 		Label:      "cup",
-		Threshold:  0.200000,
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{"beverage"},
 	},
@@ -808,7 +808,7 @@ var rules = LabelRules{
 	},
 	"book jacket": {
 		Label:      "book",
-		Threshold:  0.500000,
+		Threshold:  0.610000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -850,7 +850,7 @@ var rules = LabelRules{
 	},
 	"bottle": {
 		Label:      "bottle",
-		Threshold:  0.330000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -910,7 +910,7 @@ var rules = LabelRules{
 	},
 	"brass": {
 		Label:      "info",
-		Threshold:  0.000000,
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -1048,7 +1048,7 @@ var rules = LabelRules{
 	},
 	"cab": {
 		Label:      "",
-		Threshold:  0.600000,
+		Threshold:  0.810000,
 		Priority:   0,
 		Categories: []string{"car", "vehicle"},
 	},
@@ -1174,13 +1174,13 @@ var rules = LabelRules{
 	},
 	"castle": {
 		Label:      "",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"historic", "architecture"},
 	},
 	"cat": {
 		Label:      "cat",
-		Threshold:  0.000000,
+		Threshold:  0.150000,
 		Priority:   5,
 		Categories: []string{"animal"},
 	},
@@ -1263,10 +1263,10 @@ var rules = LabelRules{
 		Categories: []string{},
 	},
 	"cheetah": {
-		Label:      "",
-		Threshold:  0.600000,
-		Priority:   5,
-		Categories: []string{"cat", "animal", "wildlife"},
+		Label:      "wild cat",
+		Threshold:  0.700000,
+		Priority:   0,
+		Categories: []string{},
 	},
 	"chesapeake bay retriever dog": {
 		Label:      "dog",
@@ -1348,13 +1348,13 @@ var rules = LabelRules{
 	},
 	"cicada": {
 		Label:      "insect",
-		Threshold:  0.300000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"animal"},
 	},
 	"cinema": {
 		Label:      "",
-		Threshold:  0.500000,
+		Threshold:  0.850000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -1384,7 +1384,7 @@ var rules = LabelRules{
 	},
 	"clock": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -1432,19 +1432,19 @@ var rules = LabelRules{
 	},
 	"coffee mug": {
 		Label:      "coffee",
-		Threshold:  0.000000,
+		Threshold:  0.250000,
 		Priority:   0,
-		Categories: []string{"beverage"},
+		Categories: []string{},
 	},
 	"coffeepot": {
 		Label:      "coffee",
-		Threshold:  0.000000,
+		Threshold:  0.250000,
 		Priority:   0,
-		Categories: []string{"beverage"},
+		Categories: []string{},
 	},
 	"coho fish": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.430000,
 		Priority:   0,
 		Categories: []string{"water", "animal"},
 	},
@@ -1474,7 +1474,7 @@ var rules = LabelRules{
 	},
 	"comic book": {
 		Label:      "comic",
-		Threshold:  0.200000,
+		Threshold:  0.440000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -1528,7 +1528,7 @@ var rules = LabelRules{
 	},
 	"cooking": {
 		Label:      "cooking",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -1612,7 +1612,7 @@ var rules = LabelRules{
 	},
 	"crash helmet": {
 		Label:      "helmet",
-		Threshold:  0.500000,
+		Threshold:  0.590000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -1676,6 +1676,12 @@ var rules = LabelRules{
 		Priority:   0,
 		Categories: []string{"people"},
 	},
+	"cup": {
+		Label:      "",
+		Threshold:  0.300000,
+		Priority:   0,
+		Categories: []string{},
+	},
 	"curly-coated retriever dog": {
 		Label:      "dog",
 		Threshold:  0.400000,
@@ -1708,7 +1714,7 @@ var rules = LabelRules{
 	},
 	"damselfly": {
 		Label:      "insect",
-		Threshold:  0.300000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"animal"},
 	},
@@ -1756,13 +1762,13 @@ var rules = LabelRules{
 	},
 	"digital clock": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
 	"digital watch": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -1774,7 +1780,7 @@ var rules = LabelRules{
 	},
 	"dining table": {
 		Label:      "dining",
-		Threshold:  0.300000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -1798,7 +1804,7 @@ var rules = LabelRules{
 	},
 	"display": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -1822,13 +1828,13 @@ var rules = LabelRules{
 	},
 	"dogsled": {
 		Label:      "snow",
-		Threshold:  0.400000,
+		Threshold:  0.900000,
 		Priority:   0,
 		Categories: []string{"animal", "dog"},
 	},
 	"dome": {
 		Label:      "dome",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"architecture"},
 	},
@@ -1858,7 +1864,7 @@ var rules = LabelRules{
 	},
 	"drake": {
 		Label:      "duck",
-		Threshold:  0.300000,
+		Threshold:  0.400000,
 		Priority:   0,
 		Categories: []string{"animal", "bird"},
 	},
@@ -1894,7 +1900,7 @@ var rules = LabelRules{
 	},
 	"dung beetle": {
 		Label:      "",
-		Threshold:  0.000000,
+		Threshold:  0.400000,
 		Priority:   0,
 		Categories: []string{"animal", "beetle"},
 	},
@@ -1930,7 +1936,7 @@ var rules = LabelRules{
 	},
 	"eel": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.430000,
 		Priority:   0,
 		Categories: []string{"water", "animal"},
 	},
@@ -1948,9 +1954,9 @@ var rules = LabelRules{
 	},
 	"egyptian cat": {
 		Label:      "cat",
-		Threshold:  0.000000,
-		Priority:   5,
-		Categories: []string{"animal"},
+		Threshold:  0.300000,
+		Priority:   0,
+		Categories: []string{},
 	},
 	"electric fan": {
 		Label:      "fan",
@@ -1972,7 +1978,7 @@ var rules = LabelRules{
 	},
 	"electric ray": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.430000,
 		Priority:   0,
 		Categories: []string{"water", "animal"},
 	},
@@ -2092,7 +2098,7 @@ var rules = LabelRules{
 	},
 	"file": {
 		Label:      "furniture",
-		Threshold:  0.200000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -2122,13 +2128,13 @@ var rules = LabelRules{
 	},
 	"fish": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.430000,
 		Priority:   0,
 		Categories: []string{"water", "animal"},
 	},
 	"flagpole": {
 		Label:      "flag",
-		Threshold:  0.000000,
+		Threshold:  0.200000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -2176,7 +2182,7 @@ var rules = LabelRules{
 	},
 	"football helmet": {
 		Label:      "helmet",
-		Threshold:  0.500000,
+		Threshold:  0.590000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -2188,7 +2194,7 @@ var rules = LabelRules{
 	},
 	"fossa": {
 		Label:      "cat",
-		Threshold:  0.000000,
+		Threshold:  0.150000,
 		Priority:   5,
 		Categories: []string{"animal"},
 	},
@@ -2266,7 +2272,7 @@ var rules = LabelRules{
 	},
 	"frying pan": {
 		Label:      "cooking",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -2278,7 +2284,7 @@ var rules = LabelRules{
 	},
 	"gar fish": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.430000,
 		Priority:   0,
 		Categories: []string{"water", "animal"},
 	},
@@ -2386,9 +2392,9 @@ var rules = LabelRules{
 	},
 	"goldfish": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
-		Categories: []string{"water", "animal"},
+		Categories: []string{},
 	},
 	"golf ball": {
 		Label:      "",
@@ -2416,7 +2422,7 @@ var rules = LabelRules{
 	},
 	"goose": {
 		Label:      "",
-		Threshold:  0.400000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{"animal", "bird"},
 	},
@@ -2445,10 +2451,10 @@ var rules = LabelRules{
 		Categories: []string{},
 	},
 	"granny smith": {
-		Label:      "fruit",
-		Threshold:  0.450000,
+		Label:      "apple",
+		Threshold:  0.000000,
 		Priority:   0,
-		Categories: []string{"food"},
+		Categories: []string{"fruit", "food"},
 	},
 	"grasshopper": {
 		Label:      "grasshopper",
@@ -2506,7 +2512,7 @@ var rules = LabelRules{
 	},
 	"greenhouse": {
 		Label:      "",
-		Threshold:  0.500000,
+		Threshold:  0.780000,
 		Priority:   0,
 		Categories: []string{"architecture", "building"},
 	},
@@ -2554,7 +2560,7 @@ var rules = LabelRules{
 	},
 	"guacamole": {
 		Label:      "vegetables",
-		Threshold:  0.400000,
+		Threshold:  0.900000,
 		Priority:   0,
 		Categories: []string{"cooking"},
 	},
@@ -2590,7 +2596,7 @@ var rules = LabelRules{
 	},
 	"hair spray": {
 		Label:      "bottle",
-		Threshold:  0.330000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -2644,7 +2650,7 @@ var rules = LabelRules{
 	},
 	"hard disc": {
 		Label:      "electronics",
-		Threshold:  0.400000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -2704,7 +2710,7 @@ var rules = LabelRules{
 	},
 	"helmet": {
 		Label:      "helmet",
-		Threshold:  0.500000,
+		Threshold:  0.590000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -2740,13 +2746,13 @@ var rules = LabelRules{
 	},
 	"hippopotamus": {
 		Label:      "hippo",
-		Threshold:  0.400000,
+		Threshold:  0.850000,
 		Priority:   0,
 		Categories: []string{"animal", "wildlife"},
 	},
 	"historic architecture": {
 		Label:      "historic",
-		Threshold:  0.000000,
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{"architecture"},
 	},
@@ -2884,7 +2890,7 @@ var rules = LabelRules{
 	},
 	"ice lolly": {
 		Label:      "dessert",
-		Threshold:  0.420000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{"food"},
 	},
@@ -2926,7 +2932,7 @@ var rules = LabelRules{
 	},
 	"insect": {
 		Label:      "insect",
-		Threshold:  0.300000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"animal"},
 	},
@@ -2998,9 +3004,9 @@ var rules = LabelRules{
 	},
 	"jackfruit": {
 		Label:      "fruit",
-		Threshold:  0.450000,
+		Threshold:  0.620000,
 		Priority:   0,
-		Categories: []string{"food"},
+		Categories: []string{},
 	},
 	"jaguar": {
 		Label:      "",
@@ -3028,13 +3034,13 @@ var rules = LabelRules{
 	},
 	"jeep": {
 		Label:      "",
-		Threshold:  0.200000,
+		Threshold:  0.400000,
 		Priority:   0,
 		Categories: []string{"car", "vehicle"},
 	},
 	"jellyfish": {
 		Label:      "",
-		Threshold:  0.700000,
+		Threshold:  0.770000,
 		Priority:   0,
 		Categories: []string{"water", "animal", "fish"},
 	},
@@ -3178,13 +3184,13 @@ var rules = LabelRules{
 	},
 	"lacewing": {
 		Label:      "insect",
-		Threshold:  0.300000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"animal"},
 	},
 	"ladle": {
 		Label:      "cooking",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -3202,7 +3208,7 @@ var rules = LabelRules{
 	},
 	"lakeside": {
 		Label:      "",
-		Threshold:  0.300000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"water"},
 	},
@@ -3238,7 +3244,7 @@ var rules = LabelRules{
 	},
 	"leafhopper": {
 		Label:      "insect",
-		Threshold:  0.300000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"animal"},
 	},
@@ -3249,10 +3255,10 @@ var rules = LabelRules{
 		Categories: []string{"reptile", "animal"},
 	},
 	"lemon": {
-		Label:      "fruit",
-		Threshold:  0.450000,
+		Label:      "lemon",
+		Threshold:  0.000000,
 		Priority:   0,
-		Categories: []string{"food"},
+		Categories: []string{"fruit", "food"},
 	},
 	"lens cap": {
 		Label:      "photography",
@@ -3334,7 +3340,7 @@ var rules = LabelRules{
 	},
 	"lionfish": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.430000,
 		Priority:   0,
 		Categories: []string{"water", "animal"},
 	},
@@ -3406,7 +3412,7 @@ var rules = LabelRules{
 	},
 	"lotion": {
 		Label:      "bottle",
-		Threshold:  0.330000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -3508,7 +3514,7 @@ var rules = LabelRules{
 	},
 	"mantis": {
 		Label:      "insect",
-		Threshold:  0.300000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"animal"},
 	},
@@ -3556,7 +3562,7 @@ var rules = LabelRules{
 	},
 	"maypole": {
 		Label:      "festival",
-		Threshold:  0.000000,
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{"event"},
 	},
@@ -3568,7 +3574,7 @@ var rules = LabelRules{
 	},
 	"measuring cup": {
 		Label:      "cup",
-		Threshold:  0.200000,
+		Threshold:  0.860000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -3616,9 +3622,9 @@ var rules = LabelRules{
 	},
 	"microwave": {
 		Label:      "kitchen",
-		Threshold:  0.200000,
+		Threshold:  0.500000,
 		Priority:   0,
-		Categories: []string{"cooking", "electronics"},
+		Categories: []string{"electronics"},
 	},
 	"military uniform": {
 		Label:      "portrait",
@@ -3717,10 +3723,10 @@ var rules = LabelRules{
 		Categories: []string{"animal", "insect"},
 	},
 	"monastery": {
-		Label:      "historic",
-		Threshold:  0.000000,
+		Label:      "historic architecture",
+		Threshold:  0.300000,
 		Priority:   0,
-		Categories: []string{"architecture"},
+		Categories: []string{},
 	},
 	"mongoose": {
 		Label:      "animal",
@@ -3784,7 +3790,7 @@ var rules = LabelRules{
 	},
 	"mountain tent": {
 		Label:      "camping",
-		Threshold:  0.200000,
+		Threshold:  0.250000,
 		Priority:   0,
 		Categories: []string{"outdoor"},
 	},
@@ -3862,7 +3868,7 @@ var rules = LabelRules{
 	},
 	"nipple": {
 		Label:      "bottle",
-		Threshold:  0.330000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -3910,7 +3916,7 @@ var rules = LabelRules{
 	},
 	"odometer": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -3952,7 +3958,7 @@ var rules = LabelRules{
 	},
 	"oscilloscope": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4042,13 +4048,13 @@ var rules = LabelRules{
 	},
 	"palace": {
 		Label:      "historic",
-		Threshold:  0.000000,
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{"architecture"},
 	},
 	"pan": {
 		Label:      "cooking",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4090,7 +4096,7 @@ var rules = LabelRules{
 	},
 	"park bench": {
 		Label:      "bench",
-		Threshold:  0.440000,
+		Threshold:  0.520000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4120,7 +4126,7 @@ var rules = LabelRules{
 	},
 	"patio": {
 		Label:      "building",
-		Threshold:  0.400000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4174,15 +4180,15 @@ var rules = LabelRules{
 	},
 	"perfume": {
 		Label:      "bottle",
-		Threshold:  0.330000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
 	"persian cat": {
 		Label:      "cat",
-		Threshold:  0.000000,
-		Priority:   5,
-		Categories: []string{"animal"},
+		Threshold:  0.300000,
+		Priority:   0,
+		Categories: []string{},
 	},
 	"petri dish": {
 		Label:      "",
@@ -4216,7 +4222,7 @@ var rules = LabelRules{
 	},
 	"pickelhaube": {
 		Label:      "helmet",
-		Threshold:  0.500000,
+		Threshold:  0.590000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4246,7 +4252,7 @@ var rules = LabelRules{
 	},
 	"pill bottle": {
 		Label:      "bottle",
-		Threshold:  0.330000,
+		Threshold:  0.840000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4258,7 +4264,7 @@ var rules = LabelRules{
 	},
 	"pineapple": {
 		Label:      "",
-		Threshold:  0.600000,
+		Threshold:  0.620000,
 		Priority:   0,
 		Categories: []string{"fruit", "food"},
 	},
@@ -4300,9 +4306,9 @@ var rules = LabelRules{
 	},
 	"planetarium": {
 		Label:      "dome",
-		Threshold:  0.400000,
+		Threshold:  0.700000,
 		Priority:   0,
-		Categories: []string{"architecture"},
+		Categories: []string{},
 	},
 	"plastic bag": {
 		Label:      "",
@@ -4384,7 +4390,7 @@ var rules = LabelRules{
 	},
 	"pop bottle": {
 		Label:      "bottle",
-		Threshold:  0.330000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4438,7 +4444,7 @@ var rules = LabelRules{
 	},
 	"pretzel": {
 		Label:      "",
-		Threshold:  0.400000,
+		Threshold:  0.610000,
 		Priority:   0,
 		Categories: []string{"bakery", "food"},
 	},
@@ -4450,7 +4456,7 @@ var rules = LabelRules{
 	},
 	"prison": {
 		Label:      "building",
-		Threshold:  0.300000,
+		Threshold:  0.700000,
 		Priority:   0,
 		Categories: []string{"architecture"},
 	},
@@ -4491,10 +4497,10 @@ var rules = LabelRules{
 		Categories: []string{},
 	},
 	"puffer": {
-		Label:      "fish",
-		Threshold:  0.400000,
+		Label:      "puffer",
+		Threshold:  0.000000,
 		Priority:   0,
-		Categories: []string{"water", "animal"},
+		Categories: []string{},
 	},
 	"pug dog": {
 		Label:      "dog",
@@ -4594,7 +4600,7 @@ var rules = LabelRules{
 	},
 	"recreational vehicle": {
 		Label:      "camper",
-		Threshold:  0.500000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{"vehicle"},
 	},
@@ -4624,7 +4630,7 @@ var rules = LabelRules{
 	},
 	"red-breasted merganser": {
 		Label:      "duck",
-		Threshold:  0.200000,
+		Threshold:  0.400000,
 		Priority:   0,
 		Categories: []string{"animal", "bird"},
 	},
@@ -4654,7 +4660,7 @@ var rules = LabelRules{
 	},
 	"refrigerator": {
 		Label:      "",
-		Threshold:  0.200000,
+		Threshold:  0.350000,
 		Priority:   0,
 		Categories: []string{"kitchen"},
 	},
@@ -4666,7 +4672,7 @@ var rules = LabelRules{
 	},
 	"restaurant": {
 		Label:      "dining",
-		Threshold:  0.200000,
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -4714,9 +4720,9 @@ var rules = LabelRules{
 	},
 	"rock beauty fish": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.700000,
 		Priority:   0,
-		Categories: []string{"water", "animal"},
+		Categories: []string{},
 	},
 	"rock crab": {
 		Label:      "crab",
@@ -4852,19 +4858,19 @@ var rules = LabelRules{
 	},
 	"scale": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
 	"schipperke dog": {
 		Label:      "dog",
-		Threshold:  0.400000,
-		Priority:   5,
-		Categories: []string{"animal"},
+		Threshold:  0.900000,
+		Priority:   0,
+		Categories: []string{},
 	},
 	"school bus": {
 		Label:      "bus",
-		Threshold:  0.200000,
+		Threshold:  0.450000,
 		Priority:   0,
 		Categories: []string{"vehicle"},
 	},
@@ -4898,6 +4904,12 @@ var rules = LabelRules{
 		Priority:   5,
 		Categories: []string{"animal"},
 	},
+	"screen": {
+		Label:      "",
+		Threshold:  0.400000,
+		Priority:   0,
+		Categories: []string{},
+	},
 	"screw": {
 		Label:      "",
 		Threshold:  1.000000,
@@ -5062,9 +5074,9 @@ var rules = LabelRules{
 	},
 	"siamese cat": {
 		Label:      "cat",
-		Threshold:  0.000000,
-		Priority:   5,
-		Categories: []string{"animal"},
+		Threshold:  0.300000,
+		Priority:   0,
+		Categories: []string{},
 	},
 	"siberian husky dog": {
 		Label:      "dog",
@@ -5104,7 +5116,7 @@ var rules = LabelRules{
 	},
 	"sleeping bag": {
 		Label:      "camping",
-		Threshold:  0.200000,
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -5116,7 +5128,7 @@ var rules = LabelRules{
 	},
 	"sliding door": {
 		Label:      "building",
-		Threshold:  0.200000,
+		Threshold:  0.400000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -5176,7 +5188,7 @@ var rules = LabelRules{
 	},
 	"soap dispenser": {
 		Label:      "bottle",
-		Threshold:  0.330000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -5362,7 +5374,7 @@ var rules = LabelRules{
 	},
 	"steel arch bridge": {
 		Label:      "bridge",
-		Threshold:  0.400000,
+		Threshold:  0.420000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -5380,7 +5392,7 @@ var rules = LabelRules{
 	},
 	"stingray": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.430000,
 		Priority:   0,
 		Categories: []string{"water", "animal"},
 	},
@@ -5404,7 +5416,7 @@ var rules = LabelRules{
 	},
 	"stopwatch": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -5422,9 +5434,9 @@ var rules = LabelRules{
 	},
 	"strawberry": {
 		Label:      "fruit",
-		Threshold:  0.450000,
+		Threshold:  0.600000,
 		Priority:   0,
-		Categories: []string{"food"},
+		Categories: []string{},
 	},
 	"street sign": {
 		Label:      "sign",
@@ -5446,7 +5458,7 @@ var rules = LabelRules{
 	},
 	"studio couch": {
 		Label:      "couch",
-		Threshold:  0.400000,
+		Threshold:  0.800000,
 		Priority:   0,
 		Categories: []string{"furniture"},
 	},
@@ -5458,7 +5470,7 @@ var rules = LabelRules{
 	},
 	"sturgeon fish": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.430000,
 		Priority:   0,
 		Categories: []string{"water", "animal"},
 	},
@@ -5506,13 +5518,13 @@ var rules = LabelRules{
 	},
 	"sunscreen": {
 		Label:      "bottle",
-		Threshold:  0.330000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
 	"suspension bridge": {
 		Label:      "architecture",
-		Threshold:  0.500000,
+		Threshold:  0.850000,
 		Priority:   0,
 		Categories: []string{"bridge", "building"},
 	},
@@ -5560,7 +5572,7 @@ var rules = LabelRules{
 	},
 	"tabby cat": {
 		Label:      "cat",
-		Threshold:  0.000000,
+		Threshold:  0.150000,
 		Priority:   5,
 		Categories: []string{"animal"},
 	},
@@ -5620,7 +5632,7 @@ var rules = LabelRules{
 	},
 	"tench fish": {
 		Label:      "fish",
-		Threshold:  0.400000,
+		Threshold:  0.430000,
 		Priority:   0,
 		Categories: []string{"water", "animal"},
 	},
@@ -5722,7 +5734,7 @@ var rules = LabelRules{
 	},
 	"tile roof": {
 		Label:      "building",
-		Threshold:  0.400000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{"architecture"},
 	},
@@ -5884,7 +5896,7 @@ var rules = LabelRules{
 	},
 	"triumphal arch": {
 		Label:      "historic",
-		Threshold:  0.000000,
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{"architecture"},
 	},
@@ -5926,7 +5938,7 @@ var rules = LabelRules{
 	},
 	"typewriter keyboard": {
 		Label:      "keyboard",
-		Threshold:  0.300000,
+		Threshold:  0.400000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -5962,7 +5974,7 @@ var rules = LabelRules{
 	},
 	"vault": {
 		Label:      "building",
-		Threshold:  0.400000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -5992,7 +6004,7 @@ var rules = LabelRules{
 	},
 	"viaduct": {
 		Label:      "building",
-		Threshold:  0.300000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"architecture"},
 	},
@@ -6052,7 +6064,7 @@ var rules = LabelRules{
 	},
 	"wall clock": {
 		Label:      "display",
-		Threshold:  0.300000,
+		Threshold:  0.600000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -6148,7 +6160,7 @@ var rules = LabelRules{
 	},
 	"web site": {
 		Label:      "info",
-		Threshold:  0.000000,
+		Threshold:  0.300000,
 		Priority:   0,
 		Categories: []string{},
 	},
@@ -6238,7 +6250,7 @@ var rules = LabelRules{
 	},
 	"window shade": {
 		Label:      "building",
-		Threshold:  0.400000,
+		Threshold:  0.700000,
 		Priority:   0,
 		Categories: []string{"architecture"},
 	},
@@ -6346,7 +6358,7 @@ var rules = LabelRules{
 	},
 	"yurt": {
 		Label:      "camping",
-		Threshold:  0.200000,
+		Threshold:  0.500000,
 		Priority:   0,
 		Categories: []string{"outdoor"},
 	},
diff --git a/internal/classify/rules.yml b/internal/classify/rules.yml
index b618fc02c..e35657055 100644
--- a/internal/classify/rules.yml
+++ b/internal/classify/rules.yml
@@ -1,6 +1,7 @@
 cat:
   label: cat
   priority: 5
+  threshold: 0.15
   categories:
     - animal
 
@@ -8,13 +9,16 @@ tabby cat:
   see: cat
 
 persian cat:
-  see: cat
+  label: cat
+  threshold: 0.3
 
 siamese cat:
-  see: cat
+  label: cat
+  threshold: 0.3
 
 egyptian cat:
-  see: cat
+  label: cat
+  threshold: 0.3
 
 tiger cat:
   priority: 5
@@ -61,7 +65,8 @@ lion:
   see: wild cat
 
 cheetah:
-  see: wild cat
+  label: wild cat
+  threshold: 0.7
 
 tiger:
   see: wild cat
@@ -73,7 +78,7 @@ seashore:
     - water
 
 lakeside:
-  threshold: 0.3
+  threshold: 0.35
   categories:
     - water
 
@@ -95,7 +100,7 @@ bannister:
 
 window shade:
   label: building
-  threshold: 0.4
+  threshold: 0.7
   categories:
     - architecture
 
@@ -269,7 +274,8 @@ tench fish:
   see: fish
 
 goldfish:
-  see: fish
+  label: fish
+  threshold: 0.5
 
 shark:
   label: shark
@@ -429,7 +435,7 @@ common iguana:
 
 chameleon:
   label: chameleon
-  threshold: 0.9
+  threshold: 0.90
   priority: 1
   categories:
     - reptile
@@ -648,20 +654,20 @@ toucan:
 
 drake:
   label: duck
-  threshold: 0.3
+  threshold: 0.4
   categories:
     - animal
     - bird
 
 red-breasted merganser:
   label: duck
-  threshold: 0.2
+  threshold: 0.4
   categories:
     - animal
     - bird
 
 goose:
-  threshold: 0.4
+  threshold: 0.6
   categories:
     - animal
     - bird
@@ -694,7 +700,7 @@ wombat:
     - animal
 
 jellyfish:
-  threshold: 0.7
+  threshold: 0.77
   categories:
     - water
     - animal
@@ -1095,7 +1101,8 @@ kuvasz dog:
   see: dog
 
 schipperke dog:
-  see: dog
+  label: dog
+  threshold: 0.9
 
 groenendael dog:
   see: dog
@@ -1329,6 +1336,7 @@ leaf beetle:
   see: beetle
 
 dung beetle:
+  threshold: 0.4
   categories:
     - animal
     - beetle
@@ -1366,7 +1374,7 @@ cockroach:
 
 insect:
   label: insect
-  threshold: 0.3
+  threshold: 0.35
   categories:
     - animal
 
@@ -1498,7 +1506,7 @@ warthog:
 
 hippopotamus:
   label: hippo
-  threshold: 0.4
+  threshold: 0.85
   categories:
     - animal
     - wildlife
@@ -1722,7 +1730,7 @@ giant panda:
 
 fish:
   label: fish
-  threshold: 0.4
+  threshold: 0.43
   categories:
     - water
     - animal
@@ -1737,10 +1745,12 @@ coho fish:
   see: fish
 
 rock beauty fish:
-  see: fish
+  label: fish
+  threshold: 0.7
 
 anemone fish:
-  see: fish
+  label: fish
+  threshold: 0.7
 
 sturgeon fish:
   see: fish
@@ -1752,7 +1762,7 @@ lionfish:
   see: fish
 
 puffer:
-  see: fish
+  label: puffer
 
 instrument:
   label: instrument
@@ -1865,7 +1875,7 @@ bathtub:
   see: living
 
 beacon:
-  threshold: 0.79
+  threshold: 0.81
   categories:
     - tower
     - architecture
@@ -1939,7 +1949,7 @@ butcher shop:
     - shop
 
 cab:
-  threshold: 0.6
+  threshold: 0.81
   categories:
     - car
     - vehicle
@@ -1956,7 +1966,7 @@ carpenter's kit:
   see: tool
 
 castle:
-  threshold: 0.2
+  threshold: 0.35
   categories:
     - historic
     - architecture
@@ -2039,10 +2049,12 @@ espresso:
   see: coffee
 
 coffee mug:
-  see: coffee
+  label: coffee
+  threshold: 0.25
 
 coffeepot:
-  see: coffee
+  label: coffee
+  threshold: 0.25
 
 lock:
   see: ignore
@@ -2078,7 +2090,7 @@ cornet:
 
 helmet:
   label: helmet
-  threshold: 0.5
+  threshold: 0.59
 
 crash helmet:
   see: helmet
@@ -2135,7 +2147,7 @@ scale:
 
 dining table:
   label: dining
-  threshold: 0.3
+  threshold: 0.5
 
 maze:
   label: landscape
@@ -2158,19 +2170,20 @@ dock:
 
 dogsled:
   label: snow
-  threshold: 0.4
+  threshold: 0.9
   categories:
     - animal
     - dog
 
 dome:
   label: dome
-  threshold: 0.4
+  threshold: 0.5
   categories:
     - architecture
 
 planetarium:
-  see: dome
+  label: dome
+  threshold: 0.7
 
 drilling platform:
   label: building
@@ -2217,6 +2230,7 @@ fire engine:
 
 flagpole:
   label: flag
+  threshold: 0.2
 
 flute:
   see: instrument
@@ -2276,7 +2290,7 @@ grand piano:
   see: instrument
 
 greenhouse:
-  threshold: 0.5
+  threshold: 0.78
   categories:
     - architecture
     - building
@@ -2331,14 +2345,14 @@ jack-o'-lantern:
     - vegetables
 
 jeep:
-  threshold: 0.2
+  threshold: 0.4
   categories:
     - car
     - vehicle
 
 cooking:
   label: cooking
-  threshold: 0.4
+  threshold: 0.5
 
 pan:
   see: cooking
@@ -2424,7 +2438,7 @@ missile:
 
 measuring cup:
   label: cup
-  threshold: 0.2
+  threshold: 0.86
 
 medicine chest:
   see: ignore
@@ -2440,9 +2454,8 @@ microphone:
 
 microwave:
   label: kitchen
-  threshold: 0.2
+  threshold: 0.5
   categories:
-    - cooking
     - electronics
 
 minibus:
@@ -2471,7 +2484,8 @@ model t:
     - vehicle
 
 monastery:
-  see: historic architecture
+  label: historic architecture
+  threshold: 0.3
 
 monitor:
   label: screen
@@ -2514,7 +2528,7 @@ motor scooter:
 
 mountain tent:
   label: camping
-  threshold: 0.2
+  threshold: 0.25
   categories:
     - outdoor
 
@@ -2565,6 +2579,7 @@ paintbrush:
 
 historic architecture:
   label: historic
+  threshold: 0.3
   categories:
     - architecture
 
@@ -2643,16 +2658,21 @@ piggy bank:
 
 bottle:
   label: bottle
-  threshold: 0.33
+  threshold: 0.5
 
 sunscreen:
-  see: bottle
+  label: bottle
+  threshold: 0.6
+
+screen:
+  threshold: 0.4
 
 perfume:
   see: bottle
 
 nipple:
   see: bottle
+  threshold: 0.8
 
 lotion:
   see: bottle
@@ -2661,7 +2681,8 @@ hair spray:
   see: bottle
 
 pill bottle:
-  see: bottle
+  label: bottle
+  threshold: 0.84
 
 pillow:
   see: ignore
@@ -2714,7 +2735,7 @@ printer:
 
 prison:
   label: building
-  threshold: 0.3
+  threshold: 0.7
   categories:
     - architecture
 
@@ -2742,18 +2763,18 @@ tractor:
 
 recreational vehicle:
   label: camper
-  threshold: 0.5
+  threshold: 0.6
   categories:
     - vehicle
 
 refrigerator:
-  threshold: 0.2
+  threshold: 0.35
   categories:
     - kitchen
 
 restaurant:
   label: dining
-  threshold: 0.2
+  threshold: 0.3
 
 revolver:
   see: weapon
@@ -2793,7 +2814,7 @@ sax:
 
 school bus:
   label: bus
-  threshold: 0.2
+  threshold: 0.45
   categories:
     - vehicle
 
@@ -2832,11 +2853,11 @@ ski:
 
 sleeping bag:
   label: camping
-  threshold: 0.2
+  threshold: 0.3
 
 sliding door:
   label: building
-  threshold: 0.2
+  threshold: 0.4
 
 snorkel:
   label: diving
@@ -2901,7 +2922,7 @@ steam locomotive:
 
 steel arch bridge:
   label: bridge
-  threshold: 0.4
+  threshold: 0.42
 
 steel drum:
   see: instrument
@@ -2924,7 +2945,7 @@ streetcar:
 
 studio couch:
   label: couch
-  threshold: 0.4
+  threshold: 0.8
   categories:
     - furniture
 
@@ -2936,7 +2957,7 @@ submarine:
 
 suspension bridge:
   label: architecture
-  threshold: 0.5
+  threshold: 0.85
   categories:
     - bridge
     - building
@@ -3002,11 +3023,11 @@ tub:
 
 typewriter keyboard:
   label: keyboard
-  threshold: 0.3
+  threshold: 0.4
 
 viaduct:
   label: building
-  threshold: 0.3
+  threshold: 0.5
   categories:
     - architecture
 
@@ -3079,21 +3100,21 @@ yawl:
 
 yurt:
   label: camping
-  threshold: 0.2
+  threshold: 0.5
   categories:
     - outdoor
 
 comic book:
   label: comic
-  threshold: 0.2
+  threshold: 0.44
 
 book jacket:
   label: book
-  threshold: 0.5
+  threshold: 0.61
 
 guacamole:
   label: vegetables
-  threshold: 0.4
+  threshold: 0.9
   categories:
     - cooking
 
@@ -3126,7 +3147,7 @@ ice cream:
 
 ice lolly:
   label: dessert
-  threshold: 0.42
+  threshold: 0.6
   categories:
     - food
 
@@ -3149,7 +3170,7 @@ bagel:
     - food
 
 pretzel:
-  threshold: 0.4
+  threshold: 0.61
   categories:
     - bakery
     - food
@@ -3223,22 +3244,29 @@ fruit:
     - food
 
 granny smith:
-  see: fruit
+  label: apple
+  categories:
+    - fruit
+    - food
 
 strawberry:
-  see: fruit
+  label: fruit
+  threshold: 0.6
 
 orange:
   see: fruit
 
 lemon:
-  see: fruit
+  label: lemon
+  categories:
+    - fruit
+    - food
 
 fig:
   see: fruit
 
 pineapple:
-  threshold: 0.6
+  threshold: 0.62
   categories:
     - fruit
     - food
@@ -3250,7 +3278,8 @@ banana:
     - food
 
 jackfruit:
-  see: fruit
+  label: fruit
+  threshold: 0.62
 
 custard apple:
   see: fruit
@@ -3398,7 +3427,7 @@ arabian camel:
 
 tile roof:
   label: building
-  threshold: 0.4
+  threshold: 0.6
   categories:
     - architecture
 
@@ -3468,9 +3497,11 @@ swing:
 
 web site:
   label: info
+  threshold: 0.3
 
 brass:
   label: info
+  threshold: 0.3
 
 menu:
   label: document
@@ -3557,9 +3588,11 @@ safety pin:
 
 beaker:
   label: cup
-  threshold: 0.2
+  threshold: 0.3
   categories:
     - beverage
+cup:
+  threshold: 0.3
 
 bucket:
   threshold: 0.5
@@ -3584,7 +3617,7 @@ diaper:
 
 patio:
   label: building
-  threshold: 0.4
+  threshold: 0.5
 
 scoreboard:
   see: ignore
@@ -3610,7 +3643,7 @@ horizontal bar:
 
 vault:
   label: building
-  threshold: 0.4
+  threshold: 0.6
 
 office:
   label: office
@@ -3650,6 +3683,7 @@ groom:
 
 maypole:
   label: festival
+  threshold: 0.3
   categories:
     - event
 
@@ -3747,7 +3781,7 @@ balloon:
 
 display:
   label: display
-  threshold: 0.3
+  threshold: 0.6
 
 stopwatch:
   see: display
@@ -3803,7 +3837,8 @@ cd player:
   see: electronics
 
 hard disc:
-  see: electronics
+  label: electronics
+  threshold: 0.6
 
 space heater:
   see: electronics
@@ -3821,7 +3856,7 @@ christmas stocking:
   see: ignore
 
 cinema:
-  threshold: 0.5
+  threshold: 0.85
   category:
     - theater
 
@@ -3854,7 +3889,7 @@ electric fan:
 
 file:
   label: furniture
-  threshold: 0.2
+  threshold: 0.5
 
 gas pump:
   label: gas station
@@ -3886,7 +3921,7 @@ military uniform:
 
 park bench:
   label: bench
-  threshold: 0.44
+  threshold: 0.52
 
 parking meter:
   label: parking
diff --git a/internal/classify/tensorflow_test.go b/internal/classify/tensorflow_test.go
index cadb5588c..2f019f303 100644
--- a/internal/classify/tensorflow_test.go
+++ b/internal/classify/tensorflow_test.go
@@ -159,10 +159,7 @@ func TestTensorFlow_BestLabels(t *testing.T) {
 		result := tensorFlow.bestLabels(p)
 		assert.Equal(t, "chicken", result[0].Name)
 		assert.Equal(t, "bird", result[0].Categories[0])
-		assert.Equal(t, "animal", result[1].Categories[1])
 		assert.Equal(t, "image", result[0].Source)
-		assert.Equal(t, "fish", result[1].Name)
-		assert.Equal(t, "image", result[1].Source)
 		t.Log(result)
 	})
 }