Fixed up includes in sigmodrwidgets for script and fraction move

19 files changed, 80 insertions, 82 deletions

diff --git a/sigmodr/widgets/gui/ability.ui b/sigmodr/widgets/gui/ability.ui
index 3b594491..7441aa8c 100644
--- a/sigmodr/widgets/gui/ability.ui
+++ b/sigmodr/widgets/gui/ability.ui
@@ -93,7 +93,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varBattleScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varBattleScript" >
         <property name="toolTip" >
          <string>The script used for the ability in the battle</string>
         </property>
@@ -115,7 +115,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varWorldScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varWorldScript" >
         <property name="toolTip" >
          <string>The script used for the ability on the world map</string>
         </property>
@@ -137,7 +137,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varPriorityScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varPriorityScript" >
         <property name="toolTip" >
          <string>The script used to determine if the ability should modify its priority depending on the environment</string>
         </property>
@@ -166,9 +166,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/badge.ui b/sigmodr/widgets/gui/badge.ui
index 5436c58c..6d48a459 100644
--- a/sigmodr/widgets/gui/badge.ui
+++ b/sigmodr/widgets/gui/badge.ui
@@ -141,7 +141,7 @@
        </widget>
       </item>
       <item row="0" column="1" >
-       <widget class="Sigmodr::Widgets::FractionWidget" name="varStatMultiplier" >
+       <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varStatMultiplier" >
         <property name="toolTip" >
          <string>Stat multiplier for the stat</string>
         </property>
@@ -152,7 +152,7 @@
          <string>Stat multiplier for the stat</string>
         </property>
         <property name="behavior" >
-         <enum>Sigmodr::Widgets::FractionWidget::Improper</enum>
+         <enum>Sigmodr::CoreWidgets::FractionWidget::Improper</enum>
         </property>
        </widget>
       </item>
@@ -191,9 +191,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::FractionWidget</class>
+   <class>Sigmodr::CoreWidgets::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/coinlist.ui b/sigmodr/widgets/gui/coinlist.ui
index 566d8d17..3beeff80 100644
--- a/sigmodr/widgets/gui/coinlist.ui
+++ b/sigmodr/widgets/gui/coinlist.ui
@@ -38,7 +38,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" >
         <property name="toolTip" >
          <string>The script used to control how the coin list is handled</string>
         </property>
@@ -62,9 +62,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/game.ui b/sigmodr/widgets/gui/game.ui
index 9bdc7987..2001c857 100644
--- a/sigmodr/widgets/gui/game.ui
+++ b/sigmodr/widgets/gui/game.ui
@@ -132,7 +132,7 @@
          </property>
          <layout class="QGridLayout" >
           <item row="0" column="0" >
-           <widget class="Sigmodr::Widgets::ScriptWidget" name="varStartScript" >
+           <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varStartScript" >
             <property name="toolTip" >
              <string>The script that is executed when the sigmod begins</string>
             </property>
@@ -197,7 +197,7 @@
         </widget>
        </item>
        <item row="2" column="1" >
-        <widget class="Sigmodr::Widgets::FractionWidget" name="varEffectiveness" >
+        <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varEffectiveness" >
          <property name="toolTip" >
           <string>Multiplier for attacks of the attacking type against the defending type</string>
          </property>
@@ -208,7 +208,7 @@
           <string>Multiplier for attacks of the attacking type against the defending type</string>
          </property>
          <property name="behavior" >
-          <enum>Sigmodr::Widgets::FractionWidget::Any</enum>
+          <enum>Sigmodr::CoreWidgets::FractionWidget::Any</enum>
          </property>
         </widget>
        </item>
@@ -241,14 +241,14 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::FractionWidget</class>
+   <class>Sigmodr::CoreWidgets::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/FractionWidget.h</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/globalscript.ui b/sigmodr/widgets/gui/globalscript.ui
index cf551d07..deb3e56d 100644
--- a/sigmodr/widgets/gui/globalscript.ui
+++ b/sigmodr/widgets/gui/globalscript.ui
@@ -38,7 +38,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" >
         <property name="toolTip" >
          <string>The script</string>
         </property>
