diff --git a/templates/push.js b/templates/push.js
index 0df6d7f..aee941d 100644
--- a/templates/push.js
+++ b/templates/push.js
@@ -7,9 +7,9 @@ module.exports = [
 				name: "{{ sender.login }}",
 				icon_url: "{{ sender.avatar_url }}"
 			},
-			title: "[{{ repository.name }}:{{ base_ref }}] {{ count(commits) }} new commit(s)",
+			title: "[{{ repository.name }}:{{ head_commit.tree_id }}] {{ count(commits) }} new commit(s)",
 			url: "{{ compare }}",
-			color: color("black")
+			color: color("gray")
 		}]
 	}
 ]
diff --git a/templates/team_add.js b/templates/team_add.js
index 2e121a5..7bc21d1 100644
--- a/templates/team_add.js
+++ b/templates/team_add.js
@@ -7,8 +7,8 @@ module.exports = [
 				name: "{{ sender.login }}",
 				icon_url: "{{ sender.avatar_url }}"
 			},
-			title: "[{{ repository.name }}:{{ repository.default_branch }}] `team_add`",
-			url: "{{ repository.html_url }}",
+			title: "[{{ repository.name }}] Team **{{ team.name }}** added",
+			url: "{{ team.html_url }}",
 			color: color("black")
 		}]
 	}
diff --git a/templates/workflow_job.js b/templates/workflow_job.js
index 9ef7c4c..3b89380 100644
--- a/templates/workflow_job.js
+++ b/templates/workflow_job.js
@@ -8,8 +8,8 @@ module.exports = [
 				name: "{{ sender.login }}",
 				icon_url: "{{ sender.avatar_url }}"
 			},
-			title: "[{{ repository.name }}:{{ repository.default_branch }}] `workflow_job` (`completed`)",
-			url: "{{ repository.html_url }}",
+			title: "[{{ repository.name }}] Workflow **{{ workflow.name }}** {{ workflow_run.conclusion }}",
+			url: "{{ workflow_run.html_url }}",
 			color: color("black")
 		}]
 	},{
@@ -19,8 +19,8 @@ module.exports = [
 				name: "{{ sender.login }}",
 				icon_url: "{{ sender.avatar_url }}"
 			},
-			title: "[{{ repository.name }}:{{ repository.default_branch }}] `workflow_job` (`in_progress`)",
-			url: "{{ repository.html_url }}",
+			title: "[{{ repository.name }}] Workflow **{{ workflow.name }}** {{ workflow_run.status }}",
+			url: "{{ workflow_run.html_url }}",
 			color: color("black")
 		}]
 	},{
@@ -30,8 +30,8 @@ module.exports = [
 				name: "{{ sender.login }}",
 				icon_url: "{{ sender.avatar_url }}"
 			},
-			title: "[{{ repository.name }}:{{ repository.default_branch }}] Workflow **{{ workflow.name }}** queued",
-			url: "{{ repository.html_url }}",
+			title: "[{{ repository.name }}] Workflow **{{ workflow.name }}** queued",
+			url: "{{ workflow_run.html_url }}",
 			color: color("gray")
 		}]
 	},{
@@ -41,9 +41,9 @@ module.exports = [
 				name: "{{ sender.login }}",
 				icon_url: "{{ sender.avatar_url }}"
 			},
-			title: "[{{ repository.name }}:{{ repository.default_branch }}] `workflow_job` (`waiting`)",
-			url: "{{ repository.html_url }}",
-			color: color("black")
+			title: "[{{ repository.name }}] Workflow **{{ workflow.name }}** waiting",
+			url: "{{ workflow_run.html_url }}",
+			color: color("gray")
 		}]
 	}
 ]
diff --git a/templates/workflow_run.js b/templates/workflow_run.js
index 0b2ed95..3beb947 100644
--- a/templates/workflow_run.js
+++ b/templates/workflow_run.js
@@ -14,7 +14,7 @@ module.exports = [
 			image: {
 				url: "{{ workflow_run.badge_url }}"
 			},
-			color: color("green")
+			color: color("magenta")
 		}]
 	},{
 		action: "in_progress",
@@ -29,7 +29,7 @@ module.exports = [
 			image: {
 				url: "{{ workflow_run.badge_url }}"
 			},
-			color: color("black")
+			color: color("yellow")
 		}]
 	},{
 		action: "requested",