diff --git a/changelog.md b/changelog.md
index 8dde4d4..6a34c58 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v3.1.0
+
+- Updated all skeletons to more ColdBox 7 goodness
+
 ## v3.0.0
 
 - Updates for ColdBox 7
diff --git a/messages.json b/messages.json
index 5a37858..3dd9374 100644
--- a/messages.json
+++ b/messages.json
@@ -5,5 +5,6 @@
 	"2.4.0": "changelog.md",
 	"2.6.0": "changelog.md",
 	"2.7.0": "changelog.md",
-    "3.0.0": "changelog.md"
+    "3.0.0": "changelog.md",
+    "3.1.0": "changelog.md"
 }
diff --git a/readme.md b/readme.md
index a92f19e..0da8b20 100644
--- a/readme.md
+++ b/readme.md
@@ -28,6 +28,7 @@ Code completion for all major ColdBox + TestBox functions and scopes:
 
 ### Code Skeleton Snippets
 
+- `apiResourceHandler` : Creates a ColdBox API Resource Handler
 - `cachebox-config ➝` : Creates a new CacheBox.cfc configuration file
 - `config ➝` : Creates a new ColdBox.cfc configuration file
 - `cfc ➝` : Creates a new ColdFusion script CFC
@@ -42,6 +43,7 @@ Code completion for all major ColdBox + TestBox functions and scopes:
 - `property ➝` : Creates a new ColdFusion script property
 - `routes ➝` : Creates a new routing file
 - `resthandler ➝` : Creates a ColdBox Rest Handler
+- `resourcehandler` : Creates a ColdBox Resource Handler
 - `unit ➝` : Creates a TestBox TDD xUnit Bundle
 
 ### Handler Code Snippets
@@ -100,7 +102,6 @@ Code completion for all major ColdBox + TestBox functions and scopes:
 
 ### ColdBox Testing Snippets
 
-- `handlerTest ➝` : Creates a ColdBox Event Handler test case
 - `integration ➝` : Creates a top down integration BDD test case
 - `interceptorTest ➝` : Creates an Interceptor test case
 - `modelTest ➝` : Creates a model test case
