diff --git a/templates/disk.ini b/templates/disk.ini
index a752889..f566de6 100644
--- a/templates/disk.ini
+++ b/templates/disk.ini
@@ -1,5 +1,5 @@
 [disk.graph]
-check_command = "disk"
+check_command = "disk, disk-windows"
 
 [disk.metrics_filters]
 value = "$service_name_template$.perfdata.$disk$.value"
diff --git a/templates/load.ini b/templates/load.ini
index 66add8e..4fdbdc4 100644
--- a/templates/load.ini
+++ b/templates/load.ini
@@ -16,3 +16,19 @@ lineWidth = "2"
 load15.value = "alias(color($metric$, '#ff5566'), 'Load 15')"
 load5.value = "alias(color($metric$, '#ffaa44'), 'Load 5')"
 load1.value = "alias(color($metric$, '#44bb77'), 'Load 1')"
+
+
+[load-windows.graph]
+check_command = "load-windows"
+
+[load-windows.metrics_filters]
+value = "$service_name_template$.perfdata.load.value"
+
+[load-windows.urlparams]
+areaAlpha = "0.5"
+areaMode = "all"
+min = "0"
+yUnitSystem = "none"
+
+[load-windows.functions]
+value = "alias(color($metric$, '#1a7dd7'), 'Load (%)')"
diff --git a/templates/memory.ini b/templates/memory.ini
new file mode 100644
index 0000000..b1fd9f6
--- /dev/null
+++ b/templates/memory.ini
@@ -0,0 +1,16 @@
+[memory.graph]
+check_command = "memory-windows"
+
+[memory.metrics_filters]
+value = "$service_name_template$.perfdata.memory.value"
+max = "$service_name_template$.perfdata.memory.max"
+
+[memory.urlparams]
+areaAlpha = "0.5"
+areaMode = "all"
+min = "0"
+yUnitSystem = "binary"
+
+[memory.functions]
+value = "alias(color($metric$, '#1a7dd7'), 'Used (bytes)')"
+max = "alias(color($metric$, '#cfd7e6'), 'Size (bytes)')"
diff --git a/templates/network.ini b/templates/network.ini
new file mode 100644
index 0000000..bb22c7f
--- /dev/null
+++ b/templates/network.ini
@@ -0,0 +1,34 @@
+[network-windows-total.graph]
+check_command = "network-windows"
+
+[network-windows-total.metrics_filters]
+value = "$service_name_template$.perfdata.network.value"
+
+[network-windows-total.urlparams]
+areaAlpha = "0.5"
+areaMode = "all"
+min = "0"
+title = "Total"
+yUnitSystem = "binary"
+
+[network-windows-total.functions]
+value = "alias(color($metric$, '#1a7dd7'), 'I/O (bytes/s)')"
+
+
+[network-windows-nic.graph]
+check_command = "network-windows"
+
+[network-windows-nic.metrics_filters]
+in.value = "$service_name_template$.perfdata.$nic$_in.value"
+out.value = "$service_name_template$.perfdata.$nic$_out.value"
+
+[network-windows-nic.urlparams]
+areaAlpha = "0.5"
+lineWidth = "2"
+min = "0"
+title = "$nic$"
+yUnitSystem = "binary"
+
+[network-windows-nic.functions]
+in.value = "alias(color($metric$, '#44bb77'), 'In (bytes/s)')"
+out.value = "alias(color($metric$, '#ff5566'), 'Out (bytes/s)')"
diff --git a/templates/ping.ini b/templates/ping.ini
index 3891297..77cd1fd 100644
--- a/templates/ping.ini
+++ b/templates/ping.ini
@@ -1,5 +1,5 @@
 [ping-rta.graph]
-check_command = "ping, ping4, ping6"
+check_command = "ping, ping4, ping6, ping-windows"
 
 [ping-rta.metrics_filters]
 rta.value = "$service_name_template$.perfdata.rta.value"
diff --git a/templates/procs.ini b/templates/procs.ini
index 9b65e0f..d057850 100644
--- a/templates/procs.ini
+++ b/templates/procs.ini
@@ -1,5 +1,5 @@
 [procs.graph]
-check_command = "procs"
+check_command = "procs, procs-windows"
 
 [procs.metrics_filters]
 value = "$service_name_template$.perfdata.procs.value"
diff --git a/templates/swap.ini b/templates/swap.ini
index c9dcc8e..ff418ab 100644
--- a/templates/swap.ini
+++ b/templates/swap.ini
@@ -1,5 +1,5 @@
 [swap.graph]
-check_command = "swap"
+check_command = "swap, swap-windows"
 
 [swap.metrics_filters]
 value = "$service_name_template$.perfdata.swap.value"
diff --git a/templates/apt.ini b/templates/update.ini
similarity index 59%
rename from templates/apt.ini
rename to templates/update.ini
index 88a89c2..84793e3 100644
--- a/templates/apt.ini
+++ b/templates/update.ini
@@ -14,3 +14,19 @@ yUnitSystem = "none"
 [apt.functions]
 critical_updates.value = "alias(color($metric$, '#ff5566'), 'Critical Updates')"
 available_upgrades.value = "alias(color($metric$, '#ffaa44'), 'Available Upgrades')"
+
+
+[update-windows.graph]
+check_command = "update-windows"
+
+[update-windows.metrics_filters]
+value = "$service_name_template$.perfdata.update.value"
+
+[update-windows.urlparams]
+areaAlpha = "0.5"
+areaMode = "all"
+min = "0"
+yUnitSystem = "none"
+
+[update-windows.functions]
+value = "alias(color($metric$, '#1a7dd7'), 'Available Updates')"
diff --git a/templates/uptime.ini b/templates/uptime.ini
new file mode 100644
index 0000000..a63e132
--- /dev/null
+++ b/templates/uptime.ini
@@ -0,0 +1,14 @@
+[uptime-windows.graph]
+check_command = "uptime-windows"
+
+[uptime-windows.metrics_filters]
+value = "$service_name_template$.perfdata.uptime.value"
+
+[uptime-windows.urlparams]
+areaAlpha = "0.5"
+areaMode = "all"
+min = "0"
+yUnitSystem = "sec"
+
+[uptime-windows.functions]
+value = "alias(color($metric$, '#1a7dd7'), 'Uptime (s)')"
diff --git a/templates/users.ini b/templates/users.ini
index 234d6c1..cc00e01 100644
--- a/templates/users.ini
+++ b/templates/users.ini
@@ -1,5 +1,5 @@
 [users.graph]
-check_command = "users"
+check_command = "users, users-windows"
 
 [users.metrics_filters]
 users = "$service_name_template$.perfdata.users.value"