diff --git a/data/jids/colcurv.jid b/data/jids/colcurv.jid
deleted file mode 100644
index 59a64a106..000000000
--- a/data/jids/colcurv.jid
+++ /dev/null
@@ -1,17 +0,0 @@
-<!-- ASE - Allegro Sprite Editor -->
-<!-- Copyright (C) 2001-2009 by David Capello -->
-<jinete>
-<window text="Color Curve" name="color_curve">
-  <box vertical="true">
-    <box horizontal="true" expansive="true">
-      <view expansive="true" name="curve" /><!-- custom widget -->
-      <box vertical="true">
-        <button text="&amp;OK" name="button_ok" magnetic="true" />
-        <button text="&amp;Cancel" />
-        <box name="target" />
-        <check text="&amp;Preview" name="preview" />
-      </box>
-    </box>
-  </box>
-</window>
-</jinete>
diff --git a/data/jids/advanced.jid b/data/widgets/advanced_mode.xml
similarity index 100%
rename from data/jids/advanced.jid
rename to data/widgets/advanced_mode.xml
diff --git a/data/jids/canvas.jid b/data/widgets/canvas_size.xml
similarity index 100%
rename from data/jids/canvas.jid
rename to data/widgets/canvas_size.xml
diff --git a/data/jids/celprop.jid b/data/widgets/cel_properties.xml
similarity index 100%
rename from data/jids/celprop.jid
rename to data/widgets/cel_properties.xml
diff --git a/data/jids/pntprop.jid b/data/widgets/color_curve.xml
similarity index 59%
rename from data/jids/pntprop.jid
rename to data/widgets/color_curve.xml
index 9f342c95a..f95149323 100644
--- a/data/jids/pntprop.jid
+++ b/data/widgets/color_curve.xml
@@ -1,6 +1,19 @@
 <!-- ASE - Allegro Sprite Editor -->
 <!-- Copyright (C) 2001-2009 by David Capello -->
 <jinete>
+<window text="Color Curve" name="color_curve">
+  <box vertical="true">
+    <box horizontal="true" expansive="true">
+      <view expansive="true" name="curve" /><!-- custom widget -->
+      <box vertical="true">
+        <button text="&amp;OK" name="button_ok" magnetic="true" />
+        <button text="&amp;Cancel" />
+        <box name="target" />
+        <check text="&amp;Preview" name="preview" />
+      </box>
+    </box>
+  </box>
+</window>
 <window text="Point Properties" name="point_properties">
   <box vertical="true">
     <box horizontal="true" expansive="true">