diff --git a/skeletons/CacheBox.sublime-snippet b/skeletons/CacheBox.sublime-snippet
index d4394a4..7e31e22 100644
--- a/skeletons/CacheBox.sublime-snippet
+++ b/skeletons/CacheBox.sublime-snippet
@@ -1,58 +1,73 @@
 <snippet>
 <content><![CDATA[
-/**
-* CacheBox Configuration File
-*/
-component{
-	
+component {
+
+	/**
+	 * Configure CacheBox for ColdBox Application Operation
+	 */
 	function configure(){
-		
-		// The CacheBox configuration structure DSL
+		/**
+		 * --------------------------------------------------------------------------
+		 * CacheBox Configuration (https://cachebox.ortusbooks.com)
+		 * --------------------------------------------------------------------------
+		 */
 		cacheBox = {
-			// LogBox config already in coldbox app, not needed
-			// logBoxConfig = "coldbox.system.web.config.LogBox", 
-			
-			// The defaultCache has an implicit name "default" which is a reserved cache name
-			// It also has a default provider of cachebox which cannot be changed.
-			// All timeouts are in minutes
-			defaultCache = {
-				objectDefaultTimeout = 120, //two hours default
-				objectDefaultLastAccessTimeout = 30, //30 minutes idle time
-				useLastAccessTimeouts = true,
-				reapFrequency = 2,
-				freeMemoryPercentageThreshold = 0,
-				evictionPolicy = "LRU",
-				evictCount = 1,
-				maxObjects = 300,
-				objectStore = "ConcurrentStore", //guaranteed objects
-				coldboxEnabled = true
+			/**
+			 * --------------------------------------------------------------------------
+			 * Default Cache Configuration
+			 * --------------------------------------------------------------------------
+			 * The defaultCache has an implicit name "default" which is a reserved cache name
+			 * It also has a default provider of cachebox which cannot be changed.
+			 * All timeouts are in minutes
+			 */
+			defaultCache : {
+				objectDefaultTimeout           : 120, // two hours default
+				objectDefaultLastAccessTimeout : 30, // 30 minutes idle time
+				useLastAccessTimeouts          : true,
+				reapFrequency                  : 5,
+				freeMemoryPercentageThreshold  : 0,
+				evictionPolicy                 : "LRU",
+				evictCount                     : 1,
+				maxObjects                     : 300,
+				objectStore                    : "ConcurrentStore", // guaranteed objects
+				coldboxEnabled                 : true
 			},
-			
-			// Register all the custom named caches you like here
-			caches = {
-				// Named cache for all coldbox event and view template caching
-				template = {
-					provider = "coldbox.system.cache.providers.CacheBoxColdBoxProvider",
-					properties = {
-						objectDefaultTimeout = 120,
-						objectDefaultLastAccessTimeout = 30,
-						useLastAccessTimeouts = true,
-						freeMemoryPercentageThreshold = 0,
-						reapFrequency = 2,
-						evictionPolicy = "LRU",
-						evictCount = 2,
-						maxObjects = 300,
-						objectStore = "ConcurrentSoftReferenceStore" //memory sensitive
+			/**
+			 * --------------------------------------------------------------------------
+			 * Custom Cache Regions
+			 * --------------------------------------------------------------------------
+			 * You can use this section to register different cache regions and map them
+			 * to different cache providers
+			 */
+			caches : {
+				/**
+				 * --------------------------------------------------------------------------
+				 * ColdBox Template Cache
+				 * --------------------------------------------------------------------------
+				 * The ColdBox Template cache region is used for event/view caching and
+				 * other internal facilities that might require a more elastic cache.
+				 */
+				template : {
+					provider   : "coldbox.system.cache.providers.CacheBoxColdBoxProvider",
+					properties : {
+						objectDefaultTimeout           : 120,
+						objectDefaultLastAccessTimeout : 30,
+						useLastAccessTimeouts          : true,
+						freeMemoryPercentageThreshold  : 0,
+						reapFrequency                  : 5,
+						evictionPolicy                 : "LRU",
+						evictCount                     : 2,
+						maxObjects                     : 300,
+						objectStore                    : "ConcurrentSoftReferenceStore" // memory sensitive
 					}
-				}		
-			}		
+				}
+			}
 		};
-	}	
-	
-	
+	}
+
 }
 ]]></content>
 	<tabTrigger>cachebox-config</tabTrigger>
 	<scope>source,text</scope>
 	<description>CacheBox Configuration File (CaceBox.cfc)</description>
-</snippet>
\ No newline at end of file
+</snippet>
diff --git a/skeletons/Coldbox.sublime-snippet b/skeletons/Coldbox.sublime-snippet
index 1acaeb4..7be38d3 100644
--- a/skeletons/Coldbox.sublime-snippet
+++ b/skeletons/Coldbox.sublime-snippet
@@ -1,145 +1,188 @@
 <snippet>
 <content><![CDATA[
-/**
- * ColdBox Configuration File
- */
-component{
-	
+component {
+
 	/**
-	 * Configure the ColdBox Application
+	 * Configure the ColdBox App For Production
+	 * https://coldbox.ortusbooks.com/getting-started/configuration
 	 */
 	function configure(){
-
-		// coldbox directives
+		/**
+		 * --------------------------------------------------------------------------
+		 * ColdBox Directives
+		 * --------------------------------------------------------------------------
+		 * Here you can configure ColdBox for operation. Remember tha these directives below
+		 * are for PRODUCTION. If you want different settings for other environments make sure
+		 * you create the appropriate functions and define the environment in your .env or
+		 * in the `environments` struct.
+		 */
 		coldbox = {
 			// Application Setup
-			appName 				= getSystemSetting( "APPNAME", "${1:Your App Name}" ),
-			
+			appName                  : getSystemSetting( "APPNAME", "Your app name here" ),
+			eventName                : "event",
 			// Development Settings
-			reinitPassword			= "",
-			handlersIndexAutoReload = true,
-
+			reinitPassword           : "",
+			reinitKey                : "fwreinit",
+			handlersIndexAutoReload  : true,
 			// Implicit Events
-			defaultEvent			= "",
-			requestStartHandler		= "Main.onRequestStart",
-			requestEndHandler		= "",
-			applicationStartHandler = "Main.onAppInit",
-			applicationEndHandler	= "",
-			sessionStartHandler 	= "",
-			sessionEndHandler		= "",
-			missingTemplateHandler	= "",
-
+			defaultEvent             : "",
+			requestStartHandler      : "Main.onRequestStart",
+			requestEndHandler        : "",
+			applicationStartHandler  : "Main.onAppInit",
+			applicationEndHandler    : "",
+			sessionStartHandler      : "",
+			sessionEndHandler        : "",
+			missingTemplateHandler   : "",
 			// Extension Points
-			applicationHelper 			= "includes/helpers/ApplicationHelper.cfm",
-			viewsHelper					= "",
-			modulesExternalLocation		= [],
-			viewsExternalLocation		= "",
-			layoutsExternalLocation 	= "",
-			handlersExternalLocation  	= "",
-			requestContextDecorator 	= "",
-			controllerDecorator			= "",
-
+			applicationHelper        : "includes/helpers/ApplicationHelper.cfm",
+			viewsHelper              : "",
+			modulesExternalLocation  : [],
+			viewsExternalLocation    : "",
+			layoutsExternalLocation  : "",
+			handlersExternalLocation : "",
+			requestContextDecorator  : "",
+			controllerDecorator      : "",
 			// Error/Exception Handling
-			invalidHTTPMethodHandler 	= "",
-			exceptionHandler			= "main.onException",
-			invalidEventHandler			= "",
-			customErrorTemplate			= "",
-
+			invalidHTTPMethodHandler : "",
+			exceptionHandler         : "main.onException",
+			invalidEventHandler      : "",
+			customErrorTemplate      : "",
 			// Application Aspects
-			handlerCaching 			= false,
-			eventCaching			= false,
-			viewCaching				= false,
+			handlerCaching           : false,
+			eventCaching             : false,
+			viewCaching              : false,
 			// Will automatically do a mapDirectory() on your `models` for you.
-			autoMapModels			= true
-		};
-
-		// custom settings
-		settings = {
-
-		};
-
-		// environment settings, create a detectEnvironment() method to detect it yourself.
-		// create a function with the name of the environment so it can be executed if that environment is detected
-		// the value of the environment is a list of regex patterns to match the cgi.http_host.
-		environments = {
-			development = "^localhost,127\.0\.0\.1"
+			autoMapModels            : true,
+			// Auto converts a json body payload into the RC
+			jsonPayloadToRC          : true
 		};
 
-		// Module Directives
+		/**
+		 * --------------------------------------------------------------------------
+		 * Custom Settings
+		 * --------------------------------------------------------------------------
+		 */
+		settings = {};
+
+		/**
+		 * --------------------------------------------------------------------------
+		 * Environment Detection
+		 * --------------------------------------------------------------------------
+		 * By default we look in your `.env` file for an `environment` key, if not,
+		 * then we look into this structure or if you have a function called `detectEnvironment()`
+		 * If you use this setting, then each key is the name of the environment and the value is
+		 * the regex patterns to match against cgi.http_host.
+		 *
+		 * Uncomment to use, but make sure your .env ENVIRONMENT key is also removed.
+		 */
+		// environments = { development : "localhost,^127\.0\.0\.1" };
+
+		/**
+		 * --------------------------------------------------------------------------
+		 * Module Loading Directives
+		 * --------------------------------------------------------------------------
+		 */
 		modules = {
 			// An array of modules names to load, empty means all of them
-			include = [],
+			include : [],
 			// An array of modules names to NOT load, empty means none
-			exclude = []
+			exclude : []
 		};
 
-		//LogBox DSL
+		/**
+		 * --------------------------------------------------------------------------
+		 * Application Logging (https://logbox.ortusbooks.com)
+		 * --------------------------------------------------------------------------
+		 * By Default we log to the console, but you can add many appenders or destinations to log to.
+		 * You can also choose the logging level of the root logger, or even the actual appender.
+		 */
 		logBox = {
 			// Define Appenders
-			appenders = {
-				console = { class="coldbox.system.logging.appenders.ConsoleAppender" }
-			},
+			appenders : { coldboxTracer : { class : "coldbox.system.logging.appenders.ConsoleAppender" } },
 			// Root Logger
-			root = { levelmax="INFO", appenders="*" },
+			root      : { levelmax : "INFO", appenders : "*" },
 			// Implicit Level Categories
-			info = [ "coldbox.system" ]
+			info      : [ "coldbox.system" ]
 		};
 
-		/ Layout Settings
-		layoutSettings = {
-			defaultLayout = "",
-			defaultView   = ""
+		/**
+		 * --------------------------------------------------------------------------
+		 * Layout Settings
+		 * --------------------------------------------------------------------------
+		 */
+		layoutSettings = { defaultLayout : "", defaultView : "" };
+
+		/**
+		 * --------------------------------------------------------------------------
+		 * Custom Interception Points
+		 * --------------------------------------------------------------------------
+		 */
+		interceptorSettings = { customInterceptionPoints : [] };
+
+		/**
+		 * --------------------------------------------------------------------------
+		 * Application Interceptors
+		 * --------------------------------------------------------------------------
+		 * Remember that the order of declaration is the order they will be registered and fired
+		 */
+		interceptors = [];
+
+		/**
+		 * --------------------------------------------------------------------------
+		 * Module Settings
+		 * --------------------------------------------------------------------------
+		 * Each module has it's own configuration structures, so make sure you follow
+		 * the module's instructions on settings.
+		 *
+		 * Each key is the name of the module:
+		 *
+		 * myModule = {
+		 *
+		 * }
+		 */
+		moduleSettings = {};
+
+		/**
+		 * --------------------------------------------------------------------------
+		 * Flash Scope Settings
+		 * --------------------------------------------------------------------------
+		 * The available scopes are : session, client, cluster, ColdBoxCache, or a full instantiation CFC path
+		 */
+		flash = {
+			scope        : "session",
+			properties   : {}, // constructor properties for the flash scope implementation
+			inflateToRC  : true, // automatically inflate flash data into the RC scope
+			inflateToPRC : false, // automatically inflate flash data into the PRC scope
+			autoPurge    : true, // automatically purge flash data for you
+			autoSave     : true // automatically save flash scopes at end of a request and on relocations.
 		};
 
-		// Interceptor Settings
-		interceptorSettings = {
-			customInterceptionPoints = ""
+		/**
+		 * --------------------------------------------------------------------------
+		 * App Conventions
+		 * --------------------------------------------------------------------------
+		 */
+		conventions = {
+			handlersLocation : "handlers",
+			viewsLocation    : "views",
+			layoutsLocation  : "layouts",
+			modelsLocation   : "models",
+			eventAction      : "index"
 		};
-
-		// Register interceptors as an array, we need order
-		interceptors = [
-		];
-
-		// Module Settings
-		moduleSettings = {
-
-		};
-
-		/*
-			// flash scope configuration
-			flash = {
-				scope = "session,client,cluster,ColdboxCache,or full path",
-				properties = {}, // constructor properties for the flash scope implementation
-				inflateToRC = true, // automatically inflate flash data into the RC scope
-				inflateToPRC = false, // automatically inflate flash data into the PRC scope
-				autoPurge = true, // automatically purge flash data for you
-				autoSave = true // automatically save flash scopes at end of a request and on relocations.
-			};
-
-			//Conventions
-			conventions = {
-				handlersLocation = "handlers",
-				pluginsLocation  = "plugins",
-				viewsLocation 	 = "views",
-				layoutsLocation  = "layouts",
-				modelsLocation 	 = "model",
-				eventAction 	 = "index"
-			};
-
-		*/
-
 	}
 
 	/**
-	 * Dev environment
+	 * Development environment
 	 */
 	function development(){
-		coldbox.customErrorTemplate = "/coldbox/system/includes/BugReport.cfm";
+		// coldbox.customErrorTemplate = "/coldbox/system/exceptions/BugReport.cfm"; // static bug reports
+		coldbox.customErrorTemplate = "/coldbox/system/exceptions/Whoops.cfm"; // interactive bug report
 	}
-	
+
 }
+
 ]]></content>
 	<tabTrigger>config</tabTrigger>
 	<scope>source,text</scope>
 	<description>ColdBox Configuration File (Coldbox.cfc)</description>
-</snippet>
\ No newline at end of file
+</snippet>
diff --git a/skeletons/handler.sublime-snippet b/skeletons/handler.sublime-snippet
index 9954734..6727e4e 100644
--- a/skeletons/handler.sublime-snippet
+++ b/skeletons/handler.sublime-snippet
@@ -4,35 +4,17 @@
  * ${1:My Event Handler Hint}
  */
 component extends="coldbox.system.EventHandler"{
-	
+
 	// OPTIONAL HANDLER PROPERTIES
 	this.prehandler_only 	= "";
 	this.prehandler_except 	= "";
 	this.posthandler_only 	= "";
 	this.posthandler_except = "";
 	this.aroundHandler_only = "";
-	this.aroundHandler_except = "";		
+	this.aroundHandler_except = "";
 
 	// REST Allowed HTTP Methods Ex: this.allowedMethods = {delete='POST,DELETE',index='GET'}
 	this.allowedMethods = {};
-	
-	/**
-	IMPLICIT FUNCTIONS: Uncomment to use
-	function preHandler( event, rc, prc, action, eventArguments){}
-	function postHandler( event, rc, prc, action, eventArguments){}
-	function aroundHandler( event, rc, prc, targetAction, eventArguments ){
-		// executed targeted action
-		var args = { event = arguments.event, rc = arguments.rc, prc = arguments.prc };
-		structAppend( args, arguments.eventArguments );
-		arguments.targetAction( argumentCollection=args );
-	}
-	function onMissingAction( event, rc, prc, missingAction, eventArguments ){
-	}
-	function onError( event, rc, prc, faultAction, exception, eventArguments ){
-	}
-	function onInvalidHTTPMethod( event, rc, prc, faultAction, eventArguments ){
-	}
-	*/
 
 	/**
 	 * Index
@@ -40,10 +22,10 @@ component extends="coldbox.system.EventHandler"{
 	any function index( event, rc, prc ){
 		${0}
 	}
-	
+
 }
 ]]></content>
 	<tabTrigger>handler</tabTrigger>
 	<scope>source,text</scope>
 	<description>ColdBox Event Handler</description>
-</snippet>
\ No newline at end of file
+</snippet>
diff --git a/skeletons/resource-api-handler.sublime-snippet b/skeletons/resource-api-handler.sublime-snippet
new file mode 100644
index 0000000..d9382d8
--- /dev/null
+++ b/skeletons/resource-api-handler.sublime-snippet
@@ -0,0 +1,62 @@
+<snippet>
+<content><![CDATA[
+/**
+ * ${1:My API Resource Handler Hint}
+ * Implicit Functions: preHandler, postHandler, aroundHandler, onMissingAction, onError, onInvalidHTTPMethod
+ */
+component extends="coldbox.system.RestHandler"{
+
+	this.prehandler_only 	= "";
+	this.prehandler_except 	= "";
+	this.posthandler_only 	= "";
+	this.posthandler_except = "";
+	this.aroundHandler_only = "";
+	this.aroundHandler_except = "";
+
+	/**
+	 * index
+	 */
+	function index( event, rc, prc ){
+        event.getResponse()
+            .setData( {} )
+            .addMessage( "Calling photos/index" );
+	}
+	/**
+	 * create
+	 */
+	function create( event, rc, prc ){
+        event.getResponse()
+            .setData( {} )
+            .addMessage( "Calling photos/create" );
+	}
+	/**
+	 * show
+	 */
+	function show( event, rc, prc ){
+        event.getResponse()
+            .setData( {} )
+            .addMessage( "Calling photos/show" );
+	}
+	/**
+	 * update
+	 */
+	function update( event, rc, prc ){
+        event.getResponse()
+            .setData( {} )
+            .addMessage( "Calling photos/update" );
+	}
+	/**
+	 * delete
+	 */
+	function delete( event, rc, prc ){
+        event.getResponse()
+            .setData( {} )
+            .addMessage( "Calling photos/delete" );
+	}
+
+}
+]]></content>
+	<tabTrigger>apiResourceHandler</tabTrigger>
+	<scope>source,text</scope>
+	<description>ColdBox API Resource Handler</description>
+</snippet>
diff --git a/skeletons/resource-handler.sublime-snippet b/skeletons/resource-handler.sublime-snippet
new file mode 100644
index 0000000..deb750e
--- /dev/null
+++ b/skeletons/resource-handler.sublime-snippet
@@ -0,0 +1,71 @@
+<snippet>
+<content><![CDATA[
+/**
+ * ${1:My Resource Handler Hint}
+ * Implicit Functions: preHandler, postHandler, aroundHandler, onMissingAction, onError, onInvalidHTTPMethod
+ */
+component extends="coldbox.system.EventHandler"{
+
+	this.prehandler_only 	= "";
+	this.prehandler_except 	= "";
+	this.posthandler_only 	= "";
+	this.posthandler_except = "";
+	this.aroundHandler_only = "";
+	this.aroundHandler_except = "";
+	this.allowedMethods = {};
+
+	/**
+	 * Display a listing of the resource
+	 */
+	function index( event, rc, prc ){
+
+	}
+
+	/**
+	 * Show the form for creating a new resource
+	 */
+	function new( event, rc, prc ){
+
+	}
+
+	/**
+	 * Store a newly created resource in storage
+	 */
+	function create( event, rc, prc ){
+
+	}
+
+	/**
+	 * Display the specified resource
+	 */
+	function show( event, rc, prc ){
+
+	}
+
+	/**
+	 * Show the form for editing the specified resource
+	 */
+	function edit( event, rc, prc ){
+
+	}
+
+	/**
+	 * Update the specified resource in storage
+	 */
+	function update( event, rc, prc ){
+
+	}
+
+	/**
+	 * Remove the specified resource from storage
+	 */
+	function delete( event, rc, prc ){
+
+	}
+
+}
+]]></content>
+	<tabTrigger>resourcehandler</tabTrigger>
+	<scope>source,text</scope>
+	<description>ColdBox Resource Handler</description>
+</snippet>
diff --git a/skeletons/resthandler.sublime-snippet b/skeletons/resthandler.sublime-snippet
index bc206aa..7db09a6 100644
--- a/skeletons/resthandler.sublime-snippet
+++ b/skeletons/resthandler.sublime-snippet
@@ -4,10 +4,7 @@
  * ${1:My Rest Handler Hint}
  */
 component extends="coldbox.system.RestHandler"{
-	
-	// REST Allowed HTTP Methods Ex: this.allowedMethods = {delete='POST,DELETE',index='GET'}
-	this.allowedMethods = {};
-	
+
 	/**
 	 * Index
 	 */
@@ -15,10 +12,10 @@ component extends="coldbox.system.RestHandler"{
 		event.getResponse()
             .setData( "" );
 	}
-	
+
 }
 ]]></content>
 	<tabTrigger>resthandler</tabTrigger>
 	<scope>source,text</scope>
 	<description>ColdBox Rest Handler</description>
-</snippet>
\ No newline at end of file
+</snippet>
diff --git a/skeletons/router.sublime-snippet b/skeletons/router.sublime-snippet
index d0663a5..83ba81c 100644
--- a/skeletons/router.sublime-snippet
+++ b/skeletons/router.sublime-snippet
@@ -1,35 +1,42 @@
 <snippet>
 <content><![CDATA[
-component{
+/**
+ * This is your application router.  From here you can controll all the incoming routes to your application.
+ *
+ * https://coldbox.ortusbooks.com/the-basics/routing
+ */
+component {
 
 	function configure(){
-		// Set Full Rewrites
+		/**
+		 * --------------------------------------------------------------------------
+		 * Router Configuration Directives
+		 * --------------------------------------------------------------------------
+		 * https://coldbox.ortusbooks.com/the-basics/routing/application-router#configuration-methods
+		 */
 		setFullRewrites( true );
 
 		/**
 		 * --------------------------------------------------------------------------
 		 * App Routes
 		 * --------------------------------------------------------------------------
-		 *
 		 * Here is where you can register the routes for your web application!
 		 * Go get Funky!
-		 *
 		 */
 
 		// A nice healthcheck route example
-		route("/healthcheck",function(event,rc,prc){
+		route( "/healthcheck", function( event, rc, prc ){
 			return "Ok!";
-		});
+		} );
 
 		// A nice RESTFul Route example
 		route( "/api/echo", function( event, rc, prc ){
-			return {
-				"error" : false,
-				"data" 	: "Welcome to my awesome API!"
-			};
+			return { "error" : false, "data" : "Welcome to my awesome API!" };
 		} );
 
-		// Conventions based routing
+		// @app_routes@
+
+		// Conventions-Based Routing
 		route( ":handler/:action?" ).end();
 	}
 
@@ -38,4 +45,4 @@ component{
 	<tabTrigger>router</tabTrigger>
 	<scope>source,text</scope>
 	<description>New ColdBox Router</description>
-</snippet>
\ No newline at end of file
+</snippet>
diff --git a/snippets/testing/handler.sublime-snippet b/snippets/testing/handler.sublime-snippet
deleted file mode 100644
index fb0b8e6..0000000
--- a/snippets/testing/handler.sublime-snippet
+++ /dev/null
@@ -1,24 +0,0 @@
-<snippet>
-<content><![CDATA[
-component extends="coldbox.system.testing.BaseHandlerTest" handler="${1:HandlerPath}"{
-	
-	/**
-	 * You can remove this setup method if you do not have anything to setup
-	 */
-	void function setup(){
-		super.setup();
-		
-		// Your own setup here if needed
-		${0}
-	}
-
-	function testSomething(){
-	
-	}
-
-}
-]]></content>
-	<tabTrigger>handlerTest</tabTrigger>
-	<scope>source,text</scope>
-	<description>ColdBox Handler Test</description>
-</snippet>
\ No newline at end of file