diff --git a/autoload/airline/themes/base16-3024.vim b/autoload/airline/themes/base16_3024.vim
similarity index 100%
rename from autoload/airline/themes/base16-3024.vim
rename to autoload/airline/themes/base16_3024.vim
diff --git a/autoload/airline/themes/base16-apathy.vim b/autoload/airline/themes/base16_apathy.vim
similarity index 100%
rename from autoload/airline/themes/base16-apathy.vim
rename to autoload/airline/themes/base16_apathy.vim
diff --git a/autoload/airline/themes/base16-ashes.vim b/autoload/airline/themes/base16_ashes.vim
similarity index 100%
rename from autoload/airline/themes/base16-ashes.vim
rename to autoload/airline/themes/base16_ashes.vim
diff --git a/autoload/airline/themes/base16-atelierdune.vim b/autoload/airline/themes/base16_atelierdune.vim
similarity index 100%
rename from autoload/airline/themes/base16-atelierdune.vim
rename to autoload/airline/themes/base16_atelierdune.vim
diff --git a/autoload/airline/themes/base16-atelierforest.vim b/autoload/airline/themes/base16_atelierforest.vim
similarity index 100%
rename from autoload/airline/themes/base16-atelierforest.vim
rename to autoload/airline/themes/base16_atelierforest.vim
diff --git a/autoload/airline/themes/base16-atelierheath.vim b/autoload/airline/themes/base16_atelierheath.vim
similarity index 100%
rename from autoload/airline/themes/base16-atelierheath.vim
rename to autoload/airline/themes/base16_atelierheath.vim
diff --git a/autoload/airline/themes/base16-atelierlakeside.vim b/autoload/airline/themes/base16_atelierlakeside.vim
similarity index 100%
rename from autoload/airline/themes/base16-atelierlakeside.vim
rename to autoload/airline/themes/base16_atelierlakeside.vim
diff --git a/autoload/airline/themes/base16-atelierseaside.vim b/autoload/airline/themes/base16_atelierseaside.vim
similarity index 100%
rename from autoload/airline/themes/base16-atelierseaside.vim
rename to autoload/airline/themes/base16_atelierseaside.vim
diff --git a/autoload/airline/themes/base16-bespin.vim b/autoload/airline/themes/base16_bespin.vim
similarity index 100%
rename from autoload/airline/themes/base16-bespin.vim
rename to autoload/airline/themes/base16_bespin.vim
diff --git a/autoload/airline/themes/base16-brewer.vim b/autoload/airline/themes/base16_brewer.vim
similarity index 100%
rename from autoload/airline/themes/base16-brewer.vim
rename to autoload/airline/themes/base16_brewer.vim
diff --git a/autoload/airline/themes/base16-bright.vim b/autoload/airline/themes/base16_bright.vim
similarity index 100%
rename from autoload/airline/themes/base16-bright.vim
rename to autoload/airline/themes/base16_bright.vim
diff --git a/autoload/airline/themes/base16-chalk.vim b/autoload/airline/themes/base16_chalk.vim
similarity index 100%
rename from autoload/airline/themes/base16-chalk.vim
rename to autoload/airline/themes/base16_chalk.vim
diff --git a/autoload/airline/themes/base16-codeschool.vim b/autoload/airline/themes/base16_codeschool.vim
similarity index 100%
rename from autoload/airline/themes/base16-codeschool.vim
rename to autoload/airline/themes/base16_codeschool.vim
diff --git a/autoload/airline/themes/base16-colors.vim b/autoload/airline/themes/base16_colors.vim
similarity index 100%
rename from autoload/airline/themes/base16-colors.vim
rename to autoload/airline/themes/base16_colors.vim
diff --git a/autoload/airline/themes/base16-default.vim b/autoload/airline/themes/base16_default.vim
similarity index 100%
rename from autoload/airline/themes/base16-default.vim
rename to autoload/airline/themes/base16_default.vim
diff --git a/autoload/airline/themes/base16-eighties.vim b/autoload/airline/themes/base16_eighties.vim
similarity index 100%
rename from autoload/airline/themes/base16-eighties.vim
rename to autoload/airline/themes/base16_eighties.vim
diff --git a/autoload/airline/themes/base16-embers.vim b/autoload/airline/themes/base16_embers.vim
similarity index 100%
rename from autoload/airline/themes/base16-embers.vim
rename to autoload/airline/themes/base16_embers.vim
diff --git a/autoload/airline/themes/base16-flat.vim b/autoload/airline/themes/base16_flat.vim
similarity index 100%
rename from autoload/airline/themes/base16-flat.vim
rename to autoload/airline/themes/base16_flat.vim
diff --git a/autoload/airline/themes/base16-google.vim b/autoload/airline/themes/base16_google.vim
similarity index 100%
rename from autoload/airline/themes/base16-google.vim
rename to autoload/airline/themes/base16_google.vim
diff --git a/autoload/airline/themes/base16-grayscale.vim b/autoload/airline/themes/base16_grayscale.vim
similarity index 100%
rename from autoload/airline/themes/base16-grayscale.vim
rename to autoload/airline/themes/base16_grayscale.vim
diff --git a/autoload/airline/themes/base16-greenscreen.vim b/autoload/airline/themes/base16_greenscreen.vim
similarity index 100%
rename from autoload/airline/themes/base16-greenscreen.vim
rename to autoload/airline/themes/base16_greenscreen.vim
diff --git a/autoload/airline/themes/base16-harmonic16.vim b/autoload/airline/themes/base16_harmonic16.vim
similarity index 100%
rename from autoload/airline/themes/base16-harmonic16.vim
rename to autoload/airline/themes/base16_harmonic16.vim
diff --git a/autoload/airline/themes/base16-hopscotch.vim b/autoload/airline/themes/base16_hopscotch.vim
similarity index 100%
rename from autoload/airline/themes/base16-hopscotch.vim
rename to autoload/airline/themes/base16_hopscotch.vim
diff --git a/autoload/airline/themes/base16-isotope.vim b/autoload/airline/themes/base16_isotope.vim
similarity index 100%
rename from autoload/airline/themes/base16-isotope.vim
rename to autoload/airline/themes/base16_isotope.vim
diff --git a/autoload/airline/themes/base16-londontube.vim b/autoload/airline/themes/base16_londontube.vim
similarity index 100%
rename from autoload/airline/themes/base16-londontube.vim
rename to autoload/airline/themes/base16_londontube.vim
diff --git a/autoload/airline/themes/base16-marrakesh.vim b/autoload/airline/themes/base16_marrakesh.vim
similarity index 100%
rename from autoload/airline/themes/base16-marrakesh.vim
rename to autoload/airline/themes/base16_marrakesh.vim
diff --git a/autoload/airline/themes/base16-mocha.vim b/autoload/airline/themes/base16_mocha.vim
similarity index 100%
rename from autoload/airline/themes/base16-mocha.vim
rename to autoload/airline/themes/base16_mocha.vim
diff --git a/autoload/airline/themes/base16-monokai.vim b/autoload/airline/themes/base16_monokai.vim
similarity index 100%
rename from autoload/airline/themes/base16-monokai.vim
rename to autoload/airline/themes/base16_monokai.vim
diff --git a/autoload/airline/themes/base16-ocean.vim b/autoload/airline/themes/base16_ocean.vim
similarity index 100%
rename from autoload/airline/themes/base16-ocean.vim
rename to autoload/airline/themes/base16_ocean.vim
diff --git a/autoload/airline/themes/base16-paraiso.vim b/autoload/airline/themes/base16_paraiso.vim
similarity index 100%
rename from autoload/airline/themes/base16-paraiso.vim
rename to autoload/airline/themes/base16_paraiso.vim
diff --git a/autoload/airline/themes/base16-pop.vim b/autoload/airline/themes/base16_pop.vim
similarity index 100%
rename from autoload/airline/themes/base16-pop.vim
rename to autoload/airline/themes/base16_pop.vim
diff --git a/autoload/airline/themes/base16-railscasts.vim b/autoload/airline/themes/base16_railscasts.vim
similarity index 100%
rename from autoload/airline/themes/base16-railscasts.vim
rename to autoload/airline/themes/base16_railscasts.vim
diff --git a/autoload/airline/themes/base16-shapeshifter.vim b/autoload/airline/themes/base16_shapeshifter.vim
similarity index 100%
rename from autoload/airline/themes/base16-shapeshifter.vim
rename to autoload/airline/themes/base16_shapeshifter.vim
diff --git a/autoload/airline/themes/base16-solarized.vim b/autoload/airline/themes/base16_solarized.vim
similarity index 100%
rename from autoload/airline/themes/base16-solarized.vim
rename to autoload/airline/themes/base16_solarized.vim
diff --git a/autoload/airline/themes/base16-summerfruit.vim b/autoload/airline/themes/base16_summerfruit.vim
similarity index 100%
rename from autoload/airline/themes/base16-summerfruit.vim
rename to autoload/airline/themes/base16_summerfruit.vim
diff --git a/autoload/airline/themes/base16-tomorrow.vim b/autoload/airline/themes/base16_tomorrow.vim
similarity index 100%
rename from autoload/airline/themes/base16-tomorrow.vim
rename to autoload/airline/themes/base16_tomorrow.vim
diff --git a/autoload/airline/themes/base16-twilight.vim b/autoload/airline/themes/base16_twilight.vim
similarity index 100%
rename from autoload/airline/themes/base16-twilight.vim
rename to autoload/airline/themes/base16_twilight.vim