@@ -62,9 +62,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/item.ui b/sigmodr/widgets/gui/item.ui
index 415c8a73..3503b422 100644
--- a/sigmodr/widgets/gui/item.ui
+++ b/sigmodr/widgets/gui/item.ui
@@ -225,7 +225,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" >
         <property name="toolTip" >
          <string>The script that determines how the item works</string>
         </property>
@@ -259,9 +259,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/mapeffect.ui b/sigmodr/widgets/gui/mapeffect.ui
index bd8cee1c..f3ba9699 100644
--- a/sigmodr/widgets/gui/mapeffect.ui
+++ b/sigmodr/widgets/gui/mapeffect.ui
@@ -93,7 +93,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" >
         <property name="toolTip" >
          <string>The script for the effect</string>
         </property>
@@ -122,9 +122,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/maptrainer.ui b/sigmodr/widgets/gui/maptrainer.ui
index 8ae027d8..155aace1 100644
--- a/sigmodr/widgets/gui/maptrainer.ui
+++ b/sigmodr/widgets/gui/maptrainer.ui
@@ -118,7 +118,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" >
         <property name="toolTip" >
          <string>The script for the trainer</string>
         </property>
@@ -157,9 +157,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/mapwarp.ui b/sigmodr/widgets/gui/mapwarp.ui
index 7aedbc15..6c39dd66 100644
--- a/sigmodr/widgets/gui/mapwarp.ui
+++ b/sigmodr/widgets/gui/mapwarp.ui
@@ -138,7 +138,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" >
         <property name="toolTip" >
          <string>The script that is executed when the warp is activated</string>
         </property>
@@ -167,9 +167,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/move.ui b/sigmodr/widgets/gui/move.ui
index 877f2f9c..ed091d83 100644
--- a/sigmodr/widgets/gui/move.ui
+++ b/sigmodr/widgets/gui/move.ui
@@ -100,7 +100,7 @@
     </widget>
    </item>
    <item row="3" column="1" >
-    <widget class="Sigmodr::Widgets::FractionWidget" name="varAccuracy" >
+    <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varAccuracy" >
      <property name="toolTip" >
       <string>The chance that the move hits</string>
      </property>
@@ -111,7 +111,7 @@
       <string>The chance that the move hits</string>
      </property>
      <property name="behavior" >
-      <enum>Sigmodr::Widgets::FractionWidget::NonZero</enum>
+      <enum>Sigmodr::CoreWidgets::FractionWidget::NonZero</enum>
      </property>
     </widget>
    </item>
@@ -235,7 +235,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varBattleScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varBattleScript" >
         <property name="toolTip" >
          <string>Script that controls the move when used in battle</string>
         </property>
@@ -257,7 +257,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varWorldScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varWorldScript" >
         <property name="toolTip" >
          <string>The script that controls the move when used in the overworld</string>
         </property>
@@ -279,7 +279,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varPriorityScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varPriorityScript" >
         <property name="toolTip" >
          <string>The script used to determine if the move should modify its priority depending on the environment</string>
         </property>
@@ -313,14 +313,14 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::FractionWidget</class>
+   <class>Sigmodr::CoreWidgets::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/FractionWidget.h</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/nature.ui b/sigmodr/widgets/gui/nature.ui
index d81b7144..f5fd0069 100644
--- a/sigmodr/widgets/gui/nature.ui
+++ b/sigmodr/widgets/gui/nature.ui
@@ -60,7 +60,7 @@
        </widget>
       </item>
       <item row="0" column="1" >
-       <widget class="Sigmodr::Widgets::FractionWidget" name="varStatMultiplier" >
+       <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varStatMultiplier" >
         <property name="toolTip" >
          <string>Stat multiplier for creatures with the nature</string>
         </property>
@@ -71,7 +71,7 @@
          <string>Stat multiplier for creatures with the nature</string>
         </property>
         <property name="behavior" >
-         <enum>Sigmodr::Widgets::FractionWidget::AnyButZero</enum>
+         <enum>Sigmodr::CoreWidgets::FractionWidget::AnyButZero</enum>
         </property>
        </widget>
       </item>
