diff --git a/makefile.lst b/makefile.lst
index d588b0fb2..9c653f668 100644
--- a/makefile.lst
+++ b/makefile.lst
@@ -215,7 +215,7 @@ COMMON_SOURCES =					\
 	src/util/recscr.cpp				\
 	src/util/render.cpp				\
 	src/util/thmbnail.cpp				\
-	src/widgets/colbar.cpp				\
+	src/widgets/color_bar.cpp			\
 	src/widgets/colbut.cpp				\
 	src/widgets/colsel.cpp				\
 	src/widgets/colview.cpp				\
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cffd86d91..8e4513bfc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -237,7 +237,7 @@ add_executable(aseprite WIN32
   util/recscr.cpp
   util/render.cpp
   util/thmbnail.cpp
-  widgets/colbar.cpp
+  widgets/color_bar.cpp
   widgets/colbut.cpp
   widgets/colsel.cpp
   widgets/colview.cpp
diff --git a/src/app.cpp b/src/app.cpp
index fb94b4e45..78d0060a1 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -60,7 +60,7 @@
 #include "util/boundary.h"
 #include "util/recscr.h"
 #include "util/render.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/editor.h"
 #include "widgets/menuitem.h"
 #include "widgets/statebar.h"
diff --git a/src/commands/cmd_advanced_mode.cpp b/src/commands/cmd_advanced_mode.cpp
index 43a815e9d..572ce7503 100644
--- a/src/commands/cmd_advanced_mode.cpp
+++ b/src/commands/cmd_advanced_mode.cpp
@@ -24,7 +24,7 @@
 #include "app.h"
 #include "core/cfg.h"
 #include "modules/gui.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/statebar.h"
 #include "widgets/tabs.h"
 
diff --git a/src/commands/cmd_background_from_layer.cpp b/src/commands/cmd_background_from_layer.cpp
index a78a7208c..9b3612bf0 100644
--- a/src/commands/cmd_background_from_layer.cpp
+++ b/src/commands/cmd_background_from_layer.cpp
@@ -24,7 +24,7 @@
 #include "raster/sprite.h"
 #include "sprite_wrappers.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 class BackgroundFromLayerCommand : public Command
 {
diff --git a/src/commands/cmd_canvas_size.cpp b/src/commands/cmd_canvas_size.cpp
index c9243331e..515e3d5e5 100644
--- a/src/commands/cmd_canvas_size.cpp
+++ b/src/commands/cmd_canvas_size.cpp
@@ -29,7 +29,7 @@
 #include "raster/sprite.h"
 #include "sprite_wrappers.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 class CanvasSizeCommand : public Command
 {
diff --git a/src/commands/cmd_change_color.cpp b/src/commands/cmd_change_color.cpp
index 7ed96adb6..60828678c 100644
--- a/src/commands/cmd_change_color.cpp
+++ b/src/commands/cmd_change_color.cpp
@@ -23,7 +23,7 @@
 #include "commands/command.h"
 #include "commands/params.h"
 #include "app.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 class ChangeColorCommand : public Command
 {
diff --git a/src/commands/cmd_clear.cpp b/src/commands/cmd_clear.cpp
index a9b901a58..23274b38c 100644
--- a/src/commands/cmd_clear.cpp
+++ b/src/commands/cmd_clear.cpp
@@ -27,7 +27,7 @@
 #include "raster/undo.h"
 #include "sprite_wrappers.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 //////////////////////////////////////////////////////////////////////
 // ClearCommand
diff --git a/src/commands/cmd_crop.cpp b/src/commands/cmd_crop.cpp
index 25edad54f..53073256b 100644
--- a/src/commands/cmd_crop.cpp
+++ b/src/commands/cmd_crop.cpp
@@ -26,7 +26,7 @@
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "util/autocrop.h"
 #include "util/misc.h"
 #include "sprite_wrappers.h"
diff --git a/src/commands/cmd_eyedropper.cpp b/src/commands/cmd_eyedropper.cpp
index c7be57385..aad5045b7 100644
--- a/src/commands/cmd_eyedropper.cpp
+++ b/src/commands/cmd_eyedropper.cpp
@@ -28,7 +28,7 @@
 #include "modules/editors.h"
 #include "raster/sprite.h"
 #include "raster/image.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/editor.h"
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/commands/cmd_flatten_layers.cpp b/src/commands/cmd_flatten_layers.cpp
index b5f1db430..45c4ceee5 100644
--- a/src/commands/cmd_flatten_layers.cpp
+++ b/src/commands/cmd_flatten_layers.cpp
@@ -23,7 +23,7 @@
 #include "modules/gui.h"
 #include "raster/sprite.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "sprite_wrappers.h"
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/commands/cmd_new_file.cpp b/src/commands/cmd_new_file.cpp
index 5ac0e3461..310ddeae8 100644
--- a/src/commands/cmd_new_file.cpp
+++ b/src/commands/cmd_new_file.cpp
@@ -36,7 +36,7 @@
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "util/misc.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 //////////////////////////////////////////////////////////////////////
 // new_file
diff --git a/src/commands/cmd_palette_editor.cpp b/src/commands/cmd_palette_editor.cpp
index 38847b823..9960ac351 100644
--- a/src/commands/cmd_palette_editor.cpp
+++ b/src/commands/cmd_palette_editor.cpp
@@ -42,7 +42,7 @@
 #include "raster/stock.h"
 #include "raster/undo.h"
 #include "util/quantize.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colview.h"
 #include "widgets/editor.h"
 #include "widgets/paledit.h"
diff --git a/src/commands/cmd_rotate_canvas.cpp b/src/commands/cmd_rotate_canvas.cpp
index bc70f2209..5ae548411 100644
--- a/src/commands/cmd_rotate_canvas.cpp
+++ b/src/commands/cmd_rotate_canvas.cpp
@@ -33,7 +33,7 @@
 #include "raster/sprite.h"
 #include "raster/stock.h"
 #include "undoable.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "sprite_wrappers.h"
 
 //////////////////////////////////////////////////////////////////////
diff --git a/src/commands/cmd_switch_colors.cpp b/src/commands/cmd_switch_colors.cpp
index cc589dea7..6c132e56f 100644
--- a/src/commands/cmd_switch_colors.cpp
+++ b/src/commands/cmd_switch_colors.cpp
@@ -24,7 +24,7 @@
 
 #include "commands/command.h"
 #include "app.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 class SwitchColorsCommand : public Command
 {
diff --git a/src/commands/fx/cmd_replace_color.cpp b/src/commands/fx/cmd_replace_color.cpp
index 4caf8302f..5c760afaf 100644
--- a/src/commands/fx/cmd_replace_color.cpp
+++ b/src/commands/fx/cmd_replace_color.cpp
@@ -37,7 +37,7 @@
 #include "raster/mask.h"
 #include "raster/sprite.h"
 #include "util/misc.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colbut.h"
 #include "widgets/preview.h"
 #include "widgets/target.h"
diff --git a/src/core/color.cpp b/src/core/color.cpp
index ee2067d69..711ac20b1 100644
--- a/src/core/color.cpp
+++ b/src/core/color.cpp
@@ -32,7 +32,7 @@
 #include "raster/layer.h"
 #include "raster/palette.h"
 #include "raster/sprite.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 /* #define GET_COLOR_TYPE(color)	((ase_uint32)((color).coltype)) */
 /* #define GET_COLOR_DATA(color)	((ase_uint32)((color).imgcolor)) */
diff --git a/src/dialogs/drawtext.cpp b/src/dialogs/drawtext.cpp
index 6423506af..ea69cdaef 100644
--- a/src/dialogs/drawtext.cpp
+++ b/src/dialogs/drawtext.cpp
@@ -36,7 +36,7 @@
 #include "resource_finder.h"
 #include "util/clipboard.h"
 #include "util/misc.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colbut.h"
 
 static JWidget font_button;
diff --git a/src/dialogs/maskcol.cpp b/src/dialogs/maskcol.cpp
index 74646b941..2ee91cfe1 100644
--- a/src/dialogs/maskcol.cpp
+++ b/src/dialogs/maskcol.cpp
@@ -38,7 +38,7 @@
 #include "raster/sprite.h"
 #include "raster/undo.h"
 #include "util/misc.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colbut.h"
 
 static ColorButton* button_color;
diff --git a/src/settings/ui_settings_impl.cpp b/src/settings/ui_settings_impl.cpp
index a640e4f69..f8f1d0925 100644
--- a/src/settings/ui_settings_impl.cpp
+++ b/src/settings/ui_settings_impl.cpp
@@ -27,7 +27,7 @@
 #include "ui_context.h"
 #include "tools/tool.h"
 #include "tools/toolbox.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 
 //////////////////////////////////////////////////////////////////////
 // UISettingsImpl
diff --git a/src/util/clipboard.cpp b/src/util/clipboard.cpp
index bfd9dc383..f62c57f86 100644
--- a/src/util/clipboard.cpp
+++ b/src/util/clipboard.cpp
@@ -45,7 +45,7 @@
 #include "undoable.h"
 #include "util/clipboard.h"
 #include "util/misc.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/statebar.h"
 
 #if defined ALLEGRO_WINDOWS
diff --git a/src/widgets/colbut.cpp b/src/widgets/colbut.cpp
index 38c8da7c2..973351394 100644
--- a/src/widgets/colbut.cpp
+++ b/src/widgets/colbut.cpp
@@ -27,7 +27,7 @@
 #include "modules/gfx.h"
 #include "modules/gui.h"
 #include "raster/sprite.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colbut.h"
 #include "widgets/colsel.h"
 #include "widgets/editor.h"
diff --git a/src/widgets/colbar.cpp b/src/widgets/color_bar.cpp
similarity index 99%
rename from src/widgets/colbar.cpp
rename to src/widgets/color_bar.cpp
index 44f0cea22..bfd683efc 100644
--- a/src/widgets/colbar.cpp
+++ b/src/widgets/color_bar.cpp
@@ -39,7 +39,7 @@
 #include "raster/palette.h"
 #include "raster/sprite.h"
 #include "raster/undo.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/colsel.h"
 #include "widgets/paledit.h"
 #include "widgets/statebar.h"
diff --git a/src/widgets/colbar.h b/src/widgets/color_bar.h
similarity index 96%
rename from src/widgets/colbar.h
rename to src/widgets/color_bar.h
index ef7e188ce..8fab10dfa 100644
--- a/src/widgets/colbar.h
+++ b/src/widgets/color_bar.h
@@ -16,8 +16,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef WIDGETS_COLBAR_H_INCLUDED
-#define WIDGETS_COLBAR_H_INCLUDED
+#ifndef WIDGETS_COLOR_BAR_H_INCLUDED
+#define WIDGETS_COLOR_BAR_H_INCLUDED
 
 #include "Vaca/Signal.h"
 #include "jinete/jwidget.h"
diff --git a/src/widgets/editor/editor.cpp b/src/widgets/editor/editor.cpp
index 88670bde0..c27bfe82e 100644
--- a/src/widgets/editor/editor.cpp
+++ b/src/widgets/editor/editor.cpp
@@ -43,7 +43,7 @@
 #include "util/misc.h"
 #include "util/recscr.h"
 #include "util/render.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/editor.h"
 #include "widgets/editor/pixels_movement.h"
 #include "widgets/statebar.h"
diff --git a/src/widgets/editor/keys.cpp b/src/widgets/editor/keys.cpp
index 82e616e59..49a8bcb53 100644
--- a/src/widgets/editor/keys.cpp
+++ b/src/widgets/editor/keys.cpp
@@ -33,7 +33,7 @@
 #include "raster/sprite.h"
 #include "settings/settings.h"
 #include "ui_context.h"
-#include "widgets/colbar.h"
+#include "widgets/color_bar.h"
 #include "widgets/editor.h"
 
 bool Editor::editor_keys_toset_zoom(int scancode)