diff --git a/.gulp/tasks/clean.js b/.gulp/tasks/clean.js
index 1518b16da..f80996af0 100644
--- a/.gulp/tasks/clean.js
+++ b/.gulp/tasks/clean.js
@@ -13,7 +13,7 @@ gulp.task('clean:themes', function() {
 });
 
 gulp.task('clean:schemes', function() {
-  return del([`${paths.schemes}/*.tmTheme`, `${paths.schemes}/*.YAML-tmTheme`]);
+  return del([`${paths.schemes}/*.tmTheme`, `${paths.schemes}/*.yml`]);
 });
 
 gulp.task('clean:widgets', function() {
@@ -21,5 +21,5 @@ gulp.task('clean:widgets', function() {
 });
 
 gulp.task('clean:extras', function() {
-  return del([`${paths.extras}/**/*.hidden-tmTheme`, `${paths.extras}/**/*.YAML-tmTheme`]);
+  return del([`${paths.extras}/**/*.hidden-tmTheme`, `${paths.extras}/**/*.yml`]);
 });
diff --git a/.gulp/tasks/extras.js b/.gulp/tasks/extras.js
index 9f931e97e..683f892f2 100644
--- a/.gulp/tasks/extras.js
+++ b/.gulp/tasks/extras.js
@@ -19,7 +19,7 @@ gulp.task('process:extras', () => {
     .pipe($.flatmap( (stream, file) => {
       var basename = path.basename(file.path, path.extname(file.path));
 
-      return gulp.src(`${paths.src}/extras/**/*.YAML-tmTheme`)
+      return gulp.src(`${paths.src}/extras/**/*.yml`)
         .pipe($.data( () => {
           var specific = require(file.path);
 
@@ -34,7 +34,7 @@ gulp.task('process:extras', () => {
 });
 
 gulp.task('convert:extras', () => {
-  return gulp.src(`${paths.extras}/**/*.YAML-tmTheme`)
+  return gulp.src(`${paths.extras}/**/*.yml`)
     .pipe($.flatmap( (stream) => {
       return stream
         .pipe($.plumber( (error) => {
diff --git a/.gulp/tasks/watch.js b/.gulp/tasks/watch.js
index 2c5949df5..67c09986b 100644
--- a/.gulp/tasks/watch.js
+++ b/.gulp/tasks/watch.js
@@ -10,8 +10,8 @@ import paths from '../paths';
 
 gulp.task('watch', ['build'], () => {
   gulp.watch(`${paths.src}/themes/**/*.json`, ['build:themes']);
-  gulp.watch(`${paths.src}/schemes/scheme.YAML-tmTheme`, ['build:schemes']);
-  gulp.watch(`${paths.src}/extras/**/*.YAML-tmTheme`, ['build:extras']);
+  gulp.watch(`${paths.src}/schemes/scheme.yml`, ['build:schemes']);
+  gulp.watch(`${paths.src}/extras/**/*.yml`, ['build:extras']);
   gulp.watch(`${paths.src}/widgets/widget.*`, ['build:widgets']);
   gulp.watch(`${paths.src}/settings/**/*.json`, ['build:schemes', 'build:widgets', 'build:themes']);
   gulp.watch("gulpfile.babel.js").on("change", () => process.exit(0));