@@ -134,9 +134,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::FractionWidget</class>
+   <class>Sigmodr::CoreWidgets::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/skin.ui b/sigmodr/widgets/gui/skin.ui
index 1a8baa8c..fdad07ae 100644
--- a/sigmodr/widgets/gui/skin.ui
+++ b/sigmodr/widgets/gui/skin.ui
@@ -38,7 +38,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" >
         <property name="toolTip" >
          <string>The script that controls the appearance skin</string>
         </property>
@@ -62,9 +62,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/species.ui b/sigmodr/widgets/gui/species.ui
index d06c0f83..7af32f6a 100644
--- a/sigmodr/widgets/gui/species.ui
+++ b/sigmodr/widgets/gui/species.ui
@@ -106,7 +106,7 @@
         </widget>
        </item>
        <item row="3" column="1" >
-        <widget class="Sigmodr::Widgets::FractionWidget" name="varRunChance" >
+        <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varRunChance" >
          <property name="toolTip" >
           <string>The chance that the species runs in a wild battle each turn</string>
          </property>
@@ -117,7 +117,7 @@
           <string>The chance that the species runs in a wild battle each turn</string>
          </property>
          <property name="behavior" >
-          <enum>Sigmodr::Widgets::FractionWidget::Proper</enum>
+          <enum>Sigmodr::CoreWidgets::FractionWidget::Proper</enum>
          </property>
         </widget>
        </item>
@@ -135,7 +135,7 @@
         </widget>
        </item>
        <item row="4" column="1" >
-        <widget class="Sigmodr::Widgets::FractionWidget" name="varFleeChance" >
+        <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varFleeChance" >
          <property name="toolTip" >
           <string>Chance that the player can flee from a wild battle with this species</string>
          </property>
@@ -146,7 +146,7 @@
           <string>Chance that the player can flee from a wild battle with this species</string>
          </property>
          <property name="behavior" >
-          <enum>Sigmodr::Widgets::FractionWidget::Proper</enum>
+          <enum>Sigmodr::CoreWidgets::FractionWidget::Proper</enum>
          </property>
         </widget>
        </item>
@@ -164,7 +164,7 @@
         </widget>
        </item>
        <item row="5" column="1" >
-        <widget class="Sigmodr::Widgets::FractionWidget" name="varItemChance" >
+        <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varItemChance" >
          <property name="toolTip" >
           <string>Chance the species is carrying an item in a wild battle</string>
          </property>
@@ -175,7 +175,7 @@
           <string>Chance the species is carrying an item in a wild battle</string>
          </property>
          <property name="behavior" >
-          <enum>Sigmodr::Widgets::FractionWidget::Proper</enum>
+          <enum>Sigmodr::CoreWidgets::FractionWidget::Proper</enum>
          </property>
         </widget>
        </item>
@@ -688,7 +688,7 @@
           </widget>
          </item>
          <item row="0" column="1" >
-          <widget class="Sigmodr::Widgets::FractionWidget" name="varGenderChance" >
+          <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varGenderChance" >
            <property name="sizePolicy" >
             <sizepolicy vsizetype="Minimum" hsizetype="Expanding" >
              <horstretch>0</horstretch>
@@ -705,7 +705,7 @@
             <string>Chance of getting a female version of the species (negative is genderless)</string>
            </property>
            <property name="behavior" >
-            <enum>Sigmodr::Widgets::FractionWidget::Proper</enum>
+            <enum>Sigmodr::CoreWidgets::FractionWidget::Proper</enum>
            </property>
           </widget>
           </item>
@@ -798,7 +798,7 @@
          </property>
          <layout class="QGridLayout" >
           <item row="0" column="0" >
-           <widget class="Sigmodr::Widgets::ScriptWidget" name="varEvolution" >
+           <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varEvolution" >
             <property name="toolTip" >
              <string>The script that controls how the species evolves</string>
             </property>
@@ -1003,14 +1003,14 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::FractionWidget</class>
+   <class>Sigmodr::CoreWidgets::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/FractionWidget.h</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/status.ui b/sigmodr/widgets/gui/status.ui
index bffe8cf0..80b6180a 100644
--- a/sigmodr/widgets/gui/status.ui
+++ b/sigmodr/widgets/gui/status.ui
@@ -38,7 +38,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varBattleScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varBattleScript" >
         <property name="toolTip" >
          <string>The script that controls how the status works in battle</string>
         </property>