diff --git a/data/jids/confscr.jid b/data/widgets/configure_screen.xml
similarity index 100%
rename from data/jids/confscr.jid
rename to data/widgets/configure_screen.xml
diff --git a/data/jids/convmatr.jid b/data/widgets/convolution_matrix.xml
similarity index 100%
rename from data/jids/convmatr.jid
rename to data/widgets/convolution_matrix.xml
diff --git a/data/jids/drawtext.jid b/data/widgets/draw_text.xml
similarity index 100%
rename from data/jids/drawtext.jid
rename to data/widgets/draw_text.xml
diff --git a/data/jids/dupspr.jid b/data/widgets/duplicate_sprite.xml
similarity index 100%
rename from data/jids/dupspr.jid
rename to data/widgets/duplicate_sprite.xml
diff --git a/data/jids/filesel.jid b/data/widgets/file_selector.xml
similarity index 100%
rename from data/jids/filesel.jid
rename to data/widgets/file_selector.xml
diff --git a/data/jids/frlen.jid b/data/widgets/frame_duration.xml
similarity index 100%
rename from data/jids/frlen.jid
rename to data/widgets/frame_duration.xml
diff --git a/data/jids/invrtcol.jid b/data/widgets/invert_color.xml
similarity index 100%
rename from data/jids/invrtcol.jid
rename to data/widgets/invert_color.xml
diff --git a/data/jids/jpeg_options.jid b/data/widgets/jpeg_options.xml
similarity index 100%
rename from data/jids/jpeg_options.jid
rename to data/widgets/jpeg_options.xml
diff --git a/data/jids/main.jid b/data/widgets/main_window.xml
similarity index 100%
rename from data/jids/main.jid
rename to data/widgets/main_window.xml
diff --git a/data/jids/median.jid b/data/widgets/median_blur.xml
similarity index 100%
rename from data/jids/median.jid
rename to data/widgets/median_blur.xml
diff --git a/data/jids/newlay.jid b/data/widgets/new_layer.xml
similarity index 100%
rename from data/jids/newlay.jid
rename to data/widgets/new_layer.xml
diff --git a/data/jids/newspr.jid b/data/widgets/new_sprite.xml
similarity index 100%
rename from data/jids/newspr.jid
rename to data/widgets/new_sprite.xml
diff --git a/data/jids/options.jid b/data/widgets/options.xml
similarity index 100%
rename from data/jids/options.jid
rename to data/widgets/options.xml
diff --git a/data/jids/paledit.jid b/data/widgets/palette_editor.xml
similarity index 100%
rename from data/jids/paledit.jid
rename to data/widgets/palette_editor.xml
diff --git a/data/jids/playfli.jid b/data/widgets/play_flic.xml
similarity index 100%
rename from data/jids/playfli.jid
rename to data/widgets/play_flic.xml
diff --git a/data/jids/replcol.jid b/data/widgets/replace_color.xml
similarity index 100%
rename from data/jids/replcol.jid
rename to data/widgets/replace_color.xml
diff --git a/data/jids/sprprop.jid b/data/widgets/sprite_properties.xml
similarity index 100%
rename from data/jids/sprprop.jid
rename to data/widgets/sprite_properties.xml
diff --git a/data/jids/sprsize.jid b/data/widgets/sprite_size.xml
similarity index 100%
rename from data/jids/sprsize.jid
rename to data/widgets/sprite_size.xml
diff --git a/data/jids/toolconf.jid b/data/widgets/tools_configuration.xml
similarity index 100%
rename from data/jids/toolconf.jid
rename to data/widgets/tools_configuration.xml
diff --git a/src/app.cpp b/src/app.cpp
index ca608e782..0b01b7d4b 100644
--- a/src/app.cpp
+++ b/src/app.cpp
@@ -157,12 +157,7 @@ int App::run()
     jmanager_refresh_screen();
 
     // load main window
-    top_window = static_cast<Frame*>(load_widget("main.jid", "main_window"));
-    if (!top_window) {
-      allegro_message("Error loading data data/jids/main.jid file.\n"
-		      "You have to reinstall the program.\n");
-      return 1;
-    }
+    top_window = static_cast<Frame*>(load_widget("main_window.xml", "main_window"));
 
     box_menubar = jwidget_find_name(top_window, "menubar");
     box_editors = jwidget_find_name(top_window, "editor");
diff --git a/src/commands/cmd_advanced_mode.cpp b/src/commands/cmd_advanced_mode.cpp
index fbac00ddf..e8eca5d3f 100644
--- a/src/commands/cmd_advanced_mode.cpp
+++ b/src/commands/cmd_advanced_mode.cpp
@@ -78,7 +78,7 @@ void AdvancedModeCommand::execute(Context* context)
       char key[1024];
       char buf[1024];
 
-      FramePtr window(load_widget("advanced.jid", "advanced_mode_warning"));
+      FramePtr window(load_widget("advanced_mode.xml", "advanced_mode_warning"));
       Widget* warning_label = find_widget(window, "warning_label");
       Widget* donot_show = find_widget(window, "donot_show");
 
diff --git a/src/commands/cmd_canvas_size.cpp b/src/commands/cmd_canvas_size.cpp
index 12b48ab83..aa20f23d4 100644
--- a/src/commands/cmd_canvas_size.cpp
+++ b/src/commands/cmd_canvas_size.cpp
@@ -66,7 +66,7 @@ void CanvasSizeCommand::execute(Context* context)
     JWidget left, top, right, bottom, ok;
 
     // load the window widget