@@ -60,7 +60,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varWorldScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varWorldScript" >
         <property name="toolTip" >
          <string>The script that controls how the status works in the overworld</string>
         </property>
@@ -84,9 +84,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/tile.ui b/sigmodr/widgets/gui/tile.ui
index eb70a2bc..a4cc7aca 100644
--- a/sigmodr/widgets/gui/tile.ui
+++ b/sigmodr/widgets/gui/tile.ui
@@ -67,7 +67,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" >
         <property name="toolTip" >
          <string>The script that is run for this tile</string>
         </property>
@@ -91,9 +91,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/time.ui b/sigmodr/widgets/gui/time.ui
index d8e57f63..f894bdde 100644
--- a/sigmodr/widgets/gui/time.ui
+++ b/sigmodr/widgets/gui/time.ui
@@ -76,7 +76,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" >
         <property name="toolTip" >
          <string>The script that gets triggered when the time changes</string>
         </property>
@@ -100,9 +100,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/type.ui b/sigmodr/widgets/gui/type.ui
index 137bc74e..ef046220 100644
--- a/sigmodr/widgets/gui/type.ui
+++ b/sigmodr/widgets/gui/type.ui
@@ -45,7 +45,7 @@
     </widget>
    </item>
    <item row="1" column="1" >
-    <widget class="Sigmodr::Widgets::FractionWidget" name="varSTAB" >
+    <widget class="Sigmodr::CoreWidgets::FractionWidget" name="varSTAB" >
      <property name="toolTip" >
       <string>Multiplier for species with this type for using a move of this type</string>
      </property>
@@ -56,7 +56,7 @@
       <string>Multiplier for species with this type for using a move of this type</string>
      </property>
      <property name="behavior" >
-      <enum>Sigmodr::Widgets::FractionWidget::Improper</enum>
+      <enum>Sigmodr::CoreWidgets::FractionWidget::Improper</enum>
      </property>
     </widget>
    </item>
@@ -82,9 +82,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::FractionWidget</class>
+   <class>Sigmodr::CoreWidgets::FractionWidget</class>
    <extends>QWidget</extends>
-   <header>FractionWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/FractionWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/weather.ui b/sigmodr/widgets/gui/weather.ui
index 65544b21..8ecb0c98 100644
--- a/sigmodr/widgets/gui/weather.ui
+++ b/sigmodr/widgets/gui/weather.ui
@@ -38,7 +38,7 @@
      </property>
      <layout class="QGridLayout" >
       <item row="0" column="0" >
-       <widget class="Sigmodr::Widgets::ScriptWidget" name="varScript" >
+       <widget class="Sigmodr::CoreWidgets::ScriptWidget" name="varScript" >
         <property name="toolTip" >
          <string>The script that controls the effects of the weather</string>
         </property>
@@ -62,9 +62,9 @@
    <header location="global" >KLineEdit</header>
   </customwidget>
   <customwidget>
-   <class>Sigmodr::Widgets::ScriptWidget</class>
+   <class>Sigmodr::CoreWidgets::ScriptWidget</class>
    <extends>QWidget</extends>
-   <header>ScriptWidget.h</header>
+   <header location="global" >sigmodr/corewidgets/ScriptWidget.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>
diff --git a/sigmodr/widgets/gui/widgetsui.qrc b/sigmodr/widgets/gui/widgetsui.qrc
index f94eafea..02a9cc2c 100644
--- a/sigmodr/widgets/gui/widgetsui.qrc
+++ b/sigmodr/widgets/gui/widgetsui.qrc
@@ -6,7 +6,6 @@
   <file>badge.ui</file>
   <file>coinlist.ui</file>
   <file>egggroup.ui</file>
-  <file>fraction.ui</file>
   <file>game.ui</file>
   <file>globalscript.ui</file>
   <file>item.ui</file>
@@ -21,7 +20,6 @@
   <file>move.ui</file>
   <file>nature.ui</file>
   <file>rules.ui</file>
-  <file>script.ui</file>
   <file>skin.ui</file>
   <file>sound.ui</file>
   <file>species.ui</file>