-    FramePtr window(load_widget("canvas.jid", "canvas_size"));
+    FramePtr window(load_widget("canvas_size.xml", "canvas_size"));
     get_widgets(window,
 		"left", &left,
 		"top", &top,
diff --git a/src/commands/cmd_cel_properties.cpp b/src/commands/cmd_cel_properties.cpp
index 831caf106..9d6856d78 100644
--- a/src/commands/cmd_cel_properties.cpp
+++ b/src/commands/cmd_cel_properties.cpp
@@ -74,7 +74,7 @@ void CelPropertiesCommand::execute(Context* context)
   // Get current cel (can be NULL)
   const Cel* cel = static_cast<const LayerImage*>(layer)->get_cel(sprite->getCurrentFrame());
 
-  FramePtr window(load_widget("celprop.jid", "cel_properties"));
+  FramePtr window(load_widget("cel_properties.xml", "cel_properties"));
   get_widgets(window,
 	      "frame", &label_frame,
 	      "pos", &label_pos,
diff --git a/src/commands/cmd_configure_screen.cpp b/src/commands/cmd_configure_screen.cpp
index fefa51f81..8003497f1 100644
--- a/src/commands/cmd_configure_screen.cpp
+++ b/src/commands/cmd_configure_screen.cpp
@@ -95,7 +95,7 @@ void ConfigureScreen::show_dialog(Context* context)
 {
   JWidget resolution, color_depth, pixel_scale, fullscreen;
 
-  FramePtr window(load_widget("confscr.jid", "configure_screen"));
+  FramePtr window(load_widget("configure_screen.xml", "configure_screen"));
   get_widgets(window,
 	      "resolution", &resolution,
 	      "color_depth", &color_depth,
diff --git a/src/commands/cmd_configure_tools.cpp b/src/commands/cmd_configure_tools.cpp
index 42de73990..ef7367e16 100644
--- a/src/commands/cmd_configure_tools.cpp
+++ b/src/commands/cmd_configure_tools.cpp
@@ -148,7 +148,7 @@ void ConfigureTools::execute(Context* context)
   bool first_time = false;
 
   if (!window) {
-    window = static_cast<Frame*>(load_widget("toolconf.jid", "configure_tool"));
+    window = static_cast<Frame*>(load_widget("tools_configuration.xml", "configure_tool"));
     first_time = true;
   }
   /* if the window is opened, close it */
diff --git a/src/commands/cmd_duplicate_sprite.cpp b/src/commands/cmd_duplicate_sprite.cpp
index 7bebc62af..b699b960e 100644
--- a/src/commands/cmd_duplicate_sprite.cpp
+++ b/src/commands/cmd_duplicate_sprite.cpp
@@ -65,7 +65,7 @@ void DuplicateSpriteCommand::execute(Context* context)
   char buf[1024];
 
   /* load the window widget */
-  FramePtr window(load_widget("dupspr.jid", "duplicate_sprite"));
+  FramePtr window(load_widget("duplicate_sprite.xml", "duplicate_sprite"));
 
   src_name = jwidget_find_name(window, "src_name");
   dst_name = jwidget_find_name(window, "dst_name");
diff --git a/src/commands/cmd_frame_properties.cpp b/src/commands/cmd_frame_properties.cpp
index 1bc7a5806..0c1225947 100644
--- a/src/commands/cmd_frame_properties.cpp
+++ b/src/commands/cmd_frame_properties.cpp
@@ -69,7 +69,7 @@ void dialogs_frame_length(const SpriteReader& sprite, int sprite_frame)
   JWidget frame, frlen, ok;
   char buf[64];
 
-  FramePtr window(load_widget("frlen.jid", "frame_duration"));
+  FramePtr window(load_widget("frame_duration.xml", "frame_duration"));
   get_widgets(window,
 	      "frame", &frame,
 	      "frlen", &frlen,
diff --git a/src/commands/cmd_new_file.cpp b/src/commands/cmd_new_file.cpp
index 0f4de5a06..083ea844f 100644
--- a/src/commands/cmd_new_file.cpp
+++ b/src/commands/cmd_new_file.cpp
@@ -83,7 +83,7 @@ void NewFileCommand::execute(Context* context)
   int ncolors = 256;
 
   // Load the window widget
-  FramePtr window(load_widget("newspr.jid", "new_sprite"));
+  FramePtr window(load_widget("new_sprite.xml", "new_sprite"));
 
   width = jwidget_find_name(window, "width");
   height = jwidget_find_name(window, "height");
diff --git a/src/commands/cmd_new_layer.cpp b/src/commands/cmd_new_layer.cpp
index 6f7663c30..ee67c2206 100644
--- a/src/commands/cmd_new_layer.cpp
+++ b/src/commands/cmd_new_layer.cpp
@@ -90,7 +90,7 @@ void NewLayerCommand::execute(Context* context)
   // If params specify to ask the user about the name...
   if (m_ask) {
     // We open the window to ask the name
-    FramePtr window(load_widget("newlay.jid", "new_layer"));
+    FramePtr window(load_widget("new_layer.xml", "new_layer"));
     JWidget name_widget = find_widget(window, "name");
     name_widget->setText(name.c_str());
     jwidget_set_min_size(name_widget, 128, 0);
diff --git a/src/commands/cmd_new_layer_set.cpp b/src/commands/cmd_new_layer_set.cpp
index daf4b280b..62d12e182 100644
--- a/src/commands/cmd_new_layer_set.cpp
+++ b/src/commands/cmd_new_layer_set.cpp
@@ -60,7 +60,7 @@ void NewLayerSetCommand::execute(Context* context)
   CurrentSpriteWriter sprite(context);
 
   // load the window widget
-  FramePtr window(load_widget("newlay.jid", "new_layer_set"));
+  FramePtr window(load_widget("new_layer.xml", "new_layer_set"));
 
   window->open_window_fg();
 
diff --git a/src/commands/cmd_palette_editor.cpp b/src/commands/cmd_palette_editor.cpp
index eb61d6584..3e3762b2a 100644
--- a/src/commands/cmd_palette_editor.cpp
+++ b/src/commands/cmd_palette_editor.cpp
@@ -108,7 +108,7 @@ void PaletteEditorCommand::execute(Context* context)
   }
 
   /* load widgets */
-  FramePtr window(load_widget("paledit.jid", "palette_editor"));
+  FramePtr window(load_widget("palette_editor.xml", "palette_editor"));
   get_widgets(window,
 	      "red", &slider_R,
 	      "green", &slider_G,
diff --git a/src/commands/cmd_sprite_properties.cpp b/src/commands/cmd_sprite_properties.cpp
index 18154ae71..dc5a214b2 100644
--- a/src/commands/cmd_sprite_properties.cpp
+++ b/src/commands/cmd_sprite_properties.cpp
@@ -70,7 +70,7 @@ void SpritePropertiesCommand::execute(Context* context)
   char buf[256];
 
   /* load the window widget */
-  FramePtr window(load_widget("sprprop.jid", "sprite_properties"));
+  FramePtr window(load_widget("sprite_properties.xml", "sprite_properties"));
   get_widgets(window,
 	      "name", &name,
 	      "type", &type,
diff --git a/src/commands/cmd_sprite_size.cpp b/src/commands/cmd_sprite_size.cpp
index d87a51841..5d2d9fe19 100644
--- a/src/commands/cmd_sprite_size.cpp
+++ b/src/commands/cmd_sprite_size.cpp
@@ -187,7 +187,7 @@ void SpriteSizeCommand::execute(Context* context)
   const CurrentSpriteReader sprite(context);
 
   // load the window widget
-  FramePtr window(load_widget("sprsize.jid", "sprite_size"));
+  FramePtr window(load_widget("sprite_size.xml", "sprite_size"));
   get_widgets(window,
 	      "width_px", &width_px,
 	      "height_px", &height_px,
diff --git a/src/commands/fx/cmd_color_curve.cpp b/src/commands/fx/cmd_color_curve.cpp
index ac01c6b31..d0ad79707 100644
--- a/src/commands/fx/cmd_color_curve.cpp
+++ b/src/commands/fx/cmd_color_curve.cpp
@@ -94,7 +94,7 @@ void ColorCurveCommand::execute(Context* context)
     App::instance()->Exit.connect(&on_exit_delete_curve);
   }
 
-  FramePtr window(load_widget("colcurv.jid", "color_curve"));
+  FramePtr window(load_widget("color_curve.xml", "color_curve"));
   get_widgets(window,
 	      "preview", &check_preview,
 	      "button_ok", &button_ok,
diff --git a/src/commands/fx/cmd_convolution_matrix.cpp b/src/commands/fx/cmd_convolution_matrix.cpp
index 2810eec25..ff553f742 100644
--- a/src/commands/fx/cmd_convolution_matrix.cpp
+++ b/src/commands/fx/cmd_convolution_matrix.cpp
@@ -102,7 +102,7 @@ void ConvolutionMatrixCommand::execute(Context* context)
   JWidget box_target;
   JWidget reload, generate;
 
-  FramePtr window(load_widget("convmatr.jid", "convolution_matrix"));
+  FramePtr window(load_widget("convolution_matrix.xml", "convolution_matrix"));
   get_widgets(window,
 	      "preview", &check_preview,
 	      "tiled", &check_tiled,
@@ -241,7 +241,7 @@ static bool generate_select_hook(JWidget widget, void *data)
   JWidget div, div_auto;
   JWidget bias, bias_auto;
 
-  JWidgetPtr window(load_widget("convmatr.jid", "generate_convolution_matrix"));
+  JWidgetPtr window(load_widget("convolution_matrix.xml", "generate_convolution_matrix"));
   get_widgets(window,
 	      "view_x", &view_x,
 	      "view_y", &view_y,
diff --git a/src/commands/fx/cmd_despeckle.cpp b/src/commands/fx/cmd_despeckle.cpp
index 2d1f66277..e1d6431a7 100644
--- a/src/commands/fx/cmd_despeckle.cpp
+++ b/src/commands/fx/cmd_despeckle.cpp
@@ -87,7 +87,7 @@ void DespeckleCommand::execute(Context* context)
   const CurrentSpriteReader sprite(context);
   JWidget box_target, target_button, button_ok;
 
-  FramePtr window(load_widget("median.jid", "median"));
+  FramePtr window(load_widget("median_blur.xml", "median"));
   get_widgets(window,
 	      "width", &entry_width,
 	      "height", &entry_height,
diff --git a/src/commands/fx/cmd_invert_color.cpp b/src/commands/fx/cmd_invert_color.cpp
index 8a20fb116..31d36189b 100644
--- a/src/commands/fx/cmd_invert_color.cpp
+++ b/src/commands/fx/cmd_invert_color.cpp
@@ -81,7 +81,7 @@ void InvertColorCommand::execute(Context* context)
   const CurrentSpriteReader sprite(context);
   JWidget box_target, target_button, button_ok;
 
-  FramePtr window(load_widget("invrtcol.jid", "invert_color"));
+  FramePtr window(load_widget("invert_color.xml", "invert_color"));
   get_widgets(window,
 	      "target", &box_target,
 	      "preview", &check_preview,
diff --git a/src/commands/fx/cmd_replace_color.cpp b/src/commands/fx/cmd_replace_color.cpp
index 5d82f16e7..3e26e7bc3 100644
--- a/src/commands/fx/cmd_replace_color.cpp
+++ b/src/commands/fx/cmd_replace_color.cpp
@@ -86,7 +86,7 @@ void ReplaceColorCommand::execute(Context* context)
   JWidget box_target, target_button;
   JWidget button_ok;
 
-  FramePtr window(load_widget("replcol.jid", "replace_color"));
+  FramePtr window(load_widget("replace_color.xml", "replace_color"));
   get_widgets(window,
 	      "color_buttons_box", &color_buttons_box,
 	      "preview", &check_preview,
diff --git a/src/dialogs/drawtext.cpp b/src/dialogs/drawtext.cpp
index 5157e7d27..3805b5d8e 100644
--- a/src/dialogs/drawtext.cpp
+++ b/src/dialogs/drawtext.cpp
@@ -62,7 +62,7 @@ void dialogs_draw_text(Sprite* sprite)
   if (!dest_image)
     return;
 
-  JWidgetPtr window = load_widget("drawtext.jid", "drawtext_window");
+  JWidgetPtr window = load_widget("draw_text.xml", "drawtext_window");
 
   if (!get_widgets(window,
 		   "font", &font_button,
diff --git a/src/dialogs/filesel.cpp b/src/dialogs/filesel.cpp
index da1bce000..d5082b24a 100644
--- a/src/dialogs/filesel.cpp
+++ b/src/dialogs/filesel.cpp
@@ -139,7 +139,7 @@ jstring ase_file_selector(const jstring& message,
 
   if (!window) {
     // load the window widget
-    window = static_cast<Frame*>(load_widget("filesel.jid", "file_selector"));
+    window = static_cast<Frame*>(load_widget("file_selector.xml", "file_selector"));
 
     JWidget box = jwidget_find_name(window, "box");
     JWidget goback = jwidget_find_name(window, "goback");
diff --git a/src/dialogs/options.cpp b/src/dialogs/options.cpp
index 1102a6ace..d9d4dfd9f 100644
--- a/src/dialogs/options.cpp
+++ b/src/dialogs/options.cpp
@@ -59,7 +59,7 @@ void dialogs_options()
   old_y = y;
 
   /* load the window widget */
-  FramePtr window(load_widget("options.jid", "options"));
+  FramePtr window(load_widget("options.xml", "options"));
   get_widgets(window,
 	      "mouse_x", &slider_x,
 	      "mouse_y", &slider_y,
diff --git a/src/file/jpeg_format.cpp b/src/file/jpeg_format.cpp
index 904dbd323..3e7525fc2 100644
--- a/src/file/jpeg_format.cpp
+++ b/src/file/jpeg_format.cpp
@@ -360,7 +360,7 @@ static FormatOptions *get_options_JPEG(FileOp *fop)
       return (FormatOptions*)jpeg_options;
 
     /* widgets */
-    FramePtr window(load_widget("jpeg_options.jid", "jpeg_options"));
+    FramePtr window(load_widget("jpeg_options.xml", "jpeg_options"));
     JWidget slider_quality, ok;
     get_widgets(window,
 		"quality", &slider_quality,
diff --git a/src/modules/gui.cpp b/src/modules/gui.cpp
index 4311bc88c..11e3a3f13 100644
--- a/src/modules/gui.cpp
+++ b/src/modules/gui.cpp
@@ -667,7 +667,7 @@ JWidget load_widget(const char *filename, const char *name)
 
   dirs = dirs_new();
 
-  usprintf(buf, "jids/%s", filename);
+  usprintf(buf, "widgets/%s", filename);
 
   dirs_add_path(dirs, filename);
   dirs_cat_dirs(dirs, filename_in_datadir(buf));
diff --git a/src/widgets/curvedit.cpp b/src/widgets/curvedit.cpp
index 4edd769ec..a22926522 100644
--- a/src/widgets/curvedit.cpp
+++ b/src/widgets/curvedit.cpp
@@ -475,7 +475,7 @@ static int edit_node_manual(CurvePoint* point)
   CurvePoint point_copy = *point;
   int res;
 
-  FramePtr window(load_widget("pntprop.jid", "point_properties"));
+  FramePtr window(load_widget("color_curve.xml", "point_properties"));
 
   entry_x = jwidget_find_name(window, "x");
   entry_y = jwidget_find_name(window, "y");