diff --git a/WebOSQuickInstall-4.5.0.jar b/WebOSQuickInstall-4.5.0.jar
deleted file mode 100644
index e53b107..0000000
Binary files a/WebOSQuickInstall-4.5.0.jar and /dev/null differ
diff --git a/build.xml b/build.xml
index 20f6654..eb2e791 100644
--- a/build.xml
+++ b/build.xml
@@ -51,8 +51,7 @@
       -init-macrodef-junit:     defines macro for junit execution
       -init-macrodef-debug:     defines macro for class debugging
       -init-macrodef-java:      defines macro for class execution
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
+      -do-jar:                  JAR building
       run:                      execution of project 
       -javadoc-build:           Javadoc generation
       test-report:              JUnit report generation
diff --git a/lib/appframework-1.0.3.jar b/lib/appframework-1.0.3.jar
new file mode 100644
index 0000000..6a89dfc
Binary files /dev/null and b/lib/appframework-1.0.3.jar differ
diff --git a/lib/filedrop.jar b/lib/filedrop.jar
new file mode 100644
index 0000000..36d90ca
Binary files /dev/null and b/lib/filedrop.jar differ
diff --git a/lib/json.jar b/lib/json.jar
new file mode 100644
index 0000000..2f211e3
Binary files /dev/null and b/lib/json.jar differ
diff --git a/lib/swing-layout-1.0.4.jar b/lib/swing-layout-1.0.4.jar
new file mode 100644
index 0000000..46fe3a2
Binary files /dev/null and b/lib/swing-layout-1.0.4.jar differ
diff --git a/lib/swing-worker-1.1.jar b/lib/swing-worker-1.1.jar
new file mode 100644
index 0000000..5af0bfe
Binary files /dev/null and b/lib/swing-worker-1.1.jar differ
diff --git a/lib/tar.jar b/lib/tar.jar
new file mode 100644
index 0000000..0d4def6
Binary files /dev/null and b/lib/tar.jar differ
diff --git a/lib/webOSLib-1.1.0.jar b/lib/webOSLib-1.1.0.jar
new file mode 100644
index 0000000..094f4c2
Binary files /dev/null and b/lib/webOSLib-1.1.0.jar differ
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 06722dd..2f5eb75 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -54,6 +54,7 @@ is divided into following sections:
         <property file="nbproject/project.properties"/>
     </target>
     <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
+        <property name="platform.java" value="${java.home}/bin/java"/>
         <available file="${manifest.file}" property="manifest.available"/>
         <condition property="splashscreen.available">
             <and>
@@ -71,16 +72,20 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <condition property="manifest.available+main.class">
+        <condition property="profile.available">
             <and>
-                <isset property="manifest.available"/>
-                <isset property="main.class.available"/>
+                <isset property="javac.profile"/>
+                <length length="0" string="${javac.profile}" when="greater"/>
+                <matches pattern="1\.[89](\..*)?" string="${javac.source}"/>
             </and>
         </condition>
         <condition property="do.archive">
-            <not>
-                <istrue value="${jar.archive.disabled}"/>
-            </not>
+            <or>
+                <not>
+                    <istrue value="${jar.archive.disabled}"/>
+                </not>
+                <istrue value="${not.archive.disabled}"/>
+            </or>
         </condition>
         <condition property="do.mkdist">
             <and>
@@ -91,12 +96,6 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <condition property="manifest.available+main.class+mkdist.available">
-            <and>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </and>
-        </condition>
         <condition property="do.archive+manifest.available">
             <and>
                 <isset property="manifest.available"/>
@@ -115,24 +114,12 @@ is divided into following sections:
                 <istrue value="${do.archive}"/>
             </and>
         </condition>
-        <condition property="do.archive+manifest.available+main.class">
+        <condition property="do.archive+profile.available">
             <and>
-                <istrue value="${manifest.available+main.class}"/>
+                <isset property="profile.available"/>
                 <istrue value="${do.archive}"/>
             </and>
         </condition>
-        <condition property="manifest.available-mkdist.available">
-            <or>
-                <istrue value="${manifest.available}"/>
-                <isset property="do.mkdist"/>
-            </or>
-        </condition>
-        <condition property="manifest.available+main.class-mkdist.available">
-            <or>
-                <istrue value="${manifest.available+main.class}"/>
-                <isset property="do.mkdist"/>
-            </or>
-        </condition>
         <condition property="have.tests">
             <or>
                 <available file="${test.src.dir}"/>
@@ -186,7 +173,15 @@ is divided into following sections:
         </condition>
         <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
         <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
-            <length length="0" string="${endorsed.classpath}" when="greater"/>
+            <and>
+                <isset property="endorsed.classpath"/>
+                <not>
+                    <equals arg1="${endorsed.classpath}" arg2="" trim="true"/>
+                </not>
+            </and>
+        </condition>
+        <condition else="" property="javac.profile.cmd.line.arg" value="-profile ${javac.profile}">
+            <isset property="profile.available"/>
         </condition>
         <condition else="false" property="jdkBug6558476">
             <and>
@@ -275,6 +270,7 @@ is divided into following sections:
                         <path path="@{classpath}"/>
                     </classpath>
                     <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
                     <compilerarg line="${javac.compilerargs}"/>
                     <compilerarg value="-processorpath"/>
                     <compilerarg path="@{processorpath}:${empty.dir}"/>
@@ -314,6 +310,7 @@ is divided into following sections:
                         <path path="@{classpath}"/>
                     </classpath>
                     <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
+                    <compilerarg line="${javac.profile.cmd.line.arg}"/>
                     <compilerarg line="${javac.compilerargs}"/>
                     <customize/>
                 </javac>
@@ -446,7 +443,7 @@ is divided into following sections:
                     </fileset>
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="WebOS_Quick_Install_v4" testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="WebOS_Quick_Install_v4" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -837,8 +834,8 @@ is divided into following sections:
                     </chainedmapper>
                 </pathconvert>
                 <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" classpath="${libs.CopyLibs.classpath}" name="copylibs"/>
-                <copylibs compress="${jar.compress}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
-                    <fileset dir="${build.classes.dir}"/>
+                <copylibs compress="${jar.compress}" excludeFromCopy="${copylibs.excludes}" index="${jar.index}" indexMetaInf="${jar.index.metainf}" jarfile="${dist.jar}" manifest="@{manifest}" rebase="${copylibs.rebase}" runtimeclasspath="${run.classpath.without.build.classes.dir}">
+                    <fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
                     <manifest>
                         <attribute name="Class-Path" value="${jar.classpath}"/>
                         <customize/>
@@ -850,7 +847,7 @@ is divided into following sections:
     <target name="-init-presetdef-jar">
         <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
             <jar compress="${jar.compress}" index="${jar.index}" jarfile="${dist.jar}">
-                <j2seproject1:fileset dir="${build.classes.dir}"/>
+                <j2seproject1:fileset dir="${build.classes.dir}" excludes="${dist.archive.excludes}"/>
             </jar>
         </presetdef>
     </target>
@@ -966,41 +963,25 @@ is divided into following sections:
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive" name="-do-jar-without-manifest" unless="manifest.available-mkdist.available">
-        <j2seproject1:jar/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available" name="-do-jar-with-manifest" unless="manifest.available+main.class-mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}"/>
-    </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar" if="do.archive+manifest.available+main.class" name="-do-jar-with-mainclass" unless="manifest.available+main.class+mkdist.available">
-        <j2seproject1:jar manifest="${manifest.file}">
-            <j2seproject1:manifest>
-                <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
-            </j2seproject1:manifest>
-        </j2seproject1:jar>
-        <echo level="info">To run this application from the command line without Ant, try:</echo>
-        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
-        <property location="${dist.jar}" name="dist.jar.resolved"/>
-        <pathconvert property="run.classpath.with.dist.jar">
-            <path path="${run.classpath}"/>
-            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
-        </pathconvert>
-        <echo level="info">java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
-    </target>
-    <target depends="init" if="do.archive" name="-do-jar-with-libraries-create-manifest" unless="manifest.available">
+    <target depends="init" if="do.archive" name="-do-jar-create-manifest" unless="manifest.available">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
         <touch file="${tmp.manifest.file}" verbose="false"/>
     </target>
-    <target depends="init" if="do.archive+manifest.available" name="-do-jar-with-libraries-copy-manifest">
+    <target depends="init" if="do.archive+manifest.available" name="-do-jar-copy-manifest">
         <tempfile deleteonexit="true" destdir="${build.dir}" property="tmp.manifest.file"/>
         <copy file="${manifest.file}" tofile="${tmp.manifest.file}"/>
     </target>
-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+main.class.available" name="-do-jar-with-libraries-set-main">
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+main.class.available" name="-do-jar-set-mainclass">
         <manifest file="${tmp.manifest.file}" mode="update">
             <attribute name="Main-Class" value="${main.class}"/>
         </manifest>
     </target>
-    <target depends="init,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-with-libraries-set-splashscreen">
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+profile.available" name="-do-jar-set-profile">
+        <manifest file="${tmp.manifest.file}" mode="update">
+            <attribute name="Profile" value="${javac.profile}"/>
+        </manifest>
+    </target>
+    <target depends="init,-do-jar-create-manifest,-do-jar-copy-manifest" if="do.archive+splashscreen.available" name="-do-jar-set-splashscreen">
         <basename file="${application.splash}" property="splashscreen.basename"/>
         <mkdir dir="${build.classes.dir}/META-INF"/>
         <copy failonerror="false" file="${application.splash}" todir="${build.classes.dir}/META-INF"/>
@@ -1008,23 +989,41 @@ is divided into following sections:
             <attribute name="SplashScreen-Image" value="META-INF/${splashscreen.basename}"/>
         </manifest>
     </target>
-    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen" if="do.mkdist" name="-do-jar-with-libraries-pack">
+    <target depends="init,-init-macrodef-copylibs,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.mkdist" name="-do-jar-copylibs">
         <j2seproject3:copylibs manifest="${tmp.manifest.file}"/>
         <echo level="info">To run this application from the command line without Ant, try:</echo>
         <property location="${dist.jar}" name="dist.jar.resolved"/>
         <echo level="info">java -jar "${dist.jar.resolved}"</echo>
     </target>
-    <target depends="-do-jar-with-libraries-pack" if="do.archive" name="-do-jar-with-libraries-delete-manifest">
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen" if="do.archive" name="-do-jar-jar" unless="do.mkdist">
+        <j2seproject1:jar manifest="${tmp.manifest.file}"/>
+        <property location="${build.classes.dir}" name="build.classes.dir.resolved"/>
+        <property location="${dist.jar}" name="dist.jar.resolved"/>
+        <pathconvert property="run.classpath.with.dist.jar">
+            <path path="${run.classpath}"/>
+            <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
+        </pathconvert>
+        <condition else="" property="jar.usage.message" value="To run this application from the command line without Ant, try:${line.separator}${platform.java} -cp ${run.classpath.with.dist.jar} ${main.class}">
+            <isset property="main.class.available"/>
+        </condition>
+        <condition else="debug" property="jar.usage.level" value="info">
+            <isset property="main.class.available"/>
+        </condition>
+        <echo level="${jar.usage.level}" message="${jar.usage.message}"/>
+    </target>
+    <target depends="-do-jar-copylibs" if="do.archive" name="-do-jar-delete-manifest">
         <delete>
             <fileset file="${tmp.manifest.file}"/>
         </delete>
     </target>
-    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-with-libraries-create-manifest,-do-jar-with-libraries-copy-manifest,-do-jar-with-libraries-set-main,-do-jar-with-libraries-set-splashscreen,-do-jar-with-libraries-pack,-do-jar-with-libraries-delete-manifest" name="-do-jar-with-libraries"/>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-jar,-do-jar-delete-manifest" name="-do-jar-without-libraries"/>
+    <target depends="init,compile,-pre-pre-jar,-pre-jar,-do-jar-create-manifest,-do-jar-copy-manifest,-do-jar-set-mainclass,-do-jar-set-profile,-do-jar-set-splashscreen,-do-jar-copylibs,-do-jar-delete-manifest" name="-do-jar-with-libraries"/>
     <target name="-post-jar">
         <!-- Empty placeholder for easier customization. -->
         <!-- You can override this target in the ../build.xml file. -->
     </target>
-    <target depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR." name="jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar-without-libraries,-do-jar-with-libraries,-post-jar" name="-do-jar"/>
+    <target depends="init,compile,-pre-jar,-do-jar,-post-jar" description="Build JAR." name="jar"/>
     <!--
                 =================
                 EXECUTION SECTION
@@ -1203,11 +1202,14 @@ is divided into following sections:
                 </not>
             </and>
         </condition>
-        <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+        <condition else="" property="bug5101868workaround" value="*.java">
+            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
+        </condition>
+        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>
             </classpath>
-            <fileset dir="${src.dir}" excludes="*.java,${excludes}" includes="${includes}">
+            <fileset dir="${src.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
@@ -1281,7 +1283,7 @@ is divided into following sections:
         <mkdir dir="${build.test.results.dir}"/>
     </target>
     <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
-        <j2seproject3:test testincludes="**/*Test.java"/>
+        <j2seproject3:test includes="${includes}" testincludes="**/*Test.java"/>
     </target>
     <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
         <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 3ebc1a6..6276b62 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=daa99d1c
-build.xml.script.CRC32=07fb21b2
-build.xml.stylesheet.CRC32=28e38971@1.56.1.46
+build.xml.data.CRC32=55741110
+build.xml.script.CRC32=44bd54c4
+build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=daa99d1c
-nbproject/build-impl.xml.script.CRC32=6a017077
-nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46
+nbproject/build-impl.xml.data.CRC32=55741110
+nbproject/build-impl.xml.script.CRC32=721adad8
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
new file mode 100644
index 0000000..adcebcc
--- /dev/null
+++ b/nbproject/private/private.properties
@@ -0,0 +1,4 @@
+file.reference.filedrop.jar=C:\\Users\\Jason\\NetBeans Projects\\filedrop.jar
+file.reference.json.jar=C:\\Users\\Jason\\NetBeans Projects\\json.jar
+file.reference.tar.jar=C:\\Users\\Jason\\NetBeans Projects\\tar.jar
+user.properties.file=C:\\Users\\Jason\\AppData\\Roaming\\NetBeans\\8.0.1\\build.properties
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
new file mode 100644
index 0000000..6807a2b
--- /dev/null
+++ b/nbproject/private/private.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group/>
+    </open-files>
+</project-private>
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 7a57cad..536f688 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -25,7 +25,7 @@ excludes=
 file.reference.filedrop.jar=C:\\Users\\Jason\\NetBeansProjects\\filedrop.jar
 file.reference.json.jar=C:\\Users\\Jason\\NetBeansProjects\\json.jar
 file.reference.tar.jar=C:\\Users\\Jason\\NetBeansProjects\\tar.jar
-file.reference.webOSLib.jar=C:\\Users\\Jason\\NetBeansProjects\\webOSLib.jar
+file.reference.webOSLib-1.1.0.jar=C:\\Users\\Jason\\NetBeans Projects\\webOSLib-1.1.0.jar
 includes=**
 jar.compress=false
 javac.classpath=\
@@ -34,7 +34,7 @@ javac.classpath=\
     ${file.reference.filedrop.jar}:\
     ${file.reference.tar.jar}:\
     ${file.reference.json.jar}:\
-    ${file.reference.webOSLib.jar}
+    ${file.reference.webOSLib-1.1.0.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false
@@ -62,7 +62,7 @@ jnlp.descriptor=application
 jnlp.enabled=false
 jnlp.offline-allowed=false
 jnlp.signed=false
-main.class=ca.canucksoftware.wosqi.WebOSQuickInstallApp
+main.class=ca.canuckcoding.wosqi.WebOSQuickInstallApp
 manifest.file=manifest.mf
 meta.inf.dir=${src.dir}/META-INF
 platform.active=default_platform
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 51f3106..2a4ff57 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -13,7 +13,7 @@
             </test-roots>
         </data>
         <swingapp xmlns="http://www.netbeans.org/ns/form-swingapp/1">
-            <application-class name="ca.canucksoftware.wosqi.WebOSQuickInstallApp"/>
+            <application-class name="ca.canuckcoding.wosqi.WebOSQuickInstallApp"/>
         </swingapp>
     </configuration>
 </project>
diff --git a/src/META-INF/services/org.jdesktop.application.Application b/src/META-INF/services/org.jdesktop.application.Application
index 064f9fb..981ae37 100644
--- a/src/META-INF/services/org.jdesktop.application.Application
+++ b/src/META-INF/services/org.jdesktop.application.Application
@@ -1 +1 @@
-ca.canucksoftware.wosqi.WebOSQuickInstallApp
\ No newline at end of file
+ca.canuckcoding.wosqi.WebOSQuickInstallApp
\ No newline at end of file
diff --git a/src/ca/canucksoftware/ipkg/PackageEntry.java b/src/ca/canuckcoding/ipkg/PackageEntry.java
similarity index 96%
rename from src/ca/canucksoftware/ipkg/PackageEntry.java
rename to src/ca/canuckcoding/ipkg/PackageEntry.java
index 6302b53..2f3845e 100644
--- a/src/ca/canucksoftware/ipkg/PackageEntry.java
+++ b/src/ca/canuckcoding/ipkg/PackageEntry.java
@@ -1,8 +1,8 @@
 
-package ca.canucksoftware.ipkg;
+package ca.canuckcoding.ipkg;
 
-import ca.canucksoftware.utils.OnlineFile;
-import ca.canucksoftware.webos.InstalledEntry;
+import ca.canuckcoding.utils.OnlineFile;
+import ca.canuckcoding.webos.InstalledEntry;
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.regex.Pattern;
diff --git a/src/ca/canucksoftware/ipkg/PackageFeed.java b/src/ca/canuckcoding/ipkg/PackageFeed.java
similarity index 98%
rename from src/ca/canucksoftware/ipkg/PackageFeed.java
rename to src/ca/canuckcoding/ipkg/PackageFeed.java
index 08db176..48dafaa 100644
--- a/src/ca/canucksoftware/ipkg/PackageFeed.java
+++ b/src/ca/canuckcoding/ipkg/PackageFeed.java
@@ -2,9 +2,9 @@
  * PackageFeed.java
  */
 
-package ca.canucksoftware.ipkg;
+package ca.canuckcoding.ipkg;
 
-import ca.canucksoftware.utils.OnlineFile;
+import ca.canuckcoding.utils.OnlineFile;
 import java.util.ArrayList;
 import java.io.File;
 import java.io.BufferedReader;
diff --git a/src/ca/canucksoftware/ipkg/PackageFilter.java b/src/ca/canuckcoding/ipkg/PackageFilter.java
similarity index 93%
rename from src/ca/canucksoftware/ipkg/PackageFilter.java
rename to src/ca/canuckcoding/ipkg/PackageFilter.java
index 610990c..65d54ac 100644
--- a/src/ca/canucksoftware/ipkg/PackageFilter.java
+++ b/src/ca/canuckcoding/ipkg/PackageFilter.java
@@ -1,5 +1,5 @@
 
-package ca.canucksoftware.ipkg;
+package ca.canuckcoding.ipkg;
 
 /**
  * @author Jason Robitaille
diff --git a/src/ca/canucksoftware/ipkg/PackageManager.java b/src/ca/canuckcoding/ipkg/PackageManager.java
similarity index 89%
rename from src/ca/canucksoftware/ipkg/PackageManager.java
rename to src/ca/canuckcoding/ipkg/PackageManager.java
index 461f9e5..195fd6b 100644
--- a/src/ca/canucksoftware/ipkg/PackageManager.java
+++ b/src/ca/canuckcoding/ipkg/PackageManager.java
@@ -1,9 +1,9 @@
 
-package ca.canucksoftware.ipkg;
+package ca.canuckcoding.ipkg;
 
-import ca.canucksoftware.webos.InstalledEntry;
-import ca.canucksoftware.webos.DeviceInfo;
-import ca.canucksoftware.wosqi.WebOSQuickInstallApp;
+import ca.canuckcoding.webos.InstalledEntry;
+import ca.canuckcoding.webos.DeviceInfo;
+import ca.canuckcoding.wosqi.WebOSQuickInstallApp;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.ResourceBundle;
@@ -37,16 +37,24 @@ public class PackageManager {
         label = display;
         bundle = WebOSQuickInstallApp.bundle;
         ALL_CATEGORIES = "--" + bundle.getString("ALL") + "--";
-        defaultFeeds = new String[] {
-            "http://ipkg.preware.net/feeds/precentral/Packages.gz",
-            "http://ipkg.preware.net/feeds/webos-internals/all/Packages.gz",
-            "http://ipkg.preware.net/feeds/webos-internals/" + device.arch() + "/Packages.gz",
-            "http://ipkg.preware.net/feeds/webos-patches/" + device.version() + "/Packages.gz",
-            "http://ipkg.preware.net/feeds/webos-kernels/" + device.version() + "/Packages.gz",
-            "http://www.prethemer.com/feeds/preware/themes/Packages.gz",
-            "http://ipkg.preware.net/feeds/precentral-themes/Packages.gz",
-            "http://webos-clock-themer.googlecode.com/svn/trunk/WebOS%20Clock%20Theme%20Builder/feed/Packages.gz"
-        };
+        if(info.os().toLowerCase().contains("luneos")) {
+            defaultFeeds = new String[] {
+                "http://ipkg.preware.net/feeds/precentral/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-internals/all/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-internals/" + device.arch() + "/Packages.gz"
+            };
+        } else {
+            defaultFeeds = new String[] {
+                "http://ipkg.preware.net/feeds/precentral/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-internals/all/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-internals/" + device.arch() + "/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-patches/" + device.version() + "/Packages.gz",
+                "http://ipkg.preware.net/feeds/webos-kernels/" + device.version() + "/Packages.gz",
+                "http://www.prethemer.com/feeds/preware/themes/Packages.gz",
+                "http://ipkg.preware.net/feeds/precentral-themes/Packages.gz",
+                "http://webos-clock-themer.googlecode.com/svn/trunk/WebOS%20Clock%20Theme%20Builder/feed/Packages.gz"
+            };
+        }
         Preferences prefs = Preferences.systemRoot();
         int numFeeds = prefs.getInt("numCustomFeeds", 0);
         feedStates = new boolean[defaultFeeds.length + numFeeds];
diff --git a/src/ca/canucksoftware/ipkg/PackageSorter.java b/src/ca/canuckcoding/ipkg/PackageSorter.java
similarity index 95%
rename from src/ca/canucksoftware/ipkg/PackageSorter.java
rename to src/ca/canuckcoding/ipkg/PackageSorter.java
index 5e3bed8..65eb099 100644
--- a/src/ca/canucksoftware/ipkg/PackageSorter.java
+++ b/src/ca/canuckcoding/ipkg/PackageSorter.java
@@ -1,5 +1,5 @@
 
-package ca.canucksoftware.ipkg;
+package ca.canuckcoding.ipkg;
 
 import java.util.Comparator;
 
diff --git a/src/ca/canucksoftware/utils/FileUtils.java b/src/ca/canuckcoding/utils/FileUtils.java
similarity index 98%
rename from src/ca/canucksoftware/utils/FileUtils.java
rename to src/ca/canuckcoding/utils/FileUtils.java
index 24d1b12..0a14a45 100644
--- a/src/ca/canucksoftware/utils/FileUtils.java
+++ b/src/ca/canuckcoding/utils/FileUtils.java
@@ -1,5 +1,5 @@
 
-package ca.canucksoftware.utils;
+package ca.canuckcoding.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/ca/canucksoftware/utils/MD5.java b/src/ca/canuckcoding/utils/MD5.java
similarity index 97%
rename from src/ca/canucksoftware/utils/MD5.java
rename to src/ca/canuckcoding/utils/MD5.java
index bdb7018..25ac1ad 100644
--- a/src/ca/canucksoftware/utils/MD5.java
+++ b/src/ca/canuckcoding/utils/MD5.java
@@ -1,5 +1,5 @@
 
-package ca.canucksoftware.utils;
+package ca.canuckcoding.utils;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/ca/canucksoftware/wosqi/About.form b/src/ca/canuckcoding/wosqi/About.form
similarity index 75%
rename from src/ca/canucksoftware/wosqi/About.form
rename to src/ca/canuckcoding/wosqi/About.form
index 4af91cf..5e61001 100644
--- a/src/ca/canucksoftware/wosqi/About.form
+++ b/src/ca/canuckcoding/wosqi/About.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="modal" type="boolean" value="true"/>
@@ -9,6 +9,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="formKeyPressed"/>
@@ -48,7 +49,9 @@
         <Property name="opaque" type="boolean" value="true"/>
       </Properties>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Component class="javax.swing.JButton" name="closeButton">
           <Properties>
@@ -64,7 +67,7 @@
               </FontInfo>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.closeButton.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.closeButton.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="focusable" type="boolean" value="false"/>
             <Property name="name" type="java.lang.String" value="closeButton" noResource="true"/>
@@ -73,8 +76,8 @@
             <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="closeButtonKeyTyped"/>
           </Events>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="130" y="310" width="90" height="-1" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="130" y="310" width="90" height="-1"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -87,10 +90,10 @@
             </Property>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/donate.gif"/>
+              <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/donate.gif"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="horizontalTextPosition" type="int" value="0"/>
             <Property name="name" type="java.lang.String" value="jLabel5" noResource="true"/>
@@ -101,8 +104,8 @@
             <EventHandler event="mouseMoved" listener="java.awt.event.MouseMotionListener" parameters="java.awt.event.MouseEvent" handler="jLabel5MouseMoved"/>
           </Events>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="120" width="330" height="50" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="120" width="330" height="50"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -110,13 +113,13 @@
           <Properties>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/title.png"/>
+              <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/title.png"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="0" y="0" width="350" height="60" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="0" y="0" width="350" height="60"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -128,13 +131,13 @@
               </FontInfo>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.jLabel6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.jLabel6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel6" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="20" y="200" width="310" height="110" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="20" y="200" width="310" height="110"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -147,7 +150,7 @@
             </Property>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.appVersionLabel.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.appVersionLabel.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="appVersionLabel" noResource="true"/>
           </Properties>
@@ -156,8 +159,8 @@
             <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="0"/>
           </AuxValues>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="50" width="330" height="30" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="50" width="330" height="30"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -170,13 +173,13 @@
             </Property>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel4" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="20" y="170" width="310" height="40" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="20" y="170" width="310" height="40"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -184,18 +187,21 @@
           <Properties>
             <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
               <FontInfo relative="true">
-                <Font component="jLabel2" property="font" relativeSize="true" size="3"/>
+                <Font component="jLabel2" property="font" relativeSize="true" size="1"/>
               </FontInfo>
             </Property>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="About.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="About.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
           </Properties>
+          <Events>
+            <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel2MouseClicked"/>
+          </Events>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="80" width="330" height="30" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="80" width="330" height="40"/>
             </Constraint>
           </Constraints>
         </Component>
diff --git a/src/ca/canucksoftware/wosqi/About.java b/src/ca/canuckcoding/wosqi/About.java
similarity index 86%
rename from src/ca/canucksoftware/wosqi/About.java
rename to src/ca/canuckcoding/wosqi/About.java
index 984dbfb..f660897 100644
--- a/src/ca/canucksoftware/wosqi/About.java
+++ b/src/ca/canuckcoding/wosqi/About.java
@@ -1,5 +1,5 @@
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
 import org.jdesktop.application.Action;
 import java.awt.Desktop;
@@ -57,7 +57,7 @@ public class About extends javax.swing.JDialog {
         jLayeredPane1.setName("jLayeredPane1"); // NOI18N
         jLayeredPane1.setOpaque(true);
 
-        javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(ca.canucksoftware.wosqi.WebOSQuickInstallApp.class).getContext().getActionMap(About.class, this);
+        javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(ca.canuckcoding.wosqi.WebOSQuickInstallApp.class).getContext().getActionMap(About.class, this);
         closeButton.setAction(actionMap.get("closeAboutBox")); // NOI18N
         closeButton.setBackground(new java.awt.Color(192, 192, 192));
         closeButton.setFont(closeButton.getFont());
@@ -69,12 +69,12 @@ public class About extends javax.swing.JDialog {
                 closeButtonKeyTyped(evt);
             }
         });
+        jLayeredPane1.add(closeButton);
         closeButton.setBounds(130, 310, 90, 25);
-        jLayeredPane1.add(closeButton, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel5.setFont(jLabel5.getFont().deriveFont((jLabel5.getFont().getStyle() | java.awt.Font.ITALIC), jLabel5.getFont().getSize()+1));
         jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/donate.gif"))); // NOI18N
+        jLabel5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/donate.gif"))); // NOI18N
         jLabel5.setText(bundle.getString("About.jLabel5.text")); // NOI18N
         jLabel5.setHorizontalTextPosition(javax.swing.SwingConstants.CENTER);
         jLabel5.setName("jLabel5"); // NOI18N
@@ -89,41 +89,46 @@ public class About extends javax.swing.JDialog {
                 jLabel5MouseMoved(evt);
             }
         });
+        jLayeredPane1.add(jLabel5);
         jLabel5.setBounds(10, 120, 330, 50);
-        jLayeredPane1.add(jLabel5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/title.png"))); // NOI18N
+        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/title.png"))); // NOI18N
         jLabel1.setName("jLabel1"); // NOI18N
+        jLayeredPane1.add(jLabel1);
         jLabel1.setBounds(0, 0, 350, 60);
-        jLayeredPane1.add(jLabel1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel6.setFont(jLabel6.getFont());
         jLabel6.setText(bundle.getString("About.jLabel6.text")); // NOI18N
         jLabel6.setName("jLabel6"); // NOI18N
+        jLayeredPane1.add(jLabel6);
         jLabel6.setBounds(20, 200, 310, 110);
-        jLayeredPane1.add(jLabel6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         appVersionLabel.setFont(appVersionLabel.getFont().deriveFont(appVersionLabel.getFont().getStyle() | java.awt.Font.BOLD, appVersionLabel.getFont().getSize()+5));
         appVersionLabel.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         appVersionLabel.setText(bundle.getString("About.appVersionLabel.text")); // NOI18N
         appVersionLabel.setName("appVersionLabel"); // NOI18N
+        jLayeredPane1.add(appVersionLabel);
         appVersionLabel.setBounds(10, 50, 330, 30);
-        jLayeredPane1.add(appVersionLabel, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel4.setFont(jLabel4.getFont());
         jLabel4.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         jLabel4.setText(bundle.getString("About.jLabel4.text")); // NOI18N
         jLabel4.setName("jLabel4"); // NOI18N
+        jLayeredPane1.add(jLabel4);
         jLabel4.setBounds(20, 170, 310, 40);
-        jLayeredPane1.add(jLabel4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getSize()+3f));
+        jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getSize()+1f));
         jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         jLabel2.setText(bundle.getString("About.jLabel2.text")); // NOI18N
         jLabel2.setName("jLabel2"); // NOI18N
-        jLabel2.setBounds(10, 80, 330, 30);
-        jLayeredPane1.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        jLabel2.addMouseListener(new java.awt.event.MouseAdapter() {
+            public void mouseClicked(java.awt.event.MouseEvent evt) {
+                jLabel2MouseClicked(evt);
+            }
+        });
+        jLayeredPane1.add(jLabel2);
+        jLabel2.setBounds(10, 80, 330, 40);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
@@ -159,6 +164,12 @@ public class About extends javax.swing.JDialog {
             Desktop.getDesktop().browse(new URI("https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=7G5QLAXMVVSGY"));
         } catch(Exception e) {}
 }//GEN-LAST:event_jLabel5MouseClicked
+
+    private void jLabel2MouseClicked(java.awt.event.MouseEvent evt) {//GEN-FIRST:event_jLabel2MouseClicked
+        /*try {
+            Desktop.getDesktop().browse(new URI("https://github.com/JayCanuck/webos-quick-install"));
+        } catch(Exception e) {}*/
+    }//GEN-LAST:event_jLabel2MouseClicked
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton closeButton;
diff --git a/src/ca/canucksoftware/wosqi/Bundle.properties b/src/ca/canuckcoding/wosqi/Bundle.properties
similarity index 96%
rename from src/ca/canucksoftware/wosqi/Bundle.properties
rename to src/ca/canuckcoding/wosqi/Bundle.properties
index 4b465bc..5687cd0 100644
--- a/src/ca/canucksoftware/wosqi/Bundle.properties
+++ b/src/ca/canuckcoding/wosqi/Bundle.properties
@@ -105,10 +105,10 @@ InstalledPatchInfo.jLabel5.text=Description:
 InstalledPatchInfo.jLabel11.text=Author:
 About.closeButton.text=Close
 About.jLabel5.text=Help support development
-About.appVersionLabel.text=Version 4.5.0
-About.jLabel2.text=Freeware
-About.jLabel4.text=<html>Copyright \u00A9 2009-2013  Jason Robitaille.
-About.jLabel6.text=<html><p align="justify">Jason Robitaille and Canuck Coding are in no way affiliated with HP, LG or their affiliates.  Palm, Pre, Pixi, Veer, TouchPad, Enyo, and webOS are among the trademarks owned by or licensed to Hewlett-Packard Development Company, L.P. www.hpwebos.com</p>
+About.appVersionLabel.text=Version 4.6.0
+About.jLabel2.text=Opensource under Apache License 2.0
+About.jLabel4.text=<html>Copyright \u00a9 2009-2014  Jason Robitaille.
+About.jLabel6.text=<html><p align="justify">Jason Robitaille and Canuck Coding are in no way affiliated with HP, LG or their affiliates.  Palm, Pre, Pixi, Veer, TouchPad, Enyo, webOS, and Open webOS are among the trademarks owned by or licensed to HP and/or LG Electronics.</p>
 FeedLoader.jLabel5.text=Downloading and parsing:
 FeedLoader.jLabel6.text=
 FeedViewer.jLayeredPane1.TabConstraints.tabTitle=Updates
@@ -321,4 +321,8 @@ FEED_PRETHEMER=PreThemer
 FEED_PCTHEMES=webOS Nation Themes
 FEED_CLOCK=Clock Themes
 Settings.jCheckBox1.text=<html>Use device name when possible
-OK=OK
\ No newline at end of file
+OK=OK
+DRIVER_INSTALLED_SUCCESSFULLY.=Driver installed successfully.
+ERROR\:_DRIVER_INSTALLATION_FAILED=ERROR: Driver installation failed
+MainView.jMenuItem10.text=License
+MainView.jMenuItem10.toolTipText=
diff --git a/src/ca/canucksoftware/wosqi/Bundle_de.properties b/src/ca/canuckcoding/wosqi/Bundle_de.properties
similarity index 80%
rename from src/ca/canucksoftware/wosqi/Bundle_de.properties
rename to src/ca/canuckcoding/wosqi/Bundle_de.properties
index 2b5edcb..0e97b95 100644
--- a/src/ca/canucksoftware/wosqi/Bundle_de.properties
+++ b/src/ca/canuckcoding/wosqi/Bundle_de.properties
@@ -1,34 +1,34 @@
 # To change this template, choose Tools | Templates
 # and open the template in the editor.
 
-MainView.jLabel2.text=Ger\u00E4t:
+MainView.jLabel2.text=Ger\u00e4t:
 MainView.fileMenu.text=Datei
 MainView.jLayeredPane7.border.title=Zu installierende Dateien
 MainView.jButton3.text=Installieren
 MainView.toolMenu.text=Tools
 MainView.helpMenu.text=Hilfe
-MainView.jMenuItem1.text=Datei hinzuf\u00FCgen...
+MainView.jMenuItem1.text=Datei hinzuf\u00fcgen...
 MainView.jMenuItem2.text=Novacom reinstallieren
 MainView.jMenuItem3.text=Datei senden
 MainView.jMenuItem4.text=Datei empfangen
-MainView.jMenuItem5.text=Ger\u00E4tmanagement
+MainView.jMenuItem5.text=Ger\u00e4tmanagement
 MainView.jMenuItem6.text=Benutzung
 MainView.jMenuItem7.text=Haftungsausschluss
-MainView.aboutMenuItem.text=\u00DCber
+MainView.aboutMenuItem.text=\u00dcber
 DoctorDownloader.jLabel1.text_1=<html>Novacom lade herunter
 Usage.jLayeredPane2.border.title=Anleitung
-Usage.jTextPane1.text=<html><body style="font:1em">Damit WebOS Quick Install richtig funktionieren kann, m\u00FCssen einige Voraussetzungen erf\u00FCllt sein:<br/><ul><li/>Der Novacom-Treiber muss auf diesem Computer installiert sein.<br/><br/>Falls Sie den Treiber reinstallieren wollen, w\u00E4hlen Sie 'Novacom reinstallieren" aus dem Datei-Men\u00FC.<br/><br/><li/>Der Entwicklermodus muss aktiviert sein.<br/><br/>Dieses kann durch das Eintippen von 'upupdowndownleftrightleftrightbastart', dem \u00D6ffnen des DevMode-Programmes und der Aktivierung der Option erreicht werden.<br/><br/><li/>Wenn Sie Ihr Ger\u00E4t anschlie\u00DFen, w\u00E4hlen Sie "Nur aufladen".</ul></body>
+Usage.jTextPane1.text=<html><body style="font:1em">Damit WebOS Quick Install richtig funktionieren kann, m\u00fcssen einige Voraussetzungen erf\u00fcllt sein:<br/><ul><li/>Der Novacom-Treiber muss auf diesem Computer installiert sein.<br/><br/>Falls Sie den Treiber reinstallieren wollen, w\u00e4hlen Sie 'Novacom reinstallieren" aus dem Datei-Men\u00fc.<br/><br/><li/>Der Entwicklermodus muss aktiviert sein.<br/><br/>Dieses kann durch das Eintippen von 'upupdowndownleftrightleftrightbastart', dem \u00d6ffnen des DevMode-Programmes und der Aktivierung der Option erreicht werden.<br/><br/><li/>Wenn Sie Ihr Ger\u00e4t anschlie\u00dfen, w\u00e4hlen Sie "Nur aufladen".</ul></body>
 Usage.jTextPane1.contentType=text/html
 ReveiveFile.jLabel2.text=Datei:
 ReceiveFile.jButton1.text=...
 ReveiveFile.jLabel1.text=Ziel:
-ReceiveFile.jButton2.text=vom Ger\u00E4t holen
+ReceiveFile.jButton2.text=vom Ger\u00e4t holen
 ReceiveFile.jButton3.text=Abbrechen
 SendFile.jButton1.text=...
 SendFile.jLabel2.text=Datei:
 SendFile.jLabel1.text=Ziel:
 SendFile.jButton3.text=Abbrechen
-SendFile.jButton2.text=zum Ger\u00E4t senden
+SendFile.jButton2.text=zum Ger\u00e4t senden
 DeviceManagement.jLabel2.text=
 DeviceManagement.jLabel3.text=
 DeviceManagement.jLabel9.text=
@@ -39,7 +39,7 @@ DeviceManagement.jLabel4.text=
 DeviceManagement.jLabel5.text=
 DeviceManagement.jTable1.columnModel.title1=
 DeviceManagement.jTable1.columnModel.title0=Name
-DeviceManagement.jLayeredPane2.border.title=Ger\u00E4teinformation
+DeviceManagement.jLayeredPane2.border.title=Ger\u00e4teinformation
 DeviceManagement.jLabel1.text=
 DeviceManagement.jLabel10.text=
 DeviceManagement.jLabel11.text=
@@ -47,8 +47,8 @@ DeviceManagement.jLabel12.text=
 DeviceManagement.jLabel13.text=
 LOADING_LIST...=Liste wird geladen...
 {0}_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.={0} ist nicht verbunden. Bitte verbinden Sie es und versuchen Sie es erneut.
-DEVICE_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.=Ger\u00E4t ist nicht verbunden. Bitte verbinden Sie es und versuchen Sie es erneut.
-DEVICE\:=Ger\u00E4t:
+DEVICE_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.=Ger\u00e4t ist nicht verbunden. Bitte verbinden Sie es und versuchen Sie es erneut.
+DEVICE\:=Ger\u00e4t:
 OS\:=OS:
 ARCHITECTURE\:=Architektur:
 BUILD_NAME\:=Build-Name:
@@ -58,7 +58,7 @@ CPU_SPEED\:=CPU-Geschwindigkeit:
 CPU_HARDWARE\:=CPU-Hardware:
 MODEM_TYPE\:=Modem-Typ:
 MODEM_FIRMWARE\:=Modem-Firmware:
-DEPENDANT_PACKAGES_EXIST_WARNING=Achtung: Weitere Pakete sind von \"{0}\" abh\u00E4ngig und werden zusammen damit entfernt:
+DEPENDANT_PACKAGES_EXIST_WARNING=Achtung: Weitere Pakete sind von \"{0}\" abh\u00e4ngig und werden zusammen damit entfernt:
 WARNING=Achtung
 PROCESSING_FINISHED_DOWNLOAD._THIS_MAY_TAKE_A_FEW_MINUTES.=Beendeter Download wird bearbeitet. Dieses kann einige Minuten dauern.
 INSTALLING_DRIVER...=Treiber wird installiert...
@@ -66,49 +66,49 @@ DRIVER_INSTALLED_SUCCESSFULLY.=Treiber wurde erfolgreich installiert.
 ERROR\:_DRIVER_INSTALLATION_FAILED=FEHLER: Installation des Treibers fehlgeschlagen
 ERROR\:=FEHLER:
 PLEASE_WAIT...=Bitte warten Sie...
-SELECT=Ausw\u00E4hlen
-FILE_TRANSFERRED_SUCCESSFULLY.=Datei erfolgreich \u00FCbertragen.
-FILE_TRANSFER_FAILED.=Datei\u00FCbertragung fehlgeschlagen.
-SYSTEM_IS_BUSY._TRY_AGAIN_LATER.=Das System ist ausgelastet. Versuchen Sie es sp\u00E4ter erneut.
+SELECT=Ausw\u00e4hlen
+FILE_TRANSFERRED_SUCCESSFULLY.=Datei erfolgreich \u00fcbertragen.
+FILE_TRANSFER_FAILED.=Datei\u00fcbertragung fehlgeschlagen.
+SYSTEM_IS_BUSY._TRY_AGAIN_LATER.=Das System ist ausgelastet. Versuchen Sie es sp\u00e4ter erneut.
 CONNECTING...=Verbinde...
 DOWNLOADING\:=Lade herunter:
-TRANSFERRING_AND_APPLYING\:=\u00DCbertrage und wende an:
-TRANSFERRING\:=\u00DCbertrage:
+TRANSFERRING_AND_APPLYING\:=\u00dcbertrage und wende an:
+TRANSFERRING\:=\u00dcbertrage:
 INSTALLING\:=Installiere:
 INSTALL=Installieren
-NO_DEVICES_ARE_CONNECTED._CONNECT_A_DEVICE_THEN_RELAUNCH_WEBOS_QUICK_INSTALL.=Es sind keine Ger\u00E4te verbunden. Verbinden Sie ein Ger\u00E4t und starten Sie WebOS Quick Install erneut.
-NO_DEVICES_FOUND=Keine Ger\u00E4te gefunden
-FULL_WOSQI_DISCLAIMER=Dieses Programm ist f\u00FCr den Einsatz mit - im Test befindlichen - WebOS-Applikationen vorgesehen, was nach Absatz 4.2 der Palm SDK Lizenzvereinbarung die Installation solcher ungenehmigter Applikationen auf Palm Ger\u00E4ten erm\u00F6glicht. Mit der Benutzung dieses Programms versteht der Anwender, dass dabei installierte WebOS-Applikationen gef\u00E4hrlich sein k\u00F6nnten, deren Sicherheit oder Stabilit\u00E4t nicht von Palm Inc. best\u00E4tigt wird und er die Garantie f\u00FCr sein Ger\u00E4t verlieren k\u00F6nnte. Die Installation von WebOS-Paketen geschieht deshalb auf eigenes Risiko und weder der Entwickler von WebOS Quick Install noch Palm Inc. k\u00F6nnen daf\u00FCr zur Verantwortung gezogen werden.
+NO_DEVICES_ARE_CONNECTED._CONNECT_A_DEVICE_THEN_RELAUNCH_WEBOS_QUICK_INSTALL.=Es sind keine Ger\u00e4te verbunden. Verbinden Sie ein Ger\u00e4t und starten Sie WebOS Quick Install erneut.
+NO_DEVICES_FOUND=Keine Ger\u00e4te gefunden
+FULL_WOSQI_DISCLAIMER=Dieses Programm ist f\u00fcr den Einsatz mit - im Test befindlichen - WebOS-Applikationen vorgesehen, was nach Absatz 4.2 der Palm SDK Lizenzvereinbarung die Installation solcher ungenehmigter Applikationen auf Palm Ger\u00e4ten erm\u00f6glicht. Mit der Benutzung dieses Programms versteht der Anwender, dass dabei installierte WebOS-Applikationen gef\u00e4hrlich sein k\u00f6nnten, deren Sicherheit oder Stabilit\u00e4t nicht von Palm Inc. best\u00e4tigt wird und er die Garantie f\u00fcr sein Ger\u00e4t verlieren k\u00f6nnte. Die Installation von WebOS-Paketen geschieht deshalb auf eigenes Risiko und weder der Entwickler von WebOS Quick Install noch Palm Inc. k\u00f6nnen daf\u00fcr zur Verantwortung gezogen werden.
 DISCLAIMER=Haftungsausschluss
 FOR_WEBOS_QUICK_INSTALL_TO_RUN_CORRECTLY,_YOUR_COMPUTER_NEEDS_TO_HAVE_THE_NOVACOM_DRIVER_INSTALLED._WOULD_YOU_LIKE_TO_INSTALL_IT_NOW?=Damit WebOS Quick Install richtig arbeiten kann, muss der Novacom-Treiber auf Ihrem Computer installiert sein. Wollen Sie ihn jetzt installieren?
 NOVACOM_DRIVER_MISSING=Novacom-Treiber Fehlt
 JAR_FILES_(*.JAR)=Jar-Dateien (*.jar)
 WEBOS_FILES_(*.IPK,_*.PATCH,_*.DIFF)=webOS-Dateien (*.ipk, *.patch, *.diff)
-REPEATING_CONNECTION_WARNING=Zur Zeit sind keine Ger\u00E4te verbunden. Bitte verbinden Sie ein Ger\u00E4t, um fortzufahren.
-WEBOS_DOCTOR_NEEDED_FOR_DRIVERS=Zeitweise ist ein webOSDoctor notwendig, damit der Novacom-Treiber auf Ihrem System installiert werden kann. Sie k\u00F6nnen ihn jetzt herunterladen (ca. 200MB) oder - falls Sie bereits einen heruntergeladen haben - diesen ausw\u00E4hlen und der Treiber wird installiert.
-WEBOSDOCTOR_REQUIRED=webOSDoctor wird ben\u00F6tigt
+REPEATING_CONNECTION_WARNING=Zur Zeit sind keine Ger\u00e4te verbunden. Bitte verbinden Sie ein Ger\u00e4t, um fortzufahren.
+WEBOS_DOCTOR_NEEDED_FOR_DRIVERS=Zeitweise ist ein webOSDoctor notwendig, damit der Novacom-Treiber auf Ihrem System installiert werden kann. Sie k\u00f6nnen ihn jetzt herunterladen (ca. 200MB) oder - falls Sie bereits einen heruntergeladen haben - diesen ausw\u00e4hlen und der Treiber wird installiert.
+WEBOSDOCTOR_REQUIRED=webOSDoctor wird ben\u00f6tigt
 DOWNLOAD=Download
-SELECT_FILE...=Datei ausw\u00E4hlen...
+SELECT_FILE...=Datei ausw\u00e4hlen...
 CANCEL=Abbrechen
 InstalledPkgInfo.jLabel1.text=Name:
 InstalledPkgInfo.jLabel2.text=Version:
 InstalledPkgInfo.jLabel4.text=ID:
-InstalledPkgInfo.jButton1.text=Schlie\u00DFen
+InstalledPkgInfo.jButton1.text=Schlie\u00dfen
 InstalledPkgInfo.jLabel11.text=Author:
 InstalledPkgInfo.title=Paketinformation
 UNKNOWN=Unbekannt
 InstalledPatchInfo.title=Paketinformation
-InstalledPatchInfo.jButton1.text=Schlie\u00DFen
+InstalledPatchInfo.jButton1.text=Schlie\u00dfen
 InstalledPatchInfo.jLabel4.text=ID:
 InstalledPatchInfo.jLabel2.text=Version:
 InstalledPatchInfo.jLabel1.text=Name:
 InstalledPatchInfo.jLabel5.text=Beschreibung:
 InstalledPatchInfo.jLabel11.text=Author:
-About.closeButton.text=Schlie\u00DFen
-About.jLabel5.text=Unterst\u00FCtzen Sie die Entwicklung
+About.closeButton.text=Schlie\u00dfen
+About.jLabel5.text=Unterst\u00fctzen Sie die Entwicklung
 About.appVersionLabel.text=Version 4.5.0
-About.jLabel2.text=Deutsche \u00DCbersetzung von Tobias Kaller
-About.jLabel4.text=<html>Copyright \u00A9 2009-2013  Jason Robitaille. All rights reserved.
+About.jLabel2.text=Deutsche \u00dcbersetzung von Tobias Kaller
+About.jLabel4.text=<html>Copyright \u00a9 2009-2013  Jason Robitaille. All rights reserved.
 About.jLabel6.text=<html><p align="justify">Jason Robitaille and Canuck Coding are in no way affiliated with HP, LG or their affiliates.  Palm, Pre, Pixi, Veer, TouchPad, and WebOS are among the trademarks owned by or licensed to Hewlett-Packard Development Company, L.P. www.hpwebos.com</p>
 FeedLoader.jLabel5.text=Lade herunter und verarbeite:
 FeedLoader.jLabel6.text=
@@ -265,7 +265,7 @@ FeedViewer.jButton17.text=
 FeedViewer.jTextField9.text=
 SendFile.title=Datei senden
 ReceiveFile.title=Datei empfangen
-FeedViewer.availablePackagesTabs.TabConstraints.tabTitle=verf\u00FCgbare Pakete
+FeedViewer.availablePackagesTabs.TabConstraints.tabTitle=verf\u00fcgbare Pakete
 Installer.jLabel5.text=
 FeedViewer.jButton15.text=Alle aktualisieren
 ALL=Alle
@@ -280,28 +280,28 @@ VERSION\:=Version:
 DEVELOPER\:=Entwickler:
 LAST_UPDATED\:=Zuletzt aktualisiert:
 NO_PACKAGES_FOUND=Keine Pakete Gefunden
-DEPENDANCY_INSTALL_WARNING=Achtung: \"{0}\" ist von den folgenden Paketen abh\u00E4ngig und wird zusammen damit installiert:
+DEPENDANCY_INSTALL_WARNING=Achtung: \"{0}\" ist von den folgenden Paketen abh\u00e4ngig und wird zusammen damit installiert:
 NO_UPDATES_FOUND=Updates Gefunden
 MainView.installTable.columnModel.title2=Art
-MainView.installTable.columnModel.title1=Gr\u00F6\u00DFe
+MainView.installTable.columnModel.title1=Gr\u00f6\u00dfe
 MainView.installTable.columnModel.title0=Name
 Settings.title=Grundeinstellungen
 Settings.jLabel1.text=Sprache:
 MainView.jMenuItem8.text=Grundeinstellungen
 <SYSTEM_DEFAULT>=<Systemvorgabe>
 ENGLISH=Englisch
-FRENCH=Franz\u00F6sisch
+FRENCH=Franz\u00f6sisch
 GERMAN=Deutsch
 SIMPLIFIED_CHINESE=Vereinfachtes Chinesisch
-THE_NEW_LANGUAGE_WILL_TAKE_EFFECT_THE_NEXT_TIME_WEBOS_QUICK_INSTALL_IS_LAUNCHED.=Die neu ausgew\u00E4hlte Sprache wird bei dem n\u00E4chsten Start von WebOS Quick Install aktiv.
-LANGUAGE_CHANGED.=Sprache wurde ge\u00E4ndert
-ERROR\:_INVALID_FEED_URL=FEHLER: Ung\u00FCltige Feed-URL
+THE_NEW_LANGUAGE_WILL_TAKE_EFFECT_THE_NEXT_TIME_WEBOS_QUICK_INSTALL_IS_LAUNCHED.=Die neu ausgew\u00e4hlte Sprache wird bei dem n\u00e4chsten Start von WebOS Quick Install aktiv.
+LANGUAGE_CHANGED.=Sprache wurde ge\u00e4ndert
+ERROR\:_INVALID_FEED_URL=FEHLER: Ung\u00fcltige Feed-URL
 CUSTOM_FEED_URL\:=Benutzerdefinierte Feed-URL
 EXIT=Beenden
 MainView.jMenuItem9.text=Linux-Befehlszeile
 Settings.jLabel2.text=Voreingestellte Feeds:
 Settings.jLabel3.text=Eigene Feeds:
-Settings.jButton1.text=Gespeichertes Passwort f\u00FCr Entwicklermodus l\u00F6schen
+Settings.jButton1.text=Gespeichertes Passwort f\u00fcr Entwicklermodus l\u00f6schen
 FEED_PRECENTRAL=webOS Nation
 FEED_WEBOSINTERNALS=WebOS-Internals
 FEED_PATCHES=WebOS Patches
@@ -309,5 +309,7 @@ FEED_KERNELS=WebOS Kernels
 FEED_PRETHEMER=PreThemer
 FEED_PCTHEMES=webOS Nation Themes
 FEED_CLOCK=Clock Themes
-Settings.jCheckBox1.text=<html>Wenn m\u00F6glich Ger\u00E4tenamen benutzen
-OK=OK
\ No newline at end of file
+Settings.jCheckBox1.text=<html>Wenn m\u00f6glich Ger\u00e4tenamen benutzen
+OK=OK
+DRIVER_INSTALLED_SUCCESSFULLY.=Treiber wurde erfolgreich installiert.
+ERROR\:_DRIVER_INSTALLATION_FAILED=FEHLER: Installation des Treibers fehlgeschlagen
\ No newline at end of file
diff --git a/src/ca/canucksoftware/wosqi/Bundle_fr.properties b/src/ca/canuckcoding/wosqi/Bundle_fr.properties
similarity index 65%
rename from src/ca/canucksoftware/wosqi/Bundle_fr.properties
rename to src/ca/canuckcoding/wosqi/Bundle_fr.properties
index a58f886..6e102ba 100644
--- a/src/ca/canucksoftware/wosqi/Bundle_fr.properties
+++ b/src/ca/canuckcoding/wosqi/Bundle_fr.properties
@@ -3,38 +3,38 @@
 
 MainView.jLabel2.text=Device:
 MainView.fileMenu.text=Fichier
-MainView.jLayeredPane7.border.title=Fichiers \u00E0 installer
+MainView.jLayeredPane7.border.title=Fichiers \u00e0 installer
 MainView.jButton3.text=Installer
 MainView.toolMenu.text=Outils
 MainView.helpMenu.text=Aide
 MainView.jMenuItem1.text=Ajouter un fichier ...
-MainView.jMenuItem2.text=R\u00E9installer Novacom
+MainView.jMenuItem2.text=R\u00e9installer Novacom
 MainView.jMenuItem3.text=Envoyer un fichier
 MainView.jMenuItem4.text=Recevoir un fichier
-MainView.jMenuItem5.text=Gestion des p\u00E9riph\u00E9riques
+MainView.jMenuItem5.text=Gestion des p\u00e9riph\u00e9riques
 MainView.jMenuItem6.text=Utilisation
-MainView.jMenuItem7.text=Responsabilit\u00E9
+MainView.jMenuItem7.text=Responsabilit\u00e9
 MainView.aboutMenuItem.text=A propos
-DoctorDownloader.jLabel1.text_1=<html>Novacom T\u00E9l\u00E9chargement
+DoctorDownloader.jLabel1.text_1=<html>Novacom T\u00e9l\u00e9chargement
 Usage.jLayeredPane2.border.title=Comment utiliser
-Usage.jTextPane1.text=<html><body style="font:1em">Avant WebOS Quick Install fonctionne correctement, il y a quelques exigences mineures:<br/><ul><li/>Driver Novacom install\u00E9 sur cet ordinateur<br/><br/>Si vous voulez r\u00E9installer le composant, cliquez sur le "R\u00E9installer Novacom" option dans le menu principal Fichier.<br/><br/><li/>Mode d\u00E9veloppeur activ\u00E9.<br/><br/>Cela peut \u00EAtre fait par tapant 'upupdowndownleftrightleftrightbastart', Ouvrez DevMode l'application, et d'activer la fonction.<br/><br/><li/Lorsque vous branchez votre appareil, choisissez "Charger".</ul></body>
+Usage.jTextPane1.text=<html><body style="font:1em">Avant WebOS Quick Install fonctionne correctement, il y a quelques exigences mineures:<br/><ul><li/>Driver Novacom install\u00e9 sur cet ordinateur<br/><br/>Si vous voulez r\u00e9installer le composant, cliquez sur le "R\u00e9installer Novacom" option dans le menu principal Fichier.<br/><br/><li/>Mode d\u00e9veloppeur activ\u00e9.<br/><br/>Cela peut \u00eatre fait par tapant 'upupdowndownleftrightleftrightbastart', Ouvrez DevMode l'application, et d'activer la fonction.<br/><br/><li/Lorsque vous branchez votre appareil, choisissez "Charger".</ul></body>
 Usage.jTextPane1.contentType=text/html
 ReveiveFile.jLabel2.text=Fichier:
 ReceiveFile.jButton1.text=...
 ReveiveFile.jLabel1.text=Destination:
-ReceiveFile.jButton2.text=Obtenir de p\u00E9riph\u00E9rique
+ReceiveFile.jButton2.text=Obtenir de p\u00e9riph\u00e9rique
 ReceiveFile.jButton3.text=Annuler
 SendFile.jButton1.text=...
 SendFile.jLabel2.text=Fichier:
 SendFile.jLabel1.text=Destination:
 SendFile.jButton3.text=Annuler
-SendFile.jButton2.text=Envoyer au p\u00E9riph\u00E9rique
+SendFile.jButton2.text=Envoyer au p\u00e9riph\u00e9rique
 DeviceManagement.jLabel2.text=
 DeviceManagement.jLabel3.text=
 DeviceManagement.jLabel9.text=
-DeviceManagement.jButton1.text=D\u00E9sinstaller
+DeviceManagement.jButton1.text=D\u00e9sinstaller
 DeviceManagement.jLabel8.text=
-DeviceManagement.jLayeredPane3.border.title=Contenu Utilisateur-install\u00E9
+DeviceManagement.jLayeredPane3.border.title=Contenu Utilisateur-install\u00e9
 DeviceManagement.jLabel4.text=
 DeviceManagement.jLabel5.text=
 DeviceManagement.jTable1.columnModel.title1=
@@ -46,8 +46,8 @@ DeviceManagement.jLabel11.text=
 DeviceManagement.jLabel12.text=
 DeviceManagement.jLabel13.text=
 LOADING_LIST...=Chargement de la liste...
-{0}_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.={0} est d\u00E9branch\u00E9. S'il vous pla\u00EEt se reconnecter puis r\u00E9essayez.
-DEVICE_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.=L'appareil est d\u00E9branch\u00E9. S'il vous pla\u00EEt se reconnecter puis r\u00E9essayez.
+{0}_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.={0} est d\u00e9branch\u00e9. S'il vous pla\u00eet se reconnecter puis r\u00e9essayez.
+DEVICE_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.=L'appareil est d\u00e9branch\u00e9. S'il vous pla\u00eet se reconnecter puis r\u00e9essayez.
 DEVICE\:=Device:
 OS\:=OS:
 ARCHITECTURE\:=Architecture:
@@ -55,40 +55,40 @@ BUILD_NAME\:=Construire nom:
 BUILD_TIME\:=Temps de construction:
 CPU_TYPE\:=Type de processeur:
 CPU_SPEED\:=Vitesse du processeur:
-CPU_HARDWARE\:=Mat\u00E9riel du processeur:
+CPU_HARDWARE\:=Mat\u00e9riel du processeur:
 MODEM_TYPE\:=Type de modem:
 MODEM_FIRMWARE\:=Firmware de modem:
-DEPENDANT_PACKAGES_EXIST_WARNING=Attention: Le suivi des paquets d\u00E9pendent de \"{0}\" et seront retirer avec elle:
+DEPENDANT_PACKAGES_EXIST_WARNING=Attention: Le suivi des paquets d\u00e9pendent de \"{0}\" et seront retirer avec elle:
 WARNING=Attention
-PROCESSING_FINISHED_DOWNLOAD._THIS_MAY_TAKE_A_FEW_MINUTES.=Traitement termin\u00E9 le t\u00E9l\u00E9chargement. Cela peut prendre quelques minutes.
+PROCESSING_FINISHED_DOWNLOAD._THIS_MAY_TAKE_A_FEW_MINUTES.=Traitement termin\u00e9 le t\u00e9l\u00e9chargement. Cela peut prendre quelques minutes.
 INSTALLING_DRIVER...=Installation du driver...
-DRIVER_INSTALLED_SUCCESSFULLY.=Driver install\u00E9 avec succ\u00E8s.
-ERROR\:_DRIVER_INSTALLATION_FAILED=ERREUR: L'installation du driver a \u00E9chou\u00E9
+DRIVER_INSTALLED_SUCCESSFULLY.=Driver install\u00e9 avec succ\u00e8s.
+ERROR\:_DRIVER_INSTALLATION_FAILED=ERREUR: L'installation du driver a \u00e9chou\u00e9
 ERROR\:=ERREUR:
-PLEASE_WAIT...=S'il vous pla\u00EEt patienter...
+PLEASE_WAIT...=S'il vous pla\u00eet patienter...
 SELECT=Select
-FILE_TRANSFERRED_SUCCESSFULLY.=Dossier transf\u00E9r\u00E9 avec succ\u00E8s.
-FILE_TRANSFER_FAILED.=Le transfert de fichiers a \u00E9chou\u00E9.
-SYSTEM_IS_BUSY._TRY_AGAIN_LATER.=Le syst\u00E8me est occup\u00E9. R\u00E9essayez plus tard.
+FILE_TRANSFERRED_SUCCESSFULLY.=Dossier transf\u00e9r\u00e9 avec succ\u00e8s.
+FILE_TRANSFER_FAILED.=Le transfert de fichiers a \u00e9chou\u00e9.
+SYSTEM_IS_BUSY._TRY_AGAIN_LATER.=Le syst\u00e8me est occup\u00e9. R\u00e9essayez plus tard.
 CONNECTING...=Connecting...
-DOWNLOADING\:=T\u00E9l\u00E9chargement:
+DOWNLOADING\:=T\u00e9l\u00e9chargement:
 TRANSFERRING_AND_APPLYING\:=Transfert et de l'application:
 TRANSFERRING\:=Transfert:
 INSTALLING\:=Installation:
 INSTALL=Installer
-NO_DEVICES_ARE_CONNECTED._CONNECT_A_DEVICE_THEN_RELAUNCH_WEBOS_QUICK_INSTALL.=Pas de p\u00E9riph\u00E9riques sont connect\u00E9s. Connectez un p\u00E9riph\u00E9rique puis relancer WebOS Quick Install.
-NO_DEVICES_FOUND=Aucun p\u00E9riph\u00E9rique trouv\u00E9
-FULL_WOSQI_DISCLAIMER=Ce programme est destin\u00E9 \u00E0 \u00EAtre utilis\u00E9 avec des applications WebOS qui sont dans l'essai, qui, en vertu de l'article 4.2 de l'Accord Palm licence du kit SDK permet de telles applications non autoris\u00E9es \u00E0 \u00EAtre install\u00E9 sur les appareils Palm. En utilisant ce programme, l'utilisateur comprend que les applications install\u00E9es webOS peut \u00EAtre dangereux et n'ont pas \u00E9t\u00E9 approuv\u00E9s pour la s\u00E9curit\u00E9 ou la stabilit\u00E9 par Palm Inc et pourrait annuler la garantie de votre appareil. Installation des paquetages webOS sont fait \u00E0 vos risques et p\u00E9rils et ni le d\u00E9veloppeur de WebOS Quick Install, ni Palm Inc peut \u00EAtre tenu responsable.
-DISCLAIMER=Responsabilit\u00E9
-FOR_WEBOS_QUICK_INSTALL_TO_RUN_CORRECTLY,_YOUR_COMPUTER_NEEDS_TO_HAVE_THE_NOVACOM_DRIVER_INSTALLED._WOULD_YOU_LIKE_TO_INSTALL_IT_NOW?=Pour WebOS Quick Install afin de fonctionner correctement, votre ordinateur doit avoir install\u00E9 le driver Novacom. Souhaitez-vous l'installer maintenant?
+NO_DEVICES_ARE_CONNECTED._CONNECT_A_DEVICE_THEN_RELAUNCH_WEBOS_QUICK_INSTALL.=Pas de p\u00e9riph\u00e9riques sont connect\u00e9s. Connectez un p\u00e9riph\u00e9rique puis relancer WebOS Quick Install.
+NO_DEVICES_FOUND=Aucun p\u00e9riph\u00e9rique trouv\u00e9
+FULL_WOSQI_DISCLAIMER=Ce programme est destin\u00e9 \u00e0 \u00eatre utilis\u00e9 avec des applications WebOS qui sont dans l'essai, qui, en vertu de l'article 4.2 de l'Accord Palm licence du kit SDK permet de telles applications non autoris\u00e9es \u00e0 \u00eatre install\u00e9 sur les appareils Palm. En utilisant ce programme, l'utilisateur comprend que les applications install\u00e9es webOS peut \u00eatre dangereux et n'ont pas \u00e9t\u00e9 approuv\u00e9s pour la s\u00e9curit\u00e9 ou la stabilit\u00e9 par Palm Inc et pourrait annuler la garantie de votre appareil. Installation des paquetages webOS sont fait \u00e0 vos risques et p\u00e9rils et ni le d\u00e9veloppeur de WebOS Quick Install, ni Palm Inc peut \u00eatre tenu responsable.
+DISCLAIMER=Responsabilit\u00e9
+FOR_WEBOS_QUICK_INSTALL_TO_RUN_CORRECTLY,_YOUR_COMPUTER_NEEDS_TO_HAVE_THE_NOVACOM_DRIVER_INSTALLED._WOULD_YOU_LIKE_TO_INSTALL_IT_NOW?=Pour WebOS Quick Install afin de fonctionner correctement, votre ordinateur doit avoir install\u00e9 le driver Novacom. Souhaitez-vous l'installer maintenant?
 NOVACOM_DRIVER_MISSING=Driver Novacom manquant
 JAR_FILES_(*.JAR)=Fichiers JAR (*.jar)
 WEBOS_FILES_(*.IPK,_*.PATCH,_*.DIFF)=Fichiers webOS (*.ipk, *.patch, *.diff)
-REPEATING_CONNECTION_WARNING=Il n'y a pas de dispositifs actuellement connect\u00E9. S'il vous pla\u00EEt connecter un p\u00E9riph\u00E9rique de continuer.
-WEBOS_DOCTOR_NEEDED_FOR_DRIVERS=Pour installer le driver Novacom sur votre syst\u00E8me, un webOSDoctor est temporairement n\u00E9cessaire. Vous pouvez le t\u00E9l\u00E9charger maintenant (environ 200 MB) ou, si vous avez d\u00E9j\u00E0 un t\u00E9l\u00E9charg\u00E9, vous pouvez s\u00E9lectionner celui-l\u00E0, et le driver sera install\u00E9.
+REPEATING_CONNECTION_WARNING=Il n'y a pas de dispositifs actuellement connect\u00e9. S'il vous pla\u00eet connecter un p\u00e9riph\u00e9rique de continuer.
+WEBOS_DOCTOR_NEEDED_FOR_DRIVERS=Pour installer le driver Novacom sur votre syst\u00e8me, un webOSDoctor est temporairement n\u00e9cessaire. Vous pouvez le t\u00e9l\u00e9charger maintenant (environ 200 MB) ou, si vous avez d\u00e9j\u00e0 un t\u00e9l\u00e9charg\u00e9, vous pouvez s\u00e9lectionner celui-l\u00e0, et le driver sera install\u00e9.
 WEBOSDOCTOR_REQUIRED=webOSDoctor requis
-DOWNLOAD=T\u00E9l\u00E9charger
-SELECT_FILE...=S\u00E9lectionner un fichier...
+DOWNLOAD=T\u00e9l\u00e9charger
+SELECT_FILE...=S\u00e9lectionner un fichier...
 CANCEL=Annuler
 InstalledPkgInfo.jLabel1.text=Nom:
 InstalledPkgInfo.jLabel2.text=Version:
@@ -105,21 +105,21 @@ InstalledPatchInfo.jLabel1.text=Nom:
 InstalledPatchInfo.jLabel5.text=Description:
 InstalledPatchInfo.jLabel11.text=Auteur:
 About.closeButton.text=Fermer
-About.jLabel5.text=Aide de soutien au d\u00E9veloppement
+About.jLabel5.text=Aide de soutien au d\u00e9veloppement
 About.appVersionLabel.text=Version 4.5.0
-About.jLabel2.text=La traduction de fran\u00E7ais a fait par Jake Morrison.
-About.jLabel4.text=<html>Copyright \u00A9 2009-2013 Jason Robitaille. Tous droits r\u00E9serv\u00E9s.
-About.jLabel6.text=<html><p align="justify">Jason Robitaille et Canuck Coding sont en aucun cas affili\u00E9 avec HP ou LG ou des sous filiales. Palm, Pre, Pixi, Veer, TouchPad, et WebOS sont des marques commerciales ou des marques d\u00E9pos\u00E9es appartenant \u00E0 ou sous licence de Hewlett-Packard www.hpwebos.com</p>
-FeedLoader.jLabel5.text=Le t\u00E9l\u00E9chargement et l'analyse:
+About.jLabel2.text=La traduction de fran\u00e7ais a fait par Jake Morrison.
+About.jLabel4.text=<html>Copyright \u00a9 2009-2013 Jason Robitaille. Tous droits r\u00e9serv\u00e9s.
+About.jLabel6.text=<html><p align="justify">Jason Robitaille et Canuck Coding sont en aucun cas affili\u00e9 avec HP ou LG ou des sous filiales. Palm, Pre, Pixi, Veer, TouchPad, et WebOS sont des marques commerciales ou des marques d\u00e9pos\u00e9es appartenant \u00e0 ou sous licence de Hewlett-Packard www.hpwebos.com</p>
+FeedLoader.jLabel5.text=Le t\u00e9l\u00e9chargement et l'analyse:
 FeedLoader.jLabel6.text=
-FeedViewer.jLayeredPane1.TabConstraints.tabTitle=Mises \u00E0 jour
+FeedViewer.jLayeredPane1.TabConstraints.tabTitle=Mises \u00e0 jour
 FeedViewer.jLayeredPane2.TabConstraints.tabTitle=Applications
 FeedViewer.jLayeredPane3.TabConstraints.tabTitle=Services
 FeedViewer.jLayeredPane4.TabConstraints.tabTitle=Plugins
 FeedViewer.jLayeredPane5.TabConstraints.tabTitle=Apps de Linux
 FeedViewer.jLayeredPane6.TabConstraints.tabTitle=Page d'accueil
 FeedViewer.jLayeredPane7.TabConstraints.tabTitle=Patches
-FeedViewer.jLayeredPane8.TabConstraints.tabTitle=Th\u00E8mes
+FeedViewer.jLayeredPane8.TabConstraints.tabTitle=Th\u00e8mes
 FeedViewer.jTextField1.text=
 FeedViewer.jButton1.text=
 FeedViewer.jButton2.text=Installer
@@ -130,19 +130,19 @@ FeedViewer.jTextPane1.text=<html>
 FeedViewer.jLabel4.text=<html><b>Feed:</b>
 FeedViewer.jLabel3.text=<html><b>License:</b>
 FeedViewer.jLabel5.text=<html><b>Version:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel6.text=<html><b>Derni\u00E8re mise \u00E0 jour:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel6.text=<html><b>Derni\u00e8re mise \u00e0 jour:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel8.text=<html><b>Description:</b>
 FeedViewer.jLabel7.text=<html>
-FeedViewer.jLabel9.text=<html><b>D\u00E9veloppeur:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel9.text=<html><b>D\u00e9veloppeur:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel10.text=<html>
 FeedViewer.jLabel11.text=<html><a href="#">Page d'accueil</a>
 FeedViewer.jTextField2.text=
 FeedViewer.jLabel22.text=<html><a href="#">Page d'accueil</a>
 FeedViewer.jLabel21.text=<html>
-FeedViewer.jLabel20.text=<html><b>D\u00E9veloppeur:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel20.text=<html><b>D\u00e9veloppeur:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel19.text=<html>
 FeedViewer.jLabel18.text=<html><b>Description:</b>
-FeedViewer.jLabel17.text=<html><b>Derni\u00E8re mise \u00E0 jour:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel17.text=<html><b>Derni\u00e8re mise \u00e0 jour:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel16.text=<html><b>Version:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel15.text=<html><b>License:</b>
 FeedViewer.jLabel14.text=<html><b>Feed:</b>
@@ -154,10 +154,10 @@ FeedViewer.jButton4.text=Installer
 FeedViewer.jButton3.text=
 FeedViewer.jLabel33.text=<html><a href="#">Page d'accueil</a>
 FeedViewer.jLabel32.text=<html>
-FeedViewer.jLabel31.text=<html><b>D\u00E9veloppeur:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel31.text=<html><b>D\u00e9veloppeur:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel30.text=<html>
 FeedViewer.jLabel29.text=<html><b>Description:</b>
-FeedViewer.jLabel28.text=<html><b>Derni\u00E8re mise \u00E0 jour:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel28.text=<html><b>Derni\u00e8re mise \u00e0 jour:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel27.text=<html><b>Version:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel26.text=<html><b>License:</b>
 FeedViewer.jLabel25.text=<html><b>Feed:</b>
@@ -170,10 +170,10 @@ FeedViewer.jButton5.text=
 FeedViewer.jTextField3.text=
 FeedViewer.jLabel44.text=<html><a href="#">Page d'accueil</a>
 FeedViewer.jLabel43.text=<html>
-FeedViewer.jLabel42.text=<html><b>D\u00E9veloppeur:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel42.text=<html><b>D\u00e9veloppeur:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel41.text=<html>
 FeedViewer.jLabel40.text=<html><b>Description:</b>
-FeedViewer.jLabel39.text=<html><b>Derni\u00E8re mise \u00E0 jour:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel39.text=<html><b>Derni\u00e8re mise \u00e0 jour:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel38.text=<html><b>Version:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel37.text=<html><b>License:</b>
 FeedViewer.jLabel36.text=<html><b>Feed:</b>
@@ -187,10 +187,10 @@ FeedViewer.jTextField4.text=
 FeedViewer.jTextField5.text=
 FeedViewer.jLabel55.text=<html><a href="#">Page d'accueil</a>
 FeedViewer.jLabel54.text=<html>
-FeedViewer.jLabel53.text=<html><b>D\u00E9veloppeur:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel53.text=<html><b>D\u00e9veloppeur:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel52.text=<html>
 FeedViewer.jLabel51.text=<html><b>Description:</b>
-FeedViewer.jLabel50.text=<html><b>Derni\u00E8re mise \u00E0 jour:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel50.text=<html><b>Derni\u00e8re mise \u00e0 jour:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel49.text=<html><b>Version:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel48.text=<html><b>License:</b>
 FeedViewer.jLabel47.text=<html><b>Feed:</b>
@@ -202,10 +202,10 @@ FeedViewer.jButton10.text=Installer
 FeedViewer.jButton9.text=
 FeedViewer.jLabel66.text=<html><a href="#">Page d'accueil</a>
 FeedViewer.jLabel65.text=<html>
-FeedViewer.jLabel64.text=<html><b>D\u00E9veloppeur:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel64.text=<html><b>D\u00e9veloppeur:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel63.text=<html>
 FeedViewer.jLabel62.text=<html><b>Description:</b>
-FeedViewer.jLabel61.text=<html><b>Derni\u00E8re mise \u00E0 jour:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel61.text=<html><b>Derni\u00e8re mise \u00e0 jour:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel60.text=<html><b>Version:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel59.text=<html><b>License:</b>
 FeedViewer.jLabel58.text=<html><b>Feed:</b>
@@ -218,10 +218,10 @@ FeedViewer.jButton11.text=
 FeedViewer.jTextField6.text=
 FeedViewer.jLabel77.text=<html><a href="#">Page d'accueil</a>
 FeedViewer.jLabel76.text=<html>
-FeedViewer.jLabel75.text=<html><b>D\u00E9veloppeur:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel75.text=<html><b>D\u00e9veloppeur:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel74.text=<html>
 FeedViewer.jLabel73.text=<html><b>Description:</b>
-FeedViewer.jLabel72.text=<html><b>Derni\u00E8re mise \u00E0 jour:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel72.text=<html><b>Derni\u00e8re mise \u00e0 jour:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel71.text=<html><b>Version:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel70.text=<html><b>License:</b>
 FeedViewer.jLabel69.text=<html><b>Feed:</b>
@@ -234,10 +234,10 @@ FeedViewer.jButton13.text=
 FeedViewer.jTextField7.text=
 FeedViewer.jLabel88.text=<html><a href="#">Page d'accueil</a>
 FeedViewer.jLabel87.text=<html>
-FeedViewer.jLabel86.text=<html><b>D\u00E9veloppeur:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel86.text=<html><b>D\u00e9veloppeur:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel85.text=<html>
 FeedViewer.jLabel84.text=<html><b>Description:</b>
-FeedViewer.jLabel83.text=<html><b>Derni\u00E8re mise \u00E0 jour:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel83.text=<html><b>Derni\u00e8re mise \u00e0 jour:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel82.text=<html><b>Version:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel81.text=<html><b>License:</b>
 FeedViewer.jLabel80.text=<html><b>Feed:</b>
@@ -249,10 +249,10 @@ FeedViewer.jButton16.text=Update
 FeedViewer.jLayeredPane9.TabConstraints.tabTitle=Daemon de Linux
 FeedViewer.jLabel99.text=<html><a href="#">Page d'accueil</a>
 FeedViewer.jLabel98.text=<html>
-FeedViewer.jLabel97.text=<html><b>D\u00E9veloppeur:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel97.text=<html><b>D\u00e9veloppeur:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel96.text=<html>
 FeedViewer.jLabel95.text=<html><b>Description:</b>
-FeedViewer.jLabel94.text=<html><b>Derni\u00E8re mise \u00E0 jour:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel94.text=<html><b>Derni\u00e8re mise \u00e0 jour:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel93.text=<html><b>Version:</b> &nbsp;&nbsp;&nbsp;
 FeedViewer.jLabel92.text=<html><b>License:</b>
 FeedViewer.jLabel91.text=<html><b>Feed:</b>
@@ -267,47 +267,49 @@ SendFile.title=Envoyer un fichier
 ReceiveFile.title=Recevoir un fichier
 FeedViewer.availablePackagesTabs.TabConstraints.tabTitle=Les Paquets Disponibles
 Installer.jLabel5.text=
-FeedViewer.jButton15.text=Tout mettre \u00E0 jour
+FeedViewer.jButton15.text=Tout mettre \u00e0 jour
 ALL=Tous Les
 WEBOS_PACKAGE_FILE=Fichier Package de WebOS
 WEBOS_PATCH_FILE=Fichier Patch de WebOS
 WEBOS_DIFF_FILE=Fichier Diff de WebOS
 UNKNOWN_FILE=Fichier Inconnu
-ERROR\:_FEED_LOADING_FAILED=ERREUR: Flux chargement a \u00E9chou\u00E9
-ERROR\:_DRIVER_INSTALLATION_FAILED=ERREUR: L'installation du driver a \u00E9chou\u00E9
-ERROR\:_UNABLE_TO_DOWNLOAD_{0}=ERREUR: Impossible de t\u00E9l\u00E9charger {0}
+ERROR\:_FEED_LOADING_FAILED=ERREUR: Flux chargement a \u00e9chou\u00e9
+ERROR\:_DRIVER_INSTALLATION_FAILED=ERREUR: L'installation du driver a \u00e9chou\u00e9
+ERROR\:_UNABLE_TO_DOWNLOAD_{0}=ERREUR: Impossible de t\u00e9l\u00e9charger {0}
 VERSION\:=Version:
-DEVELOPER\:=D\u00E9veloppeur:
-LAST_UPDATED\:=Derni\u00E8re mise \u00E0 jour:
-NO_PACKAGES_FOUND=Aucun paquet trouv\u00E9
-DEPENDANCY_INSTALL_WARNING=Attention: \"{0}\" appname d\u00E9pend des paquets suivants seront install\u00E9s et avec elle:
-NO_UPDATES_FOUND=Aucune mise \u00E0 jour introuvable
+DEVELOPER\:=D\u00e9veloppeur:
+LAST_UPDATED\:=Derni\u00e8re mise \u00e0 jour:
+NO_PACKAGES_FOUND=Aucun paquet trouv\u00e9
+DEPENDANCY_INSTALL_WARNING=Attention: \"{0}\" appname d\u00e9pend des paquets suivants seront install\u00e9s et avec elle:
+NO_UPDATES_FOUND=Aucune mise \u00e0 jour introuvable
 MainView.installTable.columnModel.title2=Type
 MainView.installTable.columnModel.title1=Taille
 MainView.installTable.columnModel.title0=Nom
-Settings.title=Param\u00E8tres
+Settings.title=Param\u00e8tres
 Settings.jLabel1.text=Langue:
-MainView.jMenuItem8.text=Param\u00E8tres
-<SYSTEM_DEFAULT>=<Syst\u00E8me par d\u00E9faut>
+MainView.jMenuItem8.text=Param\u00e8tres
+<SYSTEM_DEFAULT>=<Syst\u00e8me par d\u00e9faut>
 ENGLISH=Anglais
-FRENCH=Fran\u00E7ais
+FRENCH=Fran\u00e7ais
 GERMAN=Allemande
-SIMPLIFIED_CHINESE=Chinois simplifi\u00E9
-THE_NEW_LANGUAGE_WILL_TAKE_EFFECT_THE_NEXT_TIME_WEBOS_QUICK_INSTALL_IS_LAUNCHED.=Le nouveau langue va entrer en vigueur la prochaine fois WebOS Quick Install est lanc\u00E9e.
-LANGUAGE_CHANGED.=Langue modifi\u00E9
+SIMPLIFIED_CHINESE=Chinois simplifi\u00e9
+THE_NEW_LANGUAGE_WILL_TAKE_EFFECT_THE_NEXT_TIME_WEBOS_QUICK_INSTALL_IS_LAUNCHED.=Le nouveau langue va entrer en vigueur la prochaine fois WebOS Quick Install est lanc\u00e9e.
+LANGUAGE_CHANGED.=Langue modifi\u00e9
 ERROR\:_INVALID_FEED_URL=ERREUR: URL de flux non valide
-CUSTOM_FEED_URL\:=URL de flux personnalis\u00E9es:
+CUSTOM_FEED_URL\:=URL de flux personnalis\u00e9es:
 EXIT=Quitter
 MainView.jMenuItem9.text=Ligne de commande Linux
-Settings.jLabel2.text=Flux par D\u00E9faut:
-Settings.jLabel3.text=Flux par Personnalis\u00E9:
+Settings.jLabel2.text=Flux par D\u00e9faut:
+Settings.jLabel3.text=Flux par Personnalis\u00e9:
 Settings.jButton1.text=Delete stored DevMode passwords
 FEED_PRECENTRAL=webOS Nation
 FEED_WEBOSINTERNALS=WebOS-Internals
 FEED_PATCHES=Tache de WebOS
 FEED_KERNELS=WebOS Kernels
 FEED_PRETHEMER=PreThemer
-FEED_PCTHEMES=Th\u00E8mes de webOS Nation
-FEED_CLOCK=Th\u00E8mes de Horlage
-Settings.jCheckBox1.text=<html>Supprimer les mots des passe stock\u00E9s DevMode
-RETRY=R\u00E9essayer
\ No newline at end of file
+FEED_PCTHEMES=Th\u00e8mes de webOS Nation
+FEED_CLOCK=Th\u00e8mes de Horlage
+Settings.jCheckBox1.text=<html>Supprimer les mots des passe stock\u00e9s DevMode
+RETRY=R\u00e9essayer
+DRIVER_INSTALLED_SUCCESSFULLY.=Driver install\u00e9 avec succ\u00e8s.
+ERROR\:_DRIVER_INSTALLATION_FAILED=ERREUR: L'installation du driver a \u00e9chou\u00e9
\ No newline at end of file
diff --git a/src/ca/canuckcoding/wosqi/Bundle_zh.properties b/src/ca/canuckcoding/wosqi/Bundle_zh.properties
new file mode 100644
index 0000000..35ae9ef
--- /dev/null
+++ b/src/ca/canuckcoding/wosqi/Bundle_zh.properties
@@ -0,0 +1,315 @@
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+
+MainView.jLabel2.text=\u8bbe\u5907:
+MainView.fileMenu.text=\u6587\u4ef6
+MainView.jLayeredPane7.border.title=\u4f9b\u5b89\u88c5\u7684\u6587\u4ef6
+MainView.jButton3.text=\u5b89\u88c5
+MainView.toolMenu.text=\u5de5\u5177
+MainView.helpMenu.text=\u5e2e\u52a9
+MainView.jMenuItem1.text=\u6dfb\u52a0\u6587\u4ef6...
+MainView.jMenuItem2.text=\u91cd\u5b89\u88c5Novacom\u9a71\u52a8
+MainView.jMenuItem3.text=\u53d1\u9001\u6587\u4ef6
+MainView.jMenuItem4.text=\u63a5\u6536\u6587\u4ef6
+MainView.jMenuItem5.text=\u8bbe\u5907\u7ba1\u7406
+MainView.jMenuItem6.text=\u4f7f\u7528
+MainView.jMenuItem7.text=\u653e\u5f03
+MainView.aboutMenuItem.text=\u5173\u4e8e
+DoctorDownloader.jLabel1.text_1=<html>Novacom\u4e0b\u8f7d\u4e2d
+Usage.jLayeredPane2.border.title=\u5982\u4f55\u4f7f\u7528
+Usage.jTextPane1.text=<html><body style="font:1em">\u672c\u7a0b\u5e8f\u6b63\u5e38\u8fd0\u884c\u524d\u63d0:<br/><ul><li/>\u5b89\u88c5Novacom\u9a71\u52a8<br/><br/>\u53ef\u70b9\u51fb\u9876\u90e8\u83dc\u5355\u9009\u62e9\u91cd\u65b0\u5b89\u88c5Novacom\u9a71\u52a8<br/><br/><li/>\u5df2\u5f00\u542f\u5f00\u53d1\u8005\u6a21\u5f0f<br/><br/>\u4e3b\u754c\u9762\u8fde\u7eed\u8f93\u5165"upupdowndownleftrightleftrightbastart"\u8c03\u51fa\u5f00\u53d1\u8005\u6a21\u5f0f\u9009\u9879<br/><br/><li/>\u624b\u673a\u63a5\u6570\u636e\u7ebf\u8fde\u7535\u8111\u540e\u9009\u62e9"Just charge".</ul></body>
+Usage.jTextPane1.contentType=text/html
+ReveiveFile.jLabel2.text=\u6587\u4ef6:
+ReceiveFile.jButton1.text=...
+ReveiveFile.jLabel1.text=\u76ee\u6807:
+ReceiveFile.jButton2.text=\u53d6\u81ea\u8bbe\u5907
+ReceiveFile.jButton3.text=\u53d6\u6d88
+SendFile.jButton1.text=...
+SendFile.jLabel2.text=\u6587\u4ef6:
+SendFile.jLabel1.text=\u76ee\u6807:
+SendFile.jButton3.text=\u53d6\u6d88
+SendFile.jButton2.text=\u53d1\u5f80\u8bbe\u5907
+DeviceManagement.jLabel2.text=
+DeviceManagement.jLabel3.text=
+DeviceManagement.jLabel9.text=
+DeviceManagement.jButton1.text=\u5378\u8f7d
+DeviceManagement.jLabel8.text=
+DeviceManagement.jLayeredPane3.border.title=\u7528\u6237\u5df2\u5b89\u88c5\u5185\u5bb9
+DeviceManagement.jLabel4.text=
+DeviceManagement.jLabel5.text=
+DeviceManagement.jTable1.columnModel.title1=
+DeviceManagement.jTable1.columnModel.title0=\u540d\u79f0
+DeviceManagement.jLayeredPane2.border.title=\u8bbe\u5907\u4fe1\u606f
+DeviceManagement.jLabel1.text=
+DeviceManagement.jLabel10.text=
+DeviceManagement.jLabel11.text=
+DeviceManagement.jLabel12.text=
+DeviceManagement.jLabel13.text=
+LOADING_LIST...=\u5217\u8868\u5bfc\u5165\u4e2d...
+{0}_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.={0} \u8fde\u63a5\u4e2d\u65ad,\u8bf7\u91cd\u8bd5
+DEVICE_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.=\u8fde\u63a5\u4e2d\u65ad,\u8bf7\u91cd\u8bd5
+DEVICE\:=\u8bbe\u5907:
+OS\:=\u64cd\u4f5c\u7cfb\u7edf:
+ARCHITECTURE\:=\u7ed3\u6784:
+BUILD_NAME\:=\u5efa\u7acb\u540d\u79f0:
+BUILD_TIME\:=\u5efa\u7acb\u65f6\u95f4:
+CPU_TYPE\:=CPU\u7c7b\u578b:
+CPU_SPEED\:=CPU\u901f\u5ea6:
+CPU_HARDWARE\:=CPU\u786c\u4ef6:
+MODEM_TYPE\:=\u732b\u7c7b\u578b:
+MODEM_FIRMWARE\:=\u732b\u56fa\u4ef6:
+DEPENDANT_PACKAGES_EXIST_WARNING=\u6ce8\u610f:\u4ee5\u4e0b\u6587\u4ef6\u4e0e\"{0}\"\u5173\u8054,\u5c06\u4f1a\u4e00\u8d77\u5220\u9664
+WARNING=\u6ce8\u610f
+PROCESSING_FINISHED_DOWNLOAD._THIS_MAY_TAKE_A_FEW_MINUTES.=\u7a0d\u7b49\u7247\u523b
+INSTALLING_DRIVER...=\u6b63\u5728\u5b89\u88c5\u9a71\u52a8...
+DRIVER_INSTALLED_SUCCESSFULLY.=\u9a71\u52a8\u5b89\u88c5\u6210\u529f.
+ERROR\:_DRIVER_INSTALLATION_FAILED=\u51fa\u9519:\u9a71\u52a8\u5b89\u88c5\u5931\u8d25
+ERROR\:=\u51fa\u9519:
+PLEASE_WAIT...=\u7a0d\u7b49...
+SELECT=\u9009\u62e9
+FILE_TRANSFERRED_SUCCESSFULLY.=\u6587\u4ef6\u4f20\u9001\u6210\u529f
+FILE_TRANSFER_FAILED.=\u6587\u4ef6\u4f20\u9001\u5931\u8d25
+SYSTEM_IS_BUSY._TRY_AGAIN_LATER.=\u7cfb\u7edf\u5fd9,\u7a0d\u540e\u518d\u8bd5.
+CONNECTING...=\u8fde\u63a5\u4e2d...
+DOWNLOADING\:=\u4e0b\u8f7d\u4e2d:
+TRANSFERRING_AND_APPLYING\:=\u4f20\u9001\u4e2d:
+TRANSFERRING\:=\u4f20\u9001\u4e2d:
+INSTALLING\:=\u5b89\u88c5\u4e2d:
+INSTALL=\u5b89\u88c5
+NO_DEVICES_ARE_CONNECTED._CONNECT_A_DEVICE_THEN_RELAUNCH_WEBOS_QUICK_INSTALL.=\u8bbe\u5907\u672a\u8fde\u63a5,\u8bf7\u8fde\u63a5\u540e\u518d\u6b21\u8fd0\u884c
+NO_DEVICES_FOUND=\u672a\u53d1\u73b0\u8bbe\u5907
+FULL_WOSQI_DISCLAIMER=\u7a0b\u5e8f\u6709\u98ce\u9669,\u540e\u679c\u9700\u81ea\u8d1f,\u8bf7\u8c28\u614e\u4f7f\u7528.
+DISCLAIMER=\u653e\u5f03
+FOR_WEBOS_QUICK_INSTALL_TO_RUN_CORRECTLY,_YOUR_COMPUTER_NEEDS_TO_HAVE_THE_NOVACOM_DRIVER_INSTALLED._WOULD_YOU_LIKE_TO_INSTALL_IT_NOW?=\u5b89\u88c5Novacom\u9a71\u52a8\u624d\u80fd\u7528,\u73b0\u5728\u5b89\u88c5\u5417?
+NOVACOM_DRIVER_MISSING=Novacom\u9a71\u52a8\u7f3a\u5931
+JAR_FILES_(*.JAR)=Jar\u6587\u4ef6(*.jar)
+WEBOS_FILES_(*.IPK,_*.PATCH,_*.DIFF)=webOS\u6587\u4ef6(*.ipk, *.patch, *.diff)
+REPEATING_CONNECTION_WARNING=\u8bf7\u8fde\u63a5\u597d\u8bbe\u5907\u518d\u7ee7\u7eed.
+WEBOS_DOCTOR_NEEDED_FOR_DRIVERS=\u9700\u8981\u9009\u62e9webOSDoctor\u4ee5\u5b89\u88c5Novacom\u9a71\u52a8.\u6ca1\u6709\u5c31\u73b0\u5728\u4e0b\u8f7d\u4e00\u4e2a.
+WEBOSDOCTOR_REQUIRED=\u9700\u8981webOSDoctor
+DOWNLOAD=\u4e0b\u8f7d
+SELECT_FILE...=\u9009\u62e9\u6587\u4ef6...
+CANCEL=\u53d6\u6d88
+InstalledPkgInfo.jLabel1.text=\u540d\u79f0:
+InstalledPkgInfo.jLabel2.text=\u7248\u672c:
+InstalledPkgInfo.jLabel4.text=ID:
+InstalledPkgInfo.jButton1.text=\u5173\u95ed
+InstalledPkgInfo.jLabel11.text=\u4f5c\u8005:
+InstalledPkgInfo.title=\u6587\u4ef6\u4fe1\u606f
+UNKNOWN=\u672a\u77e5
+InstalledPatchInfo.title=\u6587\u4ef6\u4fe1\u606f
+InstalledPatchInfo.jButton1.text=\u5173\u95ed
+InstalledPatchInfo.jLabel4.text=ID:
+InstalledPatchInfo.jLabel2.text=\u7248\u672c:
+InstalledPatchInfo.jLabel1.text=\u540d\u79f0:
+InstalledPatchInfo.jLabel5.text=\u63cf\u8ff0:
+InstalledPatchInfo.jLabel11.text=\u4f5c\u8005:
+About.closeButton.text=\u5173\u95ed
+About.jLabel5.text=\u5e2e\u52a9
+About.appVersionLabel.text=\u7248\u672c\u53f7 4.5.0
+About.jLabel2.text=\u7b80\u4f53\u4e2d\u6587\u7ffb\u8bd1:medigi8@twitter
+About.jLabel4.text=<html>\u7248\u6743\u5f52Jason Robitaille\u6240\u6709,\u76d7\u7248\u5fc5\u7a76.
+About.jLabel6.text=<html><p align="justify">\u6b64\u4e3a\u4e2a\u4eba\u4f5c\u54c1,\u4e0ePalm\u516c\u53f8\u65e0\u5173.Palm,Pre,Pixi,Veer,TouchPad\u548cWebOS\u6ce8\u518c\u5546\u6807\u5f52 Hewlett-Packard\u516c\u53f8\u6240\u6709.</p>
+FeedLoader.jLabel5.text=\u5206\u6790\u4e0b\u8f7d\u4e2d:
+FeedLoader.jLabel6.text=
+FeedViewer.jLayeredPane1.TabConstraints.tabTitle=\u66f4\u65b0
+FeedViewer.jLayeredPane2.TabConstraints.tabTitle=\u5e94\u7528\u8f6f\u4ef6
+FeedViewer.jLayeredPane3.TabConstraints.tabTitle=\u670d\u52a1
+FeedViewer.jLayeredPane4.TabConstraints.tabTitle=\u63d2\u4ef6
+FeedViewer.jLayeredPane5.TabConstraints.tabTitle=Linux\u8f6f\u4ef6
+FeedViewer.jLayeredPane6.TabConstraints.tabTitle=\u5185\u6838
+FeedViewer.jLayeredPane7.TabConstraints.tabTitle=\u8865\u4e01
+FeedViewer.jLayeredPane8.TabConstraints.tabTitle=\u4e3b\u9898
+FeedViewer.jTextField1.text=
+FeedViewer.jButton1.text=
+FeedViewer.jButton2.text=\u5b89\u88c5
+FeedViewer.jLabel1.text=<html>
+FeedViewer.jLabel2.text=<html>
+FeedViewer.jTextPane1.contentType=text/html
+FeedViewer.jTextPane1.text=<html>
+FeedViewer.jLabel4.text=<html><b>\u6e90:</b>
+FeedViewer.jLabel3.text=<html><b>\u8bb8\u53ef:</b>
+FeedViewer.jLabel5.text=<html><b>\u7248\u672c:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel6.text=<html><b>\u4e0a\u6b21\u4fee\u6539:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel8.text=<html><b>\u63cf\u8ff0:</b>
+FeedViewer.jLabel7.text=<html>
+FeedViewer.jLabel9.text=<html><b>\u4f5c\u8005:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel10.text=<html>
+FeedViewer.jLabel11.text=<html><a href="#">\u4e3b\u754c\u9762</a>
+FeedViewer.jTextField2.text=
+FeedViewer.jLabel22.text=<html><a href="#">\u4e3b\u754c\u9762</a>
+FeedViewer.jLabel21.text=<html>
+FeedViewer.jLabel20.text=<html><b>\u4f5c\u8005:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel19.text=<html>
+FeedViewer.jLabel18.text=<html><b>\u63cf\u8ff0:</b>
+FeedViewer.jLabel17.text=<html><b>\u4e0a\u6b21\u4fee\u6539:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel16.text=<html><b>\u7248\u672c:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel15.text=<html><b>\u8bb8\u53ef:</b>
+FeedViewer.jLabel14.text=<html><b>\u6e90:</b>
+FeedViewer.jTextPane2.text=<html>
+FeedViewer.jTextPane2.contentType=text/html
+FeedViewer.jLabel13.text=<html>
+FeedViewer.jLabel12.text=<html>
+FeedViewer.jButton4.text=\u5b89\u88c5
+FeedViewer.jButton3.text=
+FeedViewer.jLabel33.text=<html><a href="#">\u4e3b\u754c\u9762</a>
+FeedViewer.jLabel32.text=<html>
+FeedViewer.jLabel31.text=<html><b>\u4f5c\u8005:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel30.text=<html>
+FeedViewer.jLabel29.text=<html><b>\u63cf\u8ff0:</b>
+FeedViewer.jLabel28.text=<html><b>\u4e0a\u6b21\u4fee\u6539:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel27.text=<html><b>\u7248\u672c:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel26.text=<html><b>\u8bb8\u53ef:</b>
+FeedViewer.jLabel25.text=<html><b>\u6e90:</b>
+FeedViewer.jTextPane3.text=<html>
+FeedViewer.jTextPane3.contentType=text/html
+FeedViewer.jLabel24.text=<html>
+FeedViewer.jLabel23.text=<html>
+FeedViewer.jButton6.text=\u5b89\u88c5
+FeedViewer.jButton5.text=
+FeedViewer.jTextField3.text=
+FeedViewer.jLabel44.text=<html><a href="#">\u4e3b\u754c\u9762</a>
+FeedViewer.jLabel43.text=<html>
+FeedViewer.jLabel42.text=<html><b>\u4f5c\u8005:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel41.text=<html>
+FeedViewer.jLabel40.text=<html><b>\u63cf\u8ff0:</b>
+FeedViewer.jLabel39.text=<html><b>\u4e0a\u6b21\u4fee\u6539:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel38.text=<html><b>\u7248\u672c:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel37.text=<html><b>\u8bb8\u53ef:</b>
+FeedViewer.jLabel36.text=<html><b>\u6e90:</b>
+FeedViewer.jTextPane4.text=<html>
+FeedViewer.jTextPane4.contentType=text/html
+FeedViewer.jLabel35.text=<html>
+FeedViewer.jLabel34.text=<html>
+FeedViewer.jButton8.text=\u5b89\u88c5
+FeedViewer.jButton7.text=
+FeedViewer.jTextField4.text=
+FeedViewer.jTextField5.text=
+FeedViewer.jLabel55.text=<html><a href="#">\u4e3b\u754c\u9762</a>
+FeedViewer.jLabel54.text=<html>
+FeedViewer.jLabel53.text=<html><b>\u4f5c\u8005:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel52.text=<html>
+FeedViewer.jLabel51.text=<html><b>\u63cf\u8ff0:</b>
+FeedViewer.jLabel50.text=<html><b>\u4e0a\u6b21\u4fee\u6539:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel49.text=<html><b>\u7248\u672c:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel48.text=<html><b>\u8bb8\u53ef:</b>
+FeedViewer.jLabel47.text=<html><b>\u6e90:</b>
+FeedViewer.jTextPane5.text=<html>
+FeedViewer.jTextPane5.contentType=text/html
+FeedViewer.jLabel46.text=<html>
+FeedViewer.jLabel45.text=<html>
+FeedViewer.jButton10.text=\u5b89\u88c5
+FeedViewer.jButton9.text=
+FeedViewer.jLabel66.text=<html><a href="#">\u4e3b\u754c\u9762</a>
+FeedViewer.jLabel65.text=<html>
+FeedViewer.jLabel64.text=<html><b>\u4f5c\u8005:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel63.text=<html>
+FeedViewer.jLabel62.text=<html><b>\u63cf\u8ff0:</b>
+FeedViewer.jLabel61.text=<html><b>\u4e0a\u6b21\u4fee\u6539:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel60.text=<html><b>\u7248\u672c:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel59.text=<html><b>\u8bb8\u53ef:</b>
+FeedViewer.jLabel58.text=<html><b>\u6e90:</b>
+FeedViewer.jTextPane6.text=<html>
+FeedViewer.jTextPane6.contentType=text/html
+FeedViewer.jLabel57.text=<html>
+FeedViewer.jLabel56.text=<html>
+FeedViewer.jButton12.text=\u5b89\u88c5
+FeedViewer.jButton11.text=
+FeedViewer.jTextField6.text=
+FeedViewer.jLabel77.text=<html><a href="#">\u4e3b\u754c\u9762</a>
+FeedViewer.jLabel76.text=<html>
+FeedViewer.jLabel75.text=<html><b>\u4f5c\u8005:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel74.text=<html>
+FeedViewer.jLabel73.text=<html><b>\u63cf\u8ff0:</b>
+FeedViewer.jLabel72.text=<html><b>\u4e0a\u6b21\u4fee\u6539:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel71.text=<html><b>\u7248\u672c:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel70.text=<html><b>\u8bb8\u53ef:</b>
+FeedViewer.jLabel69.text=<html><b>\u6e90:</b>
+FeedViewer.jTextPane7.text=<html>
+FeedViewer.jTextPane7.contentType=text/html
+FeedViewer.jLabel68.text=<html>
+FeedViewer.jLabel67.text=<html>
+FeedViewer.jButton14.text=\u5b89\u88c5
+FeedViewer.jButton13.text=
+FeedViewer.jTextField7.text=
+FeedViewer.jLabel88.text=<html><a href="#">\u4e3b\u754c\u9762</a>
+FeedViewer.jLabel87.text=<html>
+FeedViewer.jLabel86.text=<html><b>\u4f5c\u8005:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel85.text=<html>
+FeedViewer.jLabel84.text=<html><b>\u63cf\u8ff0:</b>
+FeedViewer.jLabel83.text=<html><b>\u4e0a\u6b21\u4fee\u6539:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel82.text=<html><b>\u7248\u672c:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel81.text=<html><b>\u8bb8\u53ef:</b>
+FeedViewer.jLabel80.text=<html><b>\u6e90:</b>
+FeedViewer.jTextPane8.text=<html>
+FeedViewer.jTextPane8.contentType=text/html
+FeedViewer.jLabel79.text=<html>
+FeedViewer.jLabel78.text=
+FeedViewer.jButton16.text=\u66f4\u65b0
+FeedViewer.jLayeredPane9.TabConstraints.tabTitle=Linux\u540e\u53f0\u7a0b\u5e8f
+FeedViewer.jLabel99.text=<html><a href="#">\u4e3b\u754c\u9762</a>
+FeedViewer.jLabel98.text=<html>
+FeedViewer.jLabel97.text=<html><b>\u4f5c\u8005:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel96.text=<html>
+FeedViewer.jLabel95.text=<html><b>\u63cf\u8ff0:</b>
+FeedViewer.jLabel94.text=<html><b>\u4e0a\u6b21\u4fee\u6539:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel93.text=<html><b>\u7248\u672c:</b> &nbsp;&nbsp;&nbsp;
+FeedViewer.jLabel92.text=<html><b>\u8bb8\u53ef:</b>
+FeedViewer.jLabel91.text=<html><b>\u6e90:</b>
+FeedViewer.jTextPane9.text=<html>
+FeedViewer.jTextPane9.contentType=text/html
+FeedViewer.jLabel90.text=<html>
+FeedViewer.jLabel89.text=<html>
+FeedViewer.jButton18.text=\u5b89\u88c5
+FeedViewer.jButton17.text=
+FeedViewer.jTextField9.text=
+SendFile.title=\u53d1\u9001\u6587\u4ef6
+ReceiveFile.title=\u63a5\u6536\u6587\u4ef6
+FeedViewer.availablePackagesTabs.TabConstraints.tabTitle=\u53ef\u7528\u8f6f\u4ef6\u5305
+Installer.jLabel5.text=
+FeedViewer.jButton15.text=\u5168\u90e8\u66f4\u65b0
+ALL=\u5168\u90e8
+WEBOS_PACKAGE_FILE=WebOS\u8f6f\u4ef6\u5305\u6587\u4ef6
+WEBOS_PATCH_FILE=WebOS\u8865\u4e01\u6587\u4ef6
+WEBOS_DIFF_FILE=WebOS Diff\u6587\u4ef6
+UNKNOWN_FILE=\u672a\u77e5\u6587\u4ef6
+ERROR\:_FEED_LOADING_FAILED=\u51fa\u9519:\u5bfc\u5165\u6e90\u65f6\u5931\u8d25
+ERROR\:_DRIVER_INSTALLATION_FAILED=\u51fa\u9519:\u9a71\u52a8\u5b89\u88c5\u5931\u8d25
+ERROR\:_UNABLE_TO_DOWNLOAD_{0}=\u51fa\u9519:\u65e0\u6cd5\u4e0b\u8f7d{0}
+VERSION\:=\u7248\u672c:
+DEVELOPER\:=\u4f5c\u8005:
+LAST_UPDATED\:=\u4e0a\u6b21\u4fee\u6539:
+NO_PACKAGES_FOUND=\u672a\u53d1\u73b0\u8f6f\u4ef6\u5305
+DEPENDANCY_INSTALL_WARNING=\u8b66\u544a:\u4ee5\u4e0b\u6587\u4ef6\u4e0e{0}\u5173\u8054,\u5c06\u4f1a\u4e00\u5e76\u5b89\u88c5
+NO_UPDATES_FOUND=\u672a\u53d1\u73b0\u66f4\u65b0
+MainView.installTable.columnModel.title2=\u7c7b\u578b
+MainView.installTable.columnModel.title1=\u5927\u5c0f
+MainView.installTable.columnModel.title0=\u540d\u79f0
+Settings.title=\u8bbe\u7f6e
+Settings.jLabel1.text=\u8bed\u8a00:
+MainView.jMenuItem8.text=\u8bbe\u7f6e
+<SYSTEM_DEFAULT>=<\u7cfb\u7edf\u9ed8\u8ba4>
+ENGLISH=\u82f1\u8bed
+FRENCH=\u6cd5\u8bed
+GERMAN=\u5fb7\u8bed
+SIMPLIFIED_CHINESE=\u7b80\u4f53\u4e2d\u6587
+THE_NEW_LANGUAGE_WILL_TAKE_EFFECT_THE_NEXT_TIME_WEBOS_QUICK_INSTALL_IS_LAUNCHED.=\u66f4\u6539\u8bed\u8a00\u540e\u9700\u91cd\u542f\u7a0b\u5e8f.
+LANGUAGE_CHANGED.=\u8bed\u8a00\u5df2\u66f4\u6539
+ERROR\:_INVALID_FEED_URL=\u51fa\u9519:\u65e0\u6548\u5730\u5740
+CUSTOM_FEED_URL\:=\u9972\u6599\u5730\u5740:
+EXIT=\u9000\u51fa
+MainView.jMenuItem9.text=Linux\u547d\u4ee4\u884c
+Settings.jLabel2.text=\u9ed8\u8ba4\u6e90:
+Settings.jLabel3.text=\u81ea\u5b9a\u4e49\u6e90:
+Settings.jButton1.text=\u5220\u9664\u5df2\u5b58\u5f00\u53d1\u8005\u6a21\u5f0f\u5bc6\u7801
+FEED_PRECENTRAL=webOS Nation
+FEED_WEBOSINTERNALS=WebOS-Internals
+FEED_PATCHES=WebOS\u8865\u4e01
+FEED_KERNELS=WebOS\u5185\u6838
+FEED_PRETHEMER=\u4e3b\u9898
+FEED_PCTHEMES=webOS Nation \u4e3b\u9898
+FEED_CLOCK=\u65f6\u949f\u4e3b\u9898
+Settings.jCheckBox1.text=<html>\u5c3d\u53ef\u80fd\u4f7f\u7528\u8bbe\u5907\u540d\u79f0
+OK=\u597d
+DRIVER_INSTALLED_SUCCESSFULLY.=\u9a71\u52a8\u5b89\u88c5\u6210\u529f.
+ERROR\:_DRIVER_INSTALLATION_FAILED=\u51fa\u9519:\u9a71\u52a8\u5b89\u88c5\u5931\u8d25
\ No newline at end of file
diff --git a/src/ca/canucksoftware/wosqi/DeviceManagement.form b/src/ca/canuckcoding/wosqi/DeviceManagement.form
similarity index 69%
rename from src/ca/canucksoftware/wosqi/DeviceManagement.form
rename to src/ca/canuckcoding/wosqi/DeviceManagement.form
index 75f3a99..daf1555 100644
--- a/src/ca/canucksoftware/wosqi/DeviceManagement.form
+++ b/src/ca/canuckcoding/wosqi/DeviceManagement.form
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.6" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jMenuItem5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
     </Property>
     <Property name="modal" type="boolean" value="true"/>
     <Property name="name" type="java.lang.String" value="aboutBox" noResource="true"/>
@@ -12,6 +12,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="windowClosing" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowClosing"/>
@@ -51,14 +52,16 @@
         <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jLayeredPane1KeyTyped"/>
       </Events>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Container class="javax.swing.JLayeredPane" name="jLayeredPane3">
           <Properties>
             <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
               <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
                 <TitledBorder title="User-Installed Content">
-                  <ResourceString PropertyName="titleX" bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLayeredPane3.border.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString PropertyName="titleX" bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLayeredPane3.border.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </TitledBorder>
               </Border>
             </Property>
@@ -68,12 +71,14 @@
             <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLayeredPane3MouseClicked"/>
           </Events>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="320" y="10" width="280" height="360" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="320" y="10" width="280" height="360"/>
             </Constraint>
           </Constraints>
 
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
           <SubComponents>
             <Container class="javax.swing.JScrollPane" name="jScrollPane1">
               <Properties>
@@ -83,8 +88,8 @@
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="50" width="240" height="260" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="50" width="240" height="260"/>
                 </Constraint>
               </Constraints>
 
@@ -102,14 +107,14 @@
                       <TableColumnModel selectionModel="0">
                         <Column maxWidth="-1" minWidth="-1" prefWidth="250" resizable="false">
                           <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                            <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jTable1.columnModel.title0" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                            <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jTable1.columnModel.title0" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                           </Title>
                           <Editor/>
                           <Renderer/>
                         </Column>
                         <Column maxWidth="-1" minWidth="-1" prefWidth="50" resizable="false">
                           <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                            <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jTable1.columnModel.title1" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                            <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jTable1.columnModel.title1" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                           </Title>
                           <Editor/>
                           <Renderer/>
@@ -154,8 +159,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox1ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="154" y="20" width="100" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="154" y="20" width="100" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -165,7 +170,7 @@
                   <action class="ca.canucksoftware.WebOSQuickInstallManage" id="uninstall" methodName="uninstall"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="focusable" type="boolean" value="false"/>
                 <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
@@ -174,8 +179,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="150" y="320" width="110" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="150" y="320" width="110" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -186,7 +191,7 @@
             <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
               <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
                 <TitledBorder title="Device Info">
-                  <ResourceString PropertyName="titleX" bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLayeredPane2.border.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString PropertyName="titleX" bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLayeredPane2.border.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </TitledBorder>
               </Border>
             </Property>
@@ -196,12 +201,14 @@
             <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLayeredPane2MouseClicked"/>
           </Events>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="20" y="10" width="280" height="360" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="20" y="10" width="280" height="360"/>
             </Constraint>
           </Constraints>
 
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
           <SubComponents>
             <Component class="javax.swing.JLabel" name="jLabel7">
               <Properties>
@@ -209,151 +216,151 @@
                 <Property name="name" type="java.lang.String" value="jLabel7" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="190" y="20" width="70" height="70" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="190" y="20" width="70" height="70"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel3">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="180" width="250" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="180" width="250" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel13">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel13.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel13.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel13" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="300" width="250" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="300" width="250" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel8">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel8.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel8.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel8" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="240" width="250" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="240" width="250" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel12">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel12.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel12.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel12" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="270" width="250" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="270" width="250" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel11">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel11.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel11.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel11" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="330" width="250" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="330" width="250" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel9">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel9" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="210" width="250" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="210" width="250" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel4">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel4" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="150" width="250" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="150" width="250" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel1">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="60" width="170" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="60" width="170" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel10">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel10.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel10.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel10" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="120" width="250" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="120" width="250" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel2">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="30" width="170" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="30" width="170" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JLabel" name="jLabel5">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="DeviceManagement.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="DeviceManagement.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel5" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="90" width="170" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="90" width="170" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
diff --git a/src/ca/canucksoftware/wosqi/DeviceManagement.java b/src/ca/canuckcoding/wosqi/DeviceManagement.java
similarity index 94%
rename from src/ca/canucksoftware/wosqi/DeviceManagement.java
rename to src/ca/canuckcoding/wosqi/DeviceManagement.java
index 99cb02d..644ae12 100644
--- a/src/ca/canucksoftware/wosqi/DeviceManagement.java
+++ b/src/ca/canuckcoding/wosqi/DeviceManagement.java
@@ -2,11 +2,11 @@
  * WebOSQuickInstallAboutBox.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.webos.InstalledEntry;
-import ca.canucksoftware.webos.DeviceInfo;
-import ca.canucksoftware.webos.WebOSConnection;
+import ca.canuckcoding.webos.InstalledEntry;
+import ca.canuckcoding.webos.DeviceInfo;
+import ca.canuckcoding.webos.WebOSConnection;
 import java.awt.Color;
 import java.net.URL;
 import java.text.MessageFormat;
@@ -58,7 +58,7 @@ public class DeviceManagement extends javax.swing.JDialog {
             t.schedule(new DoDispose(), 200);
         } else {
             t.schedule(new DoLoadDetails(), 100);
-            webOS.configIpkg();
+            webOS.configPkgMgr();
         }
     }
 
@@ -82,12 +82,16 @@ public class DeviceManagement extends javax.swing.JDialog {
             imgURL = getClass().getResource("resources/HP TouchPad 64x64.png");
         } else if(info.model().equals(DeviceInfo.Model.HP_Pre_3.toString())) {
             imgURL = getClass().getResource("resources/HP Pre 3 64x64.png");
-        } else { //unknown
-            imgURL = getClass().getResource("resources/Palm Pre 2 64x64.png");
+        } else if(info.model().equals(DeviceInfo.Model.Samsung_Galaxy_Nexus.toString())
+                || info.model().equals(DeviceInfo.Model.LG_Nexus_4.toString())
+                || info.model().equals(DeviceInfo.Model.Asus_Nexus_7.toString())) {
+            imgURL = getClass().getResource("resources/LuneOS 64x64.png");
+        } else { //unknown/Open webOS generic
+            imgURL = getClass().getResource("resources/Open webOS 64x64.png");
         }
         jLabel7.setIcon(new ImageIcon(imgURL));
         jLabel2.setText(bundle.getString("DEVICE:") + "    " + info.name());
-        jLabel1.setText(bundle.getString("OS:") + "    webOS " + info.version());
+        jLabel1.setText(bundle.getString("OS:") + "    " + info.os());
         jLabel5.setText(bundle.getString("ARCHITECTURE:") + "    " + info.arch());
         jLabel10.setText(bundle.getString("BUILD_NAME:") + "    " + info.buildName());
         jLabel4.setText(bundle.getString("BUILD_TIME:") + "    " + info.buildTime());
@@ -136,13 +140,17 @@ public class DeviceManagement extends javax.swing.JDialog {
                 for(int i=0; i<pkgs.size(); i++) {
                     InstalledEntry curr = pkgs.get(i);
                     String name = curr.getName();
-                    if(name.equals("This is a webOS application.")) {
+                    if(name.equals("This is a webOS application.") || name.equals("Unknown")) {
                         if(apps!=null) {
                             JSONObject json = getAppInfoFromId(curr.getId());
-                            try {
-                                curr.setName(json.getString("title"));
-                                curr.setDeveloper(json.getString("vendor"));
-                            } catch(Exception e) {}
+                            if(json!=null) {
+                                try {
+                                    curr.setName(json.getString("title"));
+                                    curr.setDeveloper(json.getString("vendor"));
+                                } catch(Exception e) {}
+                            } else {
+                                curr.setName(curr.getName(webOS));
+                            }
                         } else {
                             curr.setName(curr.getName(webOS));
                         }
@@ -159,7 +167,8 @@ public class DeviceManagement extends javax.swing.JDialog {
         for(int i=0; i<pkgs.size(); i++) {
             InstalledEntry curr = pkgs.get(i);
             if((jComboBox1.getSelectedIndex()==1)==
-                    (curr.getId().startsWith("ca.canucksoftware.patches.") ||
+                    (curr.getId().startsWith("ca.canuckcoding.patches.") ||
+                    curr.getId().startsWith("ca.canucksoftware.patches.") ||
                     curr.getId().startsWith("org.webosinternals.patches."))) {
                 filtered.add(curr);
                 modTable.addRow(new Object[] {curr.getName(), Boolean.FALSE});
@@ -437,7 +446,7 @@ public class DeviceManagement extends javax.swing.JDialog {
         jComboBox1.setBounds(154, 20, 100, 20);
         jLayeredPane3.add(jComboBox1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(ca.canucksoftware.wosqi.WebOSQuickInstallApp.class).getContext().getActionMap(DeviceManagement.class, this);
+        javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(ca.canuckcoding.wosqi.WebOSQuickInstallApp.class).getContext().getActionMap(DeviceManagement.class, this);
         jButton1.setAction(actionMap.get("uninstall")); // NOI18N
         jButton1.setText(bundle.getString("DeviceManagement.jButton1.text")); // NOI18N
         jButton1.setFocusable(false);
diff --git a/src/ca/canucksoftware/wosqi/FeedLoader.form b/src/ca/canuckcoding/wosqi/FeedLoader.form
similarity index 85%
rename from src/ca/canucksoftware/wosqi/FeedLoader.form
rename to src/ca/canuckcoding/wosqi/FeedLoader.form
index 29c4020..b625adf 100644
--- a/src/ca/canucksoftware/wosqi/FeedLoader.form
+++ b/src/ca/canuckcoding/wosqi/FeedLoader.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="0"/>
     <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
@@ -22,6 +22,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="windowActivated" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowActivated"/>
@@ -79,7 +80,9 @@
         <Property name="opaque" type="boolean" value="true"/>
       </Properties>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Container class="javax.swing.JScrollPane" name="jScrollPane2">
           <Properties>
@@ -94,8 +97,8 @@
             <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
           </AuxValues>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="20" width="240" height="30" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="20" width="240" height="30"/>
             </Constraint>
           </Constraints>
 
@@ -126,16 +129,16 @@
           <Properties>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/activity.gif"/>
+              <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/activity.gif"/>
             </Property>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedLoader.jLabel6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedLoader.jLabel6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel6" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="0" y="48" width="260" height="20" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="0" y="48" width="260" height="20"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -148,13 +151,13 @@
             </Property>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedLoader.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedLoader.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel5" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="0" width="240" height="20" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="0" width="240" height="20"/>
             </Constraint>
           </Constraints>
         </Component>
diff --git a/src/ca/canucksoftware/wosqi/FeedLoader.java b/src/ca/canuckcoding/wosqi/FeedLoader.java
similarity index 92%
rename from src/ca/canucksoftware/wosqi/FeedLoader.java
rename to src/ca/canuckcoding/wosqi/FeedLoader.java
index 706e1da..023f924 100644
--- a/src/ca/canucksoftware/wosqi/FeedLoader.java
+++ b/src/ca/canuckcoding/wosqi/FeedLoader.java
@@ -2,11 +2,11 @@
  * WebOSQuickInstallAboutBox.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.ipkg.PackageManager;
-import ca.canucksoftware.webos.DeviceInfo;
-import ca.canucksoftware.webos.WebOSConnection;
+import ca.canuckcoding.ipkg.PackageManager;
+import ca.canuckcoding.webos.DeviceInfo;
+import ca.canuckcoding.webos.WebOSConnection;
 import java.text.MessageFormat;
 import java.util.ResourceBundle;
 import java.util.Timer;
@@ -89,7 +89,7 @@ public class FeedLoader extends javax.swing.JDialog {
         jTextArea2.setBackground(new java.awt.Color(219, 219, 219));
         jTextArea2.setColumns(20);
         jTextArea2.setEditable(false);
-        jTextArea2.setFont(new java.awt.Font("Tahoma", 0, 11));
+        jTextArea2.setFont(new java.awt.Font("Tahoma", 0, 11)); // NOI18N
         jTextArea2.setLineWrap(true);
         jTextArea2.setRows(2);
         jTextArea2.setWrapStyleWord(true);
@@ -97,22 +97,22 @@ public class FeedLoader extends javax.swing.JDialog {
         jTextArea2.setName("jTextArea2"); // NOI18N
         jScrollPane2.setViewportView(jTextArea2);
 
+        jLayeredPane1.add(jScrollPane2);
         jScrollPane2.setBounds(10, 20, 240, 30);
-        jLayeredPane1.add(jScrollPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel6.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel6.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/activity.gif"))); // NOI18N
+        jLabel6.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/activity.gif"))); // NOI18N
         jLabel6.setText(bundle.getString("FeedLoader.jLabel6.text")); // NOI18N
         jLabel6.setName("jLabel6"); // NOI18N
+        jLayeredPane1.add(jLabel6);
         jLabel6.setBounds(0, 48, 260, 20);
-        jLayeredPane1.add(jLabel6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel5.setFont(jLabel5.getFont().deriveFont(jLabel5.getFont().getStyle() | java.awt.Font.BOLD));
         jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         jLabel5.setText(bundle.getString("FeedLoader.jLabel5.text")); // NOI18N
         jLabel5.setName("jLabel5"); // NOI18N
+        jLayeredPane1.add(jLabel5);
         jLabel5.setBounds(10, 0, 240, 20);
-        jLayeredPane1.add(jLabel5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
diff --git a/src/ca/canucksoftware/wosqi/FeedViewer.form b/src/ca/canuckcoding/wosqi/FeedViewer.form
similarity index 72%
rename from src/ca/canucksoftware/wosqi/FeedViewer.form
rename to src/ca/canuckcoding/wosqi/FeedViewer.form
index 8865c05..adc2d06 100644
--- a/src/ca/canucksoftware/wosqi/FeedViewer.form
+++ b/src/ca/canuckcoding/wosqi/FeedViewer.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="iconImage" type="java.awt.Image" editor="org.netbeans.modules.form.ComponentChooserEditor">
@@ -12,6 +12,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
@@ -80,7 +81,7 @@
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
               <JTabbedPaneConstraints tabName="Available Packages">
                 <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.availablePackagesTabs.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.availablePackagesTabs.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </JTabbedPaneConstraints>
             </Constraint>
@@ -99,13 +100,15 @@
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Applications">
                     <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane2.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane2.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                   </JTabbedPaneConstraints>
                 </Constraint>
               </Constraints>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+                <Property name="useNullLayout" type="boolean" value="true"/>
+              </Layout>
               <SubComponents>
                 <Component class="javax.swing.JLabel" name="jLabel5">
                   <Properties>
@@ -115,14 +118,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel5" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="80" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="80" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -134,24 +137,24 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel9" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="110" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="110" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JButton" name="jButton1">
                   <Properties>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/find.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/find.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
@@ -160,8 +163,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="150" y="54" width="30" height="25" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="150" y="54" width="30" height="25"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -173,21 +176,21 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel4" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="350" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="350" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JTextField" name="jTextField1">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextField1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextField1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jTextField1" noResource="true"/>
                   </Properties>
@@ -195,8 +198,8 @@
                     <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jTextField1KeyTyped"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="55" width="140" height="23" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="55" width="140" height="23"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -208,13 +211,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="10" width="280" height="70" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="10" width="280" height="70"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -226,14 +229,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel6" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="140" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="140" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -250,8 +253,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox1ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="20" width="170" height="-1" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="20" width="170" height="-1"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -261,8 +264,8 @@
                     <Property name="name" type="java.lang.String" value="jSeparator1" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="200" y="20" width="10" height="390" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="200" y="20" width="10" height="390"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -280,8 +283,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="200" width="280" height="170" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="200" width="280" height="170"/>
                     </Constraint>
                   </Constraints>
 
@@ -293,7 +296,7 @@
                           <Border info="null"/>
                         </Property>
                         <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane1.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane1.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="editable" type="boolean" value="false"/>
                         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
@@ -302,7 +305,7 @@
                           </FontInfo>
                         </Property>
                         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="name" type="java.lang.String" value="jTextPane1" noResource="true"/>
                         <Property name="opaque" type="boolean" value="false"/>
@@ -321,13 +324,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="290" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="290" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -339,14 +342,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel10.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel10.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel10" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="310" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="310" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -358,13 +361,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel8.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel8.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel8" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="170" width="140" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="170" width="140" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -372,16 +375,16 @@
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="0"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/no-screenshot.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/no-screenshot.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="10" width="180" height="240" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="10" width="180" height="240"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -394,10 +397,10 @@
                     </Property>
                     <Property name="horizontalAlignment" type="int" value="2"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/url-icon.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/url-icon.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel11.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel11.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="horizontalTextPosition" type="int" value="2"/>
                     <Property name="name" type="java.lang.String" value="jLabel11" noResource="true"/>
@@ -406,8 +409,8 @@
                     <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel11MouseClicked"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="260" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="260" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -419,14 +422,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel7.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel7.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel7" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="370" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="370" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -441,7 +444,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton2" noResource="true"/>
@@ -450,8 +453,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="370" y="380" width="90" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="370" y="380" width="90" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -463,8 +466,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="90" width="170" height="320" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="90" width="170" height="320"/>
                     </Constraint>
                   </Constraints>
 
@@ -497,13 +500,15 @@
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Services">
                     <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane3.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane3.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                   </JTabbedPaneConstraints>
                 </Constraint>
               </Constraints>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+                <Property name="useNullLayout" type="boolean" value="true"/>
+              </Layout>
               <SubComponents>
                 <Component class="javax.swing.JLabel" name="jLabel20">
                   <Properties>
@@ -513,14 +518,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel20.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel20.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel20" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="110" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="110" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -532,13 +537,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel15.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel15.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel15" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="290" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="290" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -555,8 +560,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="200" width="280" height="170" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="200" width="280" height="170"/>
                     </Constraint>
                   </Constraints>
 
@@ -568,7 +573,7 @@
                           <Border info="null"/>
                         </Property>
                         <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane2.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane2.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="editable" type="boolean" value="false"/>
                         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
@@ -577,7 +582,7 @@
                           </FontInfo>
                         </Property>
                         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="name" type="java.lang.String" value="jTextPane2" noResource="true"/>
                         <Property name="opaque" type="boolean" value="false"/>
@@ -596,14 +601,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel17.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel17.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel17" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="140" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="140" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -611,23 +616,23 @@
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="0"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/no-screenshot.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/no-screenshot.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel12.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel12.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel12" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="10" width="180" height="240" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="10" width="180" height="240"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JTextField" name="jTextField2">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextField2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextField2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jTextField2" noResource="true"/>
                   </Properties>
@@ -635,8 +640,8 @@
                     <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jTextField2KeyTyped"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="55" width="140" height="23" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="55" width="140" height="23"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -648,14 +653,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel16.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel16.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel16" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="80" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="80" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -667,14 +672,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel21.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel21.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel21" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="310" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="310" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -691,8 +696,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox2ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="20" width="170" height="-1" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="20" width="170" height="-1"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -704,14 +709,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel19.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel19.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel19" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="370" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="370" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -723,14 +728,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel14.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel14.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel14" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="350" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="350" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -740,8 +745,8 @@
                     <Property name="name" type="java.lang.String" value="jSeparator2" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="200" y="20" width="10" height="390" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="200" y="20" width="10" height="390"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -753,23 +758,23 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel18.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel18.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel18" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="170" width="140" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="170" width="140" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JButton" name="jButton3">
                   <Properties>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/find.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/find.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton3" noResource="true"/>
@@ -778,8 +783,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton3ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="150" y="54" width="30" height="25" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="150" y="54" width="30" height="25"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -791,8 +796,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="90" width="170" height="320" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="90" width="170" height="320"/>
                     </Constraint>
                   </Constraints>
 
@@ -820,13 +825,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel13.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel13.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel13" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="10" width="280" height="70" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="10" width="280" height="70"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -839,10 +844,10 @@
                     </Property>
                     <Property name="horizontalAlignment" type="int" value="2"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/url-icon.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/url-icon.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel22.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel22.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="horizontalTextPosition" type="int" value="2"/>
                     <Property name="name" type="java.lang.String" value="jLabel22" noResource="true"/>
@@ -851,8 +856,8 @@
                     <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel22MouseClicked"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="260" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="260" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -867,7 +872,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton4" noResource="true"/>
@@ -876,8 +881,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton4ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="370" y="380" width="90" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="370" y="380" width="90" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -894,13 +899,15 @@
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Plugins">
                     <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane4.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane4.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                   </JTabbedPaneConstraints>
                 </Constraint>
               </Constraints>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+                <Property name="useNullLayout" type="boolean" value="true"/>
+              </Layout>
               <SubComponents>
                 <Container class="javax.swing.JScrollPane" name="jScrollPane6">
                   <Properties>
@@ -915,8 +922,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="200" width="280" height="170" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="200" width="280" height="170"/>
                     </Constraint>
                   </Constraints>
 
@@ -928,7 +935,7 @@
                           <Border info="null"/>
                         </Property>
                         <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane3.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane3.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="editable" type="boolean" value="false"/>
                         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
@@ -937,7 +944,7 @@
                           </FontInfo>
                         </Property>
                         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="name" type="java.lang.String" value="jTextPane3" noResource="true"/>
                         <Property name="opaque" type="boolean" value="false"/>
@@ -956,8 +963,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="90" width="170" height="320" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="90" width="170" height="320"/>
                     </Constraint>
                   </Constraints>
 
@@ -985,13 +992,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel29.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel29.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel29" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="170" width="140" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="170" width="140" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1003,14 +1010,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel32.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel32.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel32" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="310" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="310" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1022,23 +1029,23 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel26.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel26.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel26" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="290" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="290" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JButton" name="jButton5">
                   <Properties>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/find.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/find.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton5" noResource="true"/>
@@ -1047,8 +1054,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton5ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="150" y="54" width="30" height="25" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="150" y="54" width="30" height="25"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1063,7 +1070,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton6" noResource="true"/>
@@ -1072,8 +1079,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton6ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="370" y="380" width="90" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="370" y="380" width="90" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1085,14 +1092,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel27.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel27.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel27" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="80" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="80" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1105,10 +1112,10 @@
                     </Property>
                     <Property name="horizontalAlignment" type="int" value="2"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/url-icon.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/url-icon.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel33.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel33.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="horizontalTextPosition" type="int" value="2"/>
                     <Property name="name" type="java.lang.String" value="jLabel33" noResource="true"/>
@@ -1117,8 +1124,8 @@
                     <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel33MouseClicked"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="260" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="260" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1130,14 +1137,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel30.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel30.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel30" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="370" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="370" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1147,15 +1154,15 @@
                     <Property name="name" type="java.lang.String" value="jSeparator3" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="200" y="20" width="10" height="390" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="200" y="20" width="10" height="390"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JTextField" name="jTextField3">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextField3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextField3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jTextField3" noResource="true"/>
                   </Properties>
@@ -1163,8 +1170,8 @@
                     <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jTextField3KeyTyped"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="55" width="140" height="23" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="55" width="140" height="23"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1172,16 +1179,16 @@
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="0"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/no-screenshot.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/no-screenshot.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel23.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel23.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel23" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="10" width="180" height="240" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="10" width="180" height="240"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1198,8 +1205,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox3ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="20" width="170" height="-1" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="20" width="170" height="-1"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1211,13 +1218,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel24.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel24.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel24" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="10" width="280" height="70" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="10" width="280" height="70"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1229,14 +1236,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel31.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel31.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel31" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="110" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="110" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1248,14 +1255,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel28.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel28.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel28" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="140" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="140" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1267,14 +1274,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel25.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel25.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel25" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="350" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="350" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1291,13 +1298,15 @@
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Linux Apps">
                     <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane5.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane5.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                   </JTabbedPaneConstraints>
                 </Constraint>
               </Constraints>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+                <Property name="useNullLayout" type="boolean" value="true"/>
+              </Layout>
               <SubComponents>
                 <Container class="javax.swing.JScrollPane" name="jScrollPane7">
                   <Properties>
@@ -1307,8 +1316,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="90" width="170" height="320" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="90" width="170" height="320"/>
                     </Constraint>
                   </Constraints>
 
@@ -1334,18 +1343,18 @@
                     <Property name="name" type="java.lang.String" value="jSeparator4" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="200" y="20" width="10" height="390" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="200" y="20" width="10" height="390"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JButton" name="jButton7">
                   <Properties>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/find.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/find.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton7.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton7.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton7" noResource="true"/>
@@ -1354,8 +1363,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton7ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="150" y="54" width="30" height="25" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="150" y="54" width="30" height="25"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1367,13 +1376,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel40.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel40.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel40" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="170" width="140" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="170" width="140" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1385,14 +1394,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel38.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel38.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel38" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="80" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="80" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1404,13 +1413,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel37.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel37.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel37" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="290" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="290" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1423,10 +1432,10 @@
                     </Property>
                     <Property name="horizontalAlignment" type="int" value="2"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/url-icon.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/url-icon.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel44.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel44.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="horizontalTextPosition" type="int" value="2"/>
                     <Property name="name" type="java.lang.String" value="jLabel44" noResource="true"/>
@@ -1435,8 +1444,8 @@
                     <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel44MouseClicked"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="260" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="260" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1448,13 +1457,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel35.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel35.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel35" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="10" width="280" height="70" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="10" width="280" height="70"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1471,8 +1480,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox4ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="20" width="170" height="-1" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="20" width="170" height="-1"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1484,14 +1493,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel43.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel43.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel43" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="310" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="310" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1508,8 +1517,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="200" width="280" height="170" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="200" width="280" height="170"/>
                     </Constraint>
                   </Constraints>
 
@@ -1521,7 +1530,7 @@
                           <Border info="null"/>
                         </Property>
                         <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane4.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane4.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="editable" type="boolean" value="false"/>
                         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
@@ -1530,7 +1539,7 @@
                           </FontInfo>
                         </Property>
                         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="name" type="java.lang.String" value="jTextPane4" noResource="true"/>
                         <Property name="opaque" type="boolean" value="false"/>
@@ -1549,21 +1558,21 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel39.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel39.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel39" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="140" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="140" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JTextField" name="jTextField4">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextField4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextField4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jTextField4" noResource="true"/>
                   </Properties>
@@ -1571,8 +1580,8 @@
                     <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jTextField4KeyTyped"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="55" width="140" height="23" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="55" width="140" height="23"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1584,14 +1593,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel41.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel41.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel41" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="370" width="130" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="370" width="130" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1599,16 +1608,16 @@
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="0"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/no-screenshot.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/no-screenshot.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel34.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel34.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel34" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="10" width="180" height="240" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="10" width="180" height="240"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1623,7 +1632,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton8.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton8.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton8" noResource="true"/>
@@ -1632,8 +1641,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton8ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="370" y="380" width="90" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="370" y="380" width="90" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1645,14 +1654,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel42.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel42.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel42" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="110" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="110" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1664,14 +1673,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel36.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel36.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel36" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="350" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="350" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1688,21 +1697,23 @@
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Linux Daemons">
                     <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane9.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane9.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                   </JTabbedPaneConstraints>
                 </Constraint>
               </Constraints>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+                <Property name="useNullLayout" type="boolean" value="true"/>
+              </Layout>
               <SubComponents>
                 <Component class="javax.swing.JButton" name="jButton17">
                   <Properties>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/find.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/find.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton17.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton17.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton17" noResource="true"/>
@@ -1711,8 +1722,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton17ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="150" y="54" width="30" height="25" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="150" y="54" width="30" height="25"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1727,7 +1738,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton18.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton18.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton18" noResource="true"/>
@@ -1736,8 +1747,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton18ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="370" y="380" width="90" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="370" y="380" width="90" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1749,14 +1760,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel94.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel94.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel94" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="140" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="140" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1768,13 +1779,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel95.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel95.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel95" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="170" width="140" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="170" width="140" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1786,8 +1797,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="90" width="170" height="320" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="90" width="170" height="320"/>
                     </Constraint>
                   </Constraints>
 
@@ -1815,14 +1826,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel97.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel97.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel97" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="110" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="110" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1834,14 +1845,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel93.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel93.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel93" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="80" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="80" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1851,8 +1862,8 @@
                     <Property name="name" type="java.lang.String" value="jSeparator9" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="200" y="20" width="10" height="390" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="200" y="20" width="10" height="390"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1864,13 +1875,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel92.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel92.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel92" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="290" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="290" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1882,14 +1893,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel98.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel98.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel98" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="310" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="310" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1906,8 +1917,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="200" width="280" height="170" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="200" width="280" height="170"/>
                     </Constraint>
                   </Constraints>
 
@@ -1919,7 +1930,7 @@
                           <Border info="null"/>
                         </Property>
                         <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane9.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane9.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="editable" type="boolean" value="false"/>
                         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
@@ -1928,7 +1939,7 @@
                           </FontInfo>
                         </Property>
                         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="name" type="java.lang.String" value="jTextPane9" noResource="true"/>
                         <Property name="opaque" type="boolean" value="false"/>
@@ -1947,14 +1958,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel91.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel91.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel91" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="350" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="350" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1966,14 +1977,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel96.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel96.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel96" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="370" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="370" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -1985,13 +1996,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel90.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel90.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel90" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="10" width="280" height="70" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="10" width="280" height="70"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2004,10 +2015,10 @@
                     </Property>
                     <Property name="horizontalAlignment" type="int" value="2"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/url-icon.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/url-icon.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel99.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel99.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="horizontalTextPosition" type="int" value="2"/>
                     <Property name="name" type="java.lang.String" value="jLabel99" noResource="true"/>
@@ -2016,8 +2027,8 @@
                     <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel99MouseClicked"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="260" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="260" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2034,8 +2045,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox9ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="20" width="170" height="-1" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="20" width="170" height="-1"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2043,23 +2054,23 @@
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="0"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/no-screenshot.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/no-screenshot.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel89.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel89.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel89" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="10" width="180" height="240" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="10" width="180" height="240"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JTextField" name="jTextField9">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextField9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextField9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jTextField9" noResource="true"/>
                   </Properties>
@@ -2067,8 +2078,8 @@
                     <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jTextField9KeyTyped"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="55" width="140" height="23" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="55" width="140" height="23"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2085,28 +2096,30 @@
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Kernels">
                     <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane6.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane6.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                   </JTabbedPaneConstraints>
                 </Constraint>
               </Constraints>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+                <Property name="useNullLayout" type="boolean" value="true"/>
+              </Layout>
               <SubComponents>
                 <Component class="javax.swing.JLabel" name="jLabel45">
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="0"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/no-screenshot.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/no-screenshot.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel45.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel45.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel45" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="10" width="180" height="240" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="10" width="180" height="240"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2118,13 +2131,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel51.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel51.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel51" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="170" width="140" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="170" width="140" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2136,13 +2149,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel48.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel48.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel48" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="290" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="290" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2152,8 +2165,8 @@
                     <Property name="name" type="java.lang.String" value="jSeparator5" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="200" y="20" width="10" height="390" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="200" y="20" width="10" height="390"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2165,24 +2178,24 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel49.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel49.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel49" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="80" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="80" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JButton" name="jButton9">
                   <Properties>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/find.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/find.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton9" noResource="true"/>
@@ -2191,8 +2204,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton9ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="150" y="54" width="30" height="25" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="150" y="54" width="30" height="25"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2204,14 +2217,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel52.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel52.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel52" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="370" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="370" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2228,8 +2241,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="200" width="280" height="170" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="200" width="280" height="170"/>
                     </Constraint>
                   </Constraints>
 
@@ -2241,7 +2254,7 @@
                           <Border info="null"/>
                         </Property>
                         <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane5.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane5.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="editable" type="boolean" value="false"/>
                         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
@@ -2250,7 +2263,7 @@
                           </FontInfo>
                         </Property>
                         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="name" type="java.lang.String" value="jTextPane5" noResource="true"/>
                         <Property name="opaque" type="boolean" value="false"/>
@@ -2264,7 +2277,7 @@
                 <Component class="javax.swing.JTextField" name="jTextField5">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextField5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextField5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jTextField5" noResource="true"/>
                   </Properties>
@@ -2272,8 +2285,8 @@
                     <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jTextField5KeyTyped"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="55" width="140" height="23" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="55" width="140" height="23"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2285,14 +2298,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel47.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel47.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel47" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="350" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="350" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2304,14 +2317,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel50.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel50.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel50" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="140" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="140" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2323,14 +2336,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel53.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel53.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel53" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="110" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="110" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2343,10 +2356,10 @@
                     </Property>
                     <Property name="horizontalAlignment" type="int" value="2"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/url-icon.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/url-icon.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel55.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel55.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="horizontalTextPosition" type="int" value="2"/>
                     <Property name="name" type="java.lang.String" value="jLabel55" noResource="true"/>
@@ -2355,8 +2368,8 @@
                     <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel55MouseClicked"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="260" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="260" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2368,13 +2381,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel46.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel46.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel46" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="10" width="280" height="70" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="10" width="280" height="70"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2386,8 +2399,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="90" width="170" height="320" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="90" width="170" height="320"/>
                     </Constraint>
                   </Constraints>
 
@@ -2415,14 +2428,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel54.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel54.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel54" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="310" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="310" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2437,7 +2450,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton10.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton10.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton10" noResource="true"/>
@@ -2446,8 +2459,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton10ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="370" y="380" width="90" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="370" y="380" width="90" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2464,8 +2477,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox5ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="20" width="170" height="-1" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="20" width="170" height="-1"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2482,13 +2495,15 @@
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Patches">
                     <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane7.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane7.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                   </JTabbedPaneConstraints>
                 </Constraint>
               </Constraints>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+                <Property name="useNullLayout" type="boolean" value="true"/>
+              </Layout>
               <SubComponents>
                 <Component class="javax.swing.JButton" name="jButton12">
                   <Properties>
@@ -2501,7 +2516,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton12.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton12.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton12" noResource="true"/>
@@ -2510,8 +2525,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton12ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="370" y="380" width="90" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="370" y="380" width="90" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2523,21 +2538,21 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel64.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel64.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel64" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="110" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="110" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JTextField" name="jTextField6">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextField6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextField6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jTextField6" noResource="true"/>
                   </Properties>
@@ -2545,8 +2560,8 @@
                     <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jTextField6KeyTyped"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="55" width="140" height="23" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="55" width="140" height="23"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2563,8 +2578,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="200" width="280" height="170" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="200" width="280" height="170"/>
                     </Constraint>
                   </Constraints>
 
@@ -2576,7 +2591,7 @@
                           <Border info="null"/>
                         </Property>
                         <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane6.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane6.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="editable" type="boolean" value="false"/>
                         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
@@ -2585,7 +2600,7 @@
                           </FontInfo>
                         </Property>
                         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="name" type="java.lang.String" value="jTextPane6" noResource="true"/>
                         <Property name="opaque" type="boolean" value="false"/>
@@ -2604,14 +2619,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel63.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel63.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel63" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="370" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="370" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2623,14 +2638,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel58.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel58.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel58" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="350" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="350" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2642,13 +2657,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel57.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel57.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel57" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="10" width="280" height="70" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="10" width="280" height="70"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2660,13 +2675,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel59.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel59.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel59" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="290" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="290" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2678,8 +2693,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="90" width="170" height="320" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="90" width="170" height="320"/>
                     </Constraint>
                   </Constraints>
 
@@ -2707,14 +2722,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel65.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel65.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel65" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="310" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="310" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2726,14 +2741,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel61.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel61.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel61" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="140" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="140" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2741,16 +2756,16 @@
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="0"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/no-screenshot.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/no-screenshot.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel56.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel56.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel56" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="10" width="180" height="240" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="10" width="180" height="240"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2763,10 +2778,10 @@
                     </Property>
                     <Property name="horizontalAlignment" type="int" value="2"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/url-icon.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/url-icon.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel66.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel66.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="horizontalTextPosition" type="int" value="2"/>
                     <Property name="name" type="java.lang.String" value="jLabel66" noResource="true"/>
@@ -2775,18 +2790,18 @@
                     <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel66MouseClicked"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="260" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="260" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JButton" name="jButton11">
                   <Properties>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/find.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/find.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton11.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton11.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton11" noResource="true"/>
@@ -2795,8 +2810,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton11ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="150" y="54" width="30" height="25" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="150" y="54" width="30" height="25"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2806,8 +2821,8 @@
                     <Property name="name" type="java.lang.String" value="jSeparator6" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="200" y="20" width="10" height="390" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="200" y="20" width="10" height="390"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2819,13 +2834,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel62.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel62.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel62" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="170" width="140" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="170" width="140" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2837,14 +2852,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel60.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel60.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel60" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="80" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="80" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2861,8 +2876,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox6ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="20" width="170" height="-1" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="20" width="170" height="-1"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2879,21 +2894,23 @@
                 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
                   <JTabbedPaneConstraints tabName="Themes">
                     <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane8.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane8.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                   </JTabbedPaneConstraints>
                 </Constraint>
               </Constraints>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+                <Property name="useNullLayout" type="boolean" value="true"/>
+              </Layout>
               <SubComponents>
                 <Component class="javax.swing.JButton" name="jButton13">
                   <Properties>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/find.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/find.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton13.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton13.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton13" noResource="true"/>
@@ -2902,8 +2919,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton13ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="150" y="54" width="30" height="25" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="150" y="54" width="30" height="25"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2915,14 +2932,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel72.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel72.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel72" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="140" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="140" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2934,8 +2951,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="90" width="170" height="320" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="90" width="170" height="320"/>
                     </Constraint>
                   </Constraints>
 
@@ -2963,13 +2980,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel73.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel73.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel73" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="170" width="140" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="170" width="140" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -2981,14 +2998,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel75.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel75.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel75" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="110" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="110" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3005,8 +3022,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox7ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="20" width="170" height="-1" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="20" width="170" height="-1"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3018,14 +3035,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel76.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel76.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel76" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="310" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="310" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3037,14 +3054,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel71.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel71.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel71" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="80" width="280" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="80" width="280" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3059,7 +3076,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton14.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton14.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="name" type="java.lang.String" value="jButton14" noResource="true"/>
@@ -3068,8 +3085,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton14ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="370" y="380" width="90" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="370" y="380" width="90" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3079,8 +3096,8 @@
                     <Property name="name" type="java.lang.String" value="jSeparator7" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="200" y="20" width="10" height="390" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="200" y="20" width="10" height="390"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3092,13 +3109,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel68.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel68.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel68" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="10" width="280" height="70" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="10" width="280" height="70"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3110,21 +3127,21 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel69.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel69.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel69" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="350" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="350" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
                 <Component class="javax.swing.JTextField" name="jTextField7">
                   <Properties>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextField7.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextField7.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jTextField7" noResource="true"/>
                   </Properties>
@@ -3132,8 +3149,8 @@
                     <EventHandler event="keyTyped" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="jTextField7KeyTyped"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="55" width="140" height="23" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="55" width="140" height="23"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3145,14 +3162,14 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel74.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel74.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="verticalAlignment" type="int" value="1"/>
                     <Property name="name" type="java.lang.String" value="jLabel74" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="370" width="120" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="370" width="120" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3165,10 +3182,10 @@
                     </Property>
                     <Property name="horizontalAlignment" type="int" value="2"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/url-icon.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/url-icon.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel77.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel77.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="horizontalTextPosition" type="int" value="2"/>
                     <Property name="name" type="java.lang.String" value="jLabel77" noResource="true"/>
@@ -3177,8 +3194,8 @@
                     <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel77MouseClicked"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="260" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="260" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3190,13 +3207,13 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel70.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel70.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel70" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="550" y="290" width="120" height="20" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="550" y="290" width="120" height="20"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3213,8 +3230,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="230" y="200" width="280" height="170" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="230" y="200" width="280" height="170"/>
                     </Constraint>
                   </Constraints>
 
@@ -3226,7 +3243,7 @@
                           <Border info="null"/>
                         </Property>
                         <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane7.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane7.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="editable" type="boolean" value="false"/>
                         <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
@@ -3235,7 +3252,7 @@
                           </FontInfo>
                         </Property>
                         <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                          <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane7.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                          <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane7.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                         </Property>
                         <Property name="name" type="java.lang.String" value="jTextPane7" noResource="true"/>
                         <Property name="opaque" type="boolean" value="false"/>
@@ -3250,16 +3267,16 @@
                   <Properties>
                     <Property name="horizontalAlignment" type="int" value="0"/>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/no-screenshot.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/no-screenshot.png"/>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel67.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel67.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jLabel67" noResource="true"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="10" width="180" height="240" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="10" width="180" height="240"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -3278,13 +3295,15 @@
             <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JTabbedPaneSupportLayout$JTabbedPaneConstraintsDescription">
               <JTabbedPaneConstraints tabName="Updates">
                 <Property name="tabTitle" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane1.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLayeredPane1.TabConstraints.tabTitle" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </JTabbedPaneConstraints>
             </Constraint>
           </Constraints>
 
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
           <SubComponents>
             <Component class="javax.swing.JLabel" name="jLabel88">
               <Properties>
@@ -3295,10 +3314,10 @@
                 </Property>
                 <Property name="horizontalAlignment" type="int" value="2"/>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/url-icon.png"/>
+                  <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/url-icon.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel88.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel88.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="horizontalTextPosition" type="int" value="2"/>
                 <Property name="name" type="java.lang.String" value="jLabel88" noResource="true"/>
@@ -3307,8 +3326,8 @@
                 <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jLabel88MouseClicked"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="550" y="280" width="120" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="550" y="280" width="120" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3320,13 +3339,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel84.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel84.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel84" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="230" y="170" width="140" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="230" y="170" width="140" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3341,7 +3360,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton15.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton15.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton15" noResource="true"/>
               </Properties>
@@ -3349,8 +3368,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton15ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="29" y="390" width="130" height="30" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="29" y="390" width="130" height="30"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3365,7 +3384,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jButton16.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jButton16.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton16" noResource="true"/>
               </Properties>
@@ -3373,8 +3392,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton16ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="370" y="400" width="90" height="30" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="370" y="400" width="90" height="30"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3386,8 +3405,8 @@
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="10" y="20" width="170" height="360" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="10" y="20" width="170" height="360"/>
                 </Constraint>
               </Constraints>
 
@@ -3415,13 +3434,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel81.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel81.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel81" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="550" y="310" width="120" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="550" y="310" width="120" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3433,14 +3452,14 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel83.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel83.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel83" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="230" y="140" width="280" height="30" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="230" y="140" width="280" height="30"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3452,14 +3471,14 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel85.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel85.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel85" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="550" y="390" width="120" height="40" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="550" y="390" width="120" height="40"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3471,14 +3490,14 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel82.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel82.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel82" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="230" y="80" width="280" height="30" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="230" y="80" width="280" height="30"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3490,13 +3509,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel79.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel79.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel79" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="230" y="10" width="280" height="70" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="230" y="10" width="280" height="70"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3508,14 +3527,14 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel80.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel80.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel80" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="550" y="370" width="120" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="550" y="370" width="120" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3532,8 +3551,8 @@
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="230" y="200" width="280" height="190" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="230" y="200" width="280" height="190"/>
                 </Constraint>
               </Constraints>
 
@@ -3545,7 +3564,7 @@
                       <Border info="null"/>
                     </Property>
                     <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane8.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane8.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="editable" type="boolean" value="false"/>
                     <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
@@ -3554,7 +3573,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jTextPane8.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jTextPane8.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jTextPane8" noResource="true"/>
                     <Property name="opaque" type="boolean" value="false"/>
@@ -3571,8 +3590,8 @@
                 <Property name="name" type="java.lang.String" value="jSeparator8" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="200" y="20" width="10" height="420" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="200" y="20" width="10" height="420"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3584,14 +3603,14 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel87.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel87.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel87" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="550" y="330" width="120" height="40" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="550" y="330" width="120" height="40"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3599,16 +3618,16 @@
               <Properties>
                 <Property name="horizontalAlignment" type="int" value="0"/>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/no-screenshot.png"/>
+                  <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/no-screenshot.png"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel78.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel78.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel78" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="520" y="20" width="180" height="240" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="520" y="20" width="180" height="240"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -3620,14 +3639,14 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="FeedViewer.jLabel86.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="FeedViewer.jLabel86.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel86" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="230" y="110" width="280" height="30" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="230" y="110" width="280" height="30"/>
                 </Constraint>
               </Constraints>
             </Component>
diff --git a/src/ca/canucksoftware/wosqi/FeedViewer.java b/src/ca/canuckcoding/wosqi/FeedViewer.java
similarity index 89%
rename from src/ca/canucksoftware/wosqi/FeedViewer.java
rename to src/ca/canuckcoding/wosqi/FeedViewer.java
index 803cb53..296022d 100644
--- a/src/ca/canucksoftware/wosqi/FeedViewer.java
+++ b/src/ca/canuckcoding/wosqi/FeedViewer.java
@@ -2,13 +2,13 @@
  * WebOSQuickInstallAboutBox.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.ipkg.PackageEntry;
-import ca.canucksoftware.ipkg.PackageFilter;
-import ca.canucksoftware.ipkg.PackageManager;
-import ca.canucksoftware.webos.DeviceInfo;
-import ca.canucksoftware.webos.WebOSConnection;
+import ca.canuckcoding.ipkg.PackageEntry;
+import ca.canuckcoding.ipkg.PackageFilter;
+import ca.canuckcoding.ipkg.PackageManager;
+import ca.canuckcoding.webos.DeviceInfo;
+import ca.canuckcoding.webos.WebOSConnection;
 import java.awt.Cursor;
 import java.awt.Desktop;
 import java.net.URL;
@@ -676,17 +676,17 @@ public class FeedViewer extends javax.swing.JDialog {
         jLabel5.setText(bundle.getString("FeedViewer.jLabel5.text")); // NOI18N
         jLabel5.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel5.setName("jLabel5"); // NOI18N
+        jLayeredPane2.add(jLabel5);
         jLabel5.setBounds(230, 80, 280, 30);
-        jLayeredPane2.add(jLabel5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel9.setFont(jLabel9.getFont().deriveFont(jLabel9.getFont().getSize()+1f));
         jLabel9.setText(bundle.getString("FeedViewer.jLabel9.text")); // NOI18N
         jLabel9.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel9.setName("jLabel9"); // NOI18N
+        jLayeredPane2.add(jLabel9);
         jLabel9.setBounds(230, 110, 280, 30);
-        jLayeredPane2.add(jLabel9, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/find.png"))); // NOI18N
+        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/find.png"))); // NOI18N
         jButton1.setText(bundle.getString("FeedViewer.jButton1.text")); // NOI18N
         jButton1.setFocusable(false);
         jButton1.setName("jButton1"); // NOI18N
@@ -695,15 +695,15 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton1ActionPerformed(evt);
             }
         });
+        jLayeredPane2.add(jButton1);
         jButton1.setBounds(150, 54, 30, 25);
-        jLayeredPane2.add(jButton1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel4.setFont(jLabel4.getFont().deriveFont(jLabel4.getFont().getSize()+1f));
         jLabel4.setText(bundle.getString("FeedViewer.jLabel4.text")); // NOI18N
         jLabel4.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel4.setName("jLabel4"); // NOI18N
+        jLayeredPane2.add(jLabel4);
         jLabel4.setBounds(550, 350, 120, 20);
-        jLayeredPane2.add(jLabel4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField1.setText(bundle.getString("FeedViewer.jTextField1.text")); // NOI18N
         jTextField1.setName("jTextField1"); // NOI18N
@@ -712,21 +712,21 @@ public class FeedViewer extends javax.swing.JDialog {
                 jTextField1KeyTyped(evt);
             }
         });
+        jLayeredPane2.add(jTextField1);
         jTextField1.setBounds(10, 55, 140, 23);
-        jLayeredPane2.add(jTextField1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getSize()+13f));
         jLabel2.setText(bundle.getString("FeedViewer.jLabel2.text")); // NOI18N
         jLabel2.setName("jLabel2"); // NOI18N
+        jLayeredPane2.add(jLabel2);
         jLabel2.setBounds(230, 10, 280, 70);
-        jLayeredPane2.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel6.setFont(jLabel6.getFont().deriveFont(jLabel6.getFont().getSize()+1f));
         jLabel6.setText(bundle.getString("FeedViewer.jLabel6.text")); // NOI18N
         jLabel6.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel6.setName("jLabel6"); // NOI18N
+        jLayeredPane2.add(jLabel6);
         jLabel6.setBounds(230, 140, 280, 30);
-        jLayeredPane2.add(jLabel6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jComboBox1.setMaximumRowCount(10);
         jComboBox1.setFocusable(false);
@@ -736,13 +736,13 @@ public class FeedViewer extends javax.swing.JDialog {
                 jComboBox1ActionPerformed(evt);
             }
         });
+        jLayeredPane2.add(jComboBox1);
         jComboBox1.setBounds(10, 20, 170, 22);
-        jLayeredPane2.add(jComboBox1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jSeparator1.setOrientation(javax.swing.SwingConstants.VERTICAL);
         jSeparator1.setName("jSeparator1"); // NOI18N
+        jLayeredPane2.add(jSeparator1);
         jSeparator1.setBounds(200, 20, 10, 390);
-        jLayeredPane2.add(jSeparator1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane2.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
         jScrollPane2.setName("jScrollPane2"); // NOI18N
@@ -762,38 +762,38 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane2.setViewportView(jTextPane1);
 
+        jLayeredPane2.add(jScrollPane2);
         jScrollPane2.setBounds(230, 200, 280, 170);
-        jLayeredPane2.add(jScrollPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel3.setFont(jLabel3.getFont().deriveFont(jLabel3.getFont().getSize()+1f));
         jLabel3.setText(bundle.getString("FeedViewer.jLabel3.text")); // NOI18N
         jLabel3.setName("jLabel3"); // NOI18N
+        jLayeredPane2.add(jLabel3);
         jLabel3.setBounds(550, 290, 120, 20);
-        jLayeredPane2.add(jLabel3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel10.setFont(jLabel10.getFont().deriveFont(jLabel10.getFont().getSize()+1f));
         jLabel10.setText(bundle.getString("FeedViewer.jLabel10.text")); // NOI18N
         jLabel10.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel10.setName("jLabel10"); // NOI18N
+        jLayeredPane2.add(jLabel10);
         jLabel10.setBounds(550, 310, 120, 40);
-        jLayeredPane2.add(jLabel10, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel8.setFont(jLabel8.getFont().deriveFont(jLabel8.getFont().getSize()+1f));
         jLabel8.setText(bundle.getString("FeedViewer.jLabel8.text")); // NOI18N
         jLabel8.setName("jLabel8"); // NOI18N
+        jLayeredPane2.add(jLabel8);
         jLabel8.setBounds(230, 170, 140, 20);
-        jLayeredPane2.add(jLabel8, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel1.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/no-screenshot.png"))); // NOI18N
+        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/no-screenshot.png"))); // NOI18N
         jLabel1.setText(bundle.getString("FeedViewer.jLabel1.text")); // NOI18N
         jLabel1.setName("jLabel1"); // NOI18N
+        jLayeredPane2.add(jLabel1);
         jLabel1.setBounds(520, 10, 180, 240);
-        jLayeredPane2.add(jLabel1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel11.setFont(jLabel11.getFont().deriveFont(jLabel11.getFont().getStyle() | java.awt.Font.BOLD, jLabel11.getFont().getSize()+1));
         jLabel11.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-        jLabel11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/url-icon.png"))); // NOI18N
+        jLabel11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/url-icon.png"))); // NOI18N
         jLabel11.setText(bundle.getString("FeedViewer.jLabel11.text")); // NOI18N
         jLabel11.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
         jLabel11.setName("jLabel11"); // NOI18N
@@ -802,15 +802,15 @@ public class FeedViewer extends javax.swing.JDialog {
                 jLabel11MouseClicked(evt);
             }
         });
+        jLayeredPane2.add(jLabel11);
         jLabel11.setBounds(550, 260, 120, 20);
-        jLayeredPane2.add(jLabel11, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel7.setFont(jLabel7.getFont().deriveFont(jLabel7.getFont().getSize()+1f));
         jLabel7.setText(bundle.getString("FeedViewer.jLabel7.text")); // NOI18N
         jLabel7.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel7.setName("jLabel7"); // NOI18N
+        jLayeredPane2.add(jLabel7);
         jLabel7.setBounds(550, 370, 120, 40);
-        jLayeredPane2.add(jLabel7, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton2.setBackground(new java.awt.Color(224, 218, 218));
         jButton2.setFont(jButton2.getFont().deriveFont(jButton2.getFont().getSize()+1f));
@@ -822,8 +822,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton2ActionPerformed(evt);
             }
         });
+        jLayeredPane2.add(jButton2);
         jButton2.setBounds(370, 380, 90, 30);
-        jLayeredPane2.add(jButton2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane1.setName("jScrollPane1"); // NOI18N
 
@@ -836,8 +836,8 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane1.setViewportView(jList1);
 
+        jLayeredPane2.add(jScrollPane1);
         jScrollPane1.setBounds(10, 90, 170, 320);
-        jLayeredPane2.add(jScrollPane1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTabbedPane2.addTab(bundle.getString("FeedViewer.jLayeredPane2.TabConstraints.tabTitle"), jLayeredPane2); // NOI18N
 
@@ -847,14 +847,14 @@ public class FeedViewer extends javax.swing.JDialog {
         jLabel20.setText(bundle.getString("FeedViewer.jLabel20.text")); // NOI18N
         jLabel20.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel20.setName("jLabel20"); // NOI18N
+        jLayeredPane3.add(jLabel20);
         jLabel20.setBounds(230, 110, 280, 30);
-        jLayeredPane3.add(jLabel20, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel15.setFont(jLabel15.getFont().deriveFont(jLabel15.getFont().getSize()+1f));
         jLabel15.setText(bundle.getString("FeedViewer.jLabel15.text")); // NOI18N
         jLabel15.setName("jLabel15"); // NOI18N
+        jLayeredPane3.add(jLabel15);
         jLabel15.setBounds(550, 290, 120, 20);
-        jLayeredPane3.add(jLabel15, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane4.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
         jScrollPane4.setName("jScrollPane4"); // NOI18N
@@ -873,22 +873,22 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane4.setViewportView(jTextPane2);
 
+        jLayeredPane3.add(jScrollPane4);
         jScrollPane4.setBounds(230, 200, 280, 170);
-        jLayeredPane3.add(jScrollPane4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel17.setFont(jLabel17.getFont().deriveFont(jLabel17.getFont().getSize()+1f));
         jLabel17.setText(bundle.getString("FeedViewer.jLabel17.text")); // NOI18N
         jLabel17.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel17.setName("jLabel17"); // NOI18N
+        jLayeredPane3.add(jLabel17);
         jLabel17.setBounds(230, 140, 280, 30);
-        jLayeredPane3.add(jLabel17, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel12.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel12.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/no-screenshot.png"))); // NOI18N
+        jLabel12.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/no-screenshot.png"))); // NOI18N
         jLabel12.setText(bundle.getString("FeedViewer.jLabel12.text")); // NOI18N
         jLabel12.setName("jLabel12"); // NOI18N
+        jLayeredPane3.add(jLabel12);
         jLabel12.setBounds(520, 10, 180, 240);
-        jLayeredPane3.add(jLabel12, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField2.setText(bundle.getString("FeedViewer.jTextField2.text")); // NOI18N
         jTextField2.setName("jTextField2"); // NOI18N
@@ -897,22 +897,22 @@ public class FeedViewer extends javax.swing.JDialog {
                 jTextField2KeyTyped(evt);
             }
         });
+        jLayeredPane3.add(jTextField2);
         jTextField2.setBounds(10, 55, 140, 23);
-        jLayeredPane3.add(jTextField2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel16.setFont(jLabel16.getFont().deriveFont(jLabel16.getFont().getSize()+1f));
         jLabel16.setText(bundle.getString("FeedViewer.jLabel16.text")); // NOI18N
         jLabel16.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel16.setName("jLabel16"); // NOI18N
+        jLayeredPane3.add(jLabel16);
         jLabel16.setBounds(230, 80, 280, 30);
-        jLayeredPane3.add(jLabel16, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel21.setFont(jLabel21.getFont().deriveFont(jLabel21.getFont().getSize()+1f));
         jLabel21.setText(bundle.getString("FeedViewer.jLabel21.text")); // NOI18N
         jLabel21.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel21.setName("jLabel21"); // NOI18N
+        jLayeredPane3.add(jLabel21);
         jLabel21.setBounds(550, 310, 120, 40);
-        jLayeredPane3.add(jLabel21, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jComboBox2.setMaximumRowCount(10);
         jComboBox2.setFocusable(false);
@@ -922,35 +922,35 @@ public class FeedViewer extends javax.swing.JDialog {
                 jComboBox2ActionPerformed(evt);
             }
         });
+        jLayeredPane3.add(jComboBox2);
         jComboBox2.setBounds(10, 20, 170, 22);
-        jLayeredPane3.add(jComboBox2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel19.setFont(jLabel19.getFont().deriveFont(jLabel19.getFont().getSize()+1f));
         jLabel19.setText(bundle.getString("FeedViewer.jLabel19.text")); // NOI18N
         jLabel19.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel19.setName("jLabel19"); // NOI18N
+        jLayeredPane3.add(jLabel19);
         jLabel19.setBounds(550, 370, 120, 40);
-        jLayeredPane3.add(jLabel19, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel14.setFont(jLabel14.getFont().deriveFont(jLabel14.getFont().getSize()+1f));
         jLabel14.setText(bundle.getString("FeedViewer.jLabel14.text")); // NOI18N
         jLabel14.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel14.setName("jLabel14"); // NOI18N
+        jLayeredPane3.add(jLabel14);
         jLabel14.setBounds(550, 350, 120, 20);
-        jLayeredPane3.add(jLabel14, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jSeparator2.setOrientation(javax.swing.SwingConstants.VERTICAL);
         jSeparator2.setName("jSeparator2"); // NOI18N
+        jLayeredPane3.add(jSeparator2);
         jSeparator2.setBounds(200, 20, 10, 390);
-        jLayeredPane3.add(jSeparator2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel18.setFont(jLabel18.getFont().deriveFont(jLabel18.getFont().getSize()+1f));
         jLabel18.setText(bundle.getString("FeedViewer.jLabel18.text")); // NOI18N
         jLabel18.setName("jLabel18"); // NOI18N
+        jLayeredPane3.add(jLabel18);
         jLabel18.setBounds(230, 170, 140, 20);
-        jLayeredPane3.add(jLabel18, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        jButton3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/find.png"))); // NOI18N
+        jButton3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/find.png"))); // NOI18N
         jButton3.setText(bundle.getString("FeedViewer.jButton3.text")); // NOI18N
         jButton3.setFocusable(false);
         jButton3.setName("jButton3"); // NOI18N
@@ -959,8 +959,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton3ActionPerformed(evt);
             }
         });
+        jLayeredPane3.add(jButton3);
         jButton3.setBounds(150, 54, 30, 25);
-        jLayeredPane3.add(jButton3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane3.setName("jScrollPane3"); // NOI18N
 
@@ -973,18 +973,18 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane3.setViewportView(jList2);
 
+        jLayeredPane3.add(jScrollPane3);
         jScrollPane3.setBounds(10, 90, 170, 320);
-        jLayeredPane3.add(jScrollPane3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel13.setFont(jLabel13.getFont().deriveFont(jLabel13.getFont().getSize()+13f));
         jLabel13.setText(bundle.getString("FeedViewer.jLabel13.text")); // NOI18N
         jLabel13.setName("jLabel13"); // NOI18N
+        jLayeredPane3.add(jLabel13);
         jLabel13.setBounds(230, 10, 280, 70);
-        jLayeredPane3.add(jLabel13, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel22.setFont(jLabel22.getFont().deriveFont(jLabel22.getFont().getStyle() | java.awt.Font.BOLD, jLabel22.getFont().getSize()+1));
         jLabel22.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-        jLabel22.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/url-icon.png"))); // NOI18N
+        jLabel22.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/url-icon.png"))); // NOI18N
         jLabel22.setText(bundle.getString("FeedViewer.jLabel22.text")); // NOI18N
         jLabel22.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
         jLabel22.setName("jLabel22"); // NOI18N
@@ -993,8 +993,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jLabel22MouseClicked(evt);
             }
         });
+        jLayeredPane3.add(jLabel22);
         jLabel22.setBounds(550, 260, 120, 20);
-        jLayeredPane3.add(jLabel22, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton4.setBackground(new java.awt.Color(224, 218, 218));
         jButton4.setFont(jButton4.getFont().deriveFont(jButton4.getFont().getSize()+1f));
@@ -1006,8 +1006,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton4ActionPerformed(evt);
             }
         });
+        jLayeredPane3.add(jButton4);
         jButton4.setBounds(370, 380, 90, 30);
-        jLayeredPane3.add(jButton4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTabbedPane2.addTab(bundle.getString("FeedViewer.jLayeredPane3.TabConstraints.tabTitle"), jLayeredPane3); // NOI18N
 
@@ -1030,8 +1030,8 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane6.setViewportView(jTextPane3);
 
+        jLayeredPane4.add(jScrollPane6);
         jScrollPane6.setBounds(230, 200, 280, 170);
-        jLayeredPane4.add(jScrollPane6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane5.setName("jScrollPane5"); // NOI18N
 
@@ -1044,29 +1044,29 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane5.setViewportView(jList3);
 
+        jLayeredPane4.add(jScrollPane5);
         jScrollPane5.setBounds(10, 90, 170, 320);
-        jLayeredPane4.add(jScrollPane5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel29.setFont(jLabel29.getFont().deriveFont(jLabel29.getFont().getSize()+1f));
         jLabel29.setText(bundle.getString("FeedViewer.jLabel29.text")); // NOI18N
         jLabel29.setName("jLabel29"); // NOI18N
+        jLayeredPane4.add(jLabel29);
         jLabel29.setBounds(230, 170, 140, 20);
-        jLayeredPane4.add(jLabel29, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel32.setFont(jLabel32.getFont().deriveFont(jLabel32.getFont().getSize()+1f));
         jLabel32.setText(bundle.getString("FeedViewer.jLabel32.text")); // NOI18N
         jLabel32.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel32.setName("jLabel32"); // NOI18N
+        jLayeredPane4.add(jLabel32);
         jLabel32.setBounds(550, 310, 120, 40);
-        jLayeredPane4.add(jLabel32, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel26.setFont(jLabel26.getFont().deriveFont(jLabel26.getFont().getSize()+1f));
         jLabel26.setText(bundle.getString("FeedViewer.jLabel26.text")); // NOI18N
         jLabel26.setName("jLabel26"); // NOI18N
+        jLayeredPane4.add(jLabel26);
         jLabel26.setBounds(550, 290, 120, 20);
-        jLayeredPane4.add(jLabel26, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        jButton5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/find.png"))); // NOI18N
+        jButton5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/find.png"))); // NOI18N
         jButton5.setText(bundle.getString("FeedViewer.jButton5.text")); // NOI18N
         jButton5.setFocusable(false);
         jButton5.setName("jButton5"); // NOI18N
@@ -1075,8 +1075,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton5ActionPerformed(evt);
             }
         });
+        jLayeredPane4.add(jButton5);
         jButton5.setBounds(150, 54, 30, 25);
-        jLayeredPane4.add(jButton5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton6.setBackground(new java.awt.Color(224, 218, 218));
         jButton6.setFont(jButton6.getFont().deriveFont(jButton6.getFont().getSize()+1f));
@@ -1088,19 +1088,19 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton6ActionPerformed(evt);
             }
         });
+        jLayeredPane4.add(jButton6);
         jButton6.setBounds(370, 380, 90, 30);
-        jLayeredPane4.add(jButton6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel27.setFont(jLabel27.getFont().deriveFont(jLabel27.getFont().getSize()+1f));
         jLabel27.setText(bundle.getString("FeedViewer.jLabel27.text")); // NOI18N
         jLabel27.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel27.setName("jLabel27"); // NOI18N
+        jLayeredPane4.add(jLabel27);
         jLabel27.setBounds(230, 80, 280, 30);
-        jLayeredPane4.add(jLabel27, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel33.setFont(jLabel33.getFont().deriveFont(jLabel33.getFont().getStyle() | java.awt.Font.BOLD, jLabel33.getFont().getSize()+1));
         jLabel33.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-        jLabel33.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/url-icon.png"))); // NOI18N
+        jLabel33.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/url-icon.png"))); // NOI18N
         jLabel33.setText(bundle.getString("FeedViewer.jLabel33.text")); // NOI18N
         jLabel33.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
         jLabel33.setName("jLabel33"); // NOI18N
@@ -1109,20 +1109,20 @@ public class FeedViewer extends javax.swing.JDialog {
                 jLabel33MouseClicked(evt);
             }
         });
+        jLayeredPane4.add(jLabel33);
         jLabel33.setBounds(550, 260, 120, 20);
-        jLayeredPane4.add(jLabel33, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel30.setFont(jLabel30.getFont().deriveFont(jLabel30.getFont().getSize()+1f));
         jLabel30.setText(bundle.getString("FeedViewer.jLabel30.text")); // NOI18N
         jLabel30.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel30.setName("jLabel30"); // NOI18N
+        jLayeredPane4.add(jLabel30);
         jLabel30.setBounds(550, 370, 120, 40);
-        jLayeredPane4.add(jLabel30, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jSeparator3.setOrientation(javax.swing.SwingConstants.VERTICAL);
         jSeparator3.setName("jSeparator3"); // NOI18N
+        jLayeredPane4.add(jSeparator3);
         jSeparator3.setBounds(200, 20, 10, 390);
-        jLayeredPane4.add(jSeparator3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField3.setText(bundle.getString("FeedViewer.jTextField3.text")); // NOI18N
         jTextField3.setName("jTextField3"); // NOI18N
@@ -1131,15 +1131,15 @@ public class FeedViewer extends javax.swing.JDialog {
                 jTextField3KeyTyped(evt);
             }
         });
+        jLayeredPane4.add(jTextField3);
         jTextField3.setBounds(10, 55, 140, 23);
-        jLayeredPane4.add(jTextField3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel23.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel23.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/no-screenshot.png"))); // NOI18N
+        jLabel23.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/no-screenshot.png"))); // NOI18N
         jLabel23.setText(bundle.getString("FeedViewer.jLabel23.text")); // NOI18N
         jLabel23.setName("jLabel23"); // NOI18N
+        jLayeredPane4.add(jLabel23);
         jLabel23.setBounds(520, 10, 180, 240);
-        jLayeredPane4.add(jLabel23, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jComboBox3.setMaximumRowCount(10);
         jComboBox3.setFocusable(false);
@@ -1149,35 +1149,35 @@ public class FeedViewer extends javax.swing.JDialog {
                 jComboBox3ActionPerformed(evt);
             }
         });
+        jLayeredPane4.add(jComboBox3);
         jComboBox3.setBounds(10, 20, 170, 22);
-        jLayeredPane4.add(jComboBox3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel24.setFont(jLabel24.getFont().deriveFont(jLabel24.getFont().getSize()+13f));
         jLabel24.setText(bundle.getString("FeedViewer.jLabel24.text")); // NOI18N
         jLabel24.setName("jLabel24"); // NOI18N
+        jLayeredPane4.add(jLabel24);
         jLabel24.setBounds(230, 10, 280, 70);
-        jLayeredPane4.add(jLabel24, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel31.setFont(jLabel31.getFont().deriveFont(jLabel31.getFont().getSize()+1f));
         jLabel31.setText(bundle.getString("FeedViewer.jLabel31.text")); // NOI18N
         jLabel31.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel31.setName("jLabel31"); // NOI18N
+        jLayeredPane4.add(jLabel31);
         jLabel31.setBounds(230, 110, 280, 30);
-        jLayeredPane4.add(jLabel31, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel28.setFont(jLabel28.getFont().deriveFont(jLabel28.getFont().getSize()+1f));
         jLabel28.setText(bundle.getString("FeedViewer.jLabel28.text")); // NOI18N
         jLabel28.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel28.setName("jLabel28"); // NOI18N
+        jLayeredPane4.add(jLabel28);
         jLabel28.setBounds(230, 140, 280, 30);
-        jLayeredPane4.add(jLabel28, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel25.setFont(jLabel25.getFont().deriveFont(jLabel25.getFont().getSize()+1f));
         jLabel25.setText(bundle.getString("FeedViewer.jLabel25.text")); // NOI18N
         jLabel25.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel25.setName("jLabel25"); // NOI18N
+        jLayeredPane4.add(jLabel25);
         jLabel25.setBounds(550, 350, 120, 20);
-        jLayeredPane4.add(jLabel25, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTabbedPane2.addTab(bundle.getString("FeedViewer.jLayeredPane4.TabConstraints.tabTitle"), jLayeredPane4); // NOI18N
 
@@ -1194,15 +1194,15 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane7.setViewportView(jList4);
 
+        jLayeredPane5.add(jScrollPane7);
         jScrollPane7.setBounds(10, 90, 170, 320);
-        jLayeredPane5.add(jScrollPane7, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jSeparator4.setOrientation(javax.swing.SwingConstants.VERTICAL);
         jSeparator4.setName("jSeparator4"); // NOI18N
+        jLayeredPane5.add(jSeparator4);
         jSeparator4.setBounds(200, 20, 10, 390);
-        jLayeredPane5.add(jSeparator4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        jButton7.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/find.png"))); // NOI18N
+        jButton7.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/find.png"))); // NOI18N
         jButton7.setText(bundle.getString("FeedViewer.jButton7.text")); // NOI18N
         jButton7.setFocusable(false);
         jButton7.setName("jButton7"); // NOI18N
@@ -1211,31 +1211,31 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton7ActionPerformed(evt);
             }
         });
+        jLayeredPane5.add(jButton7);
         jButton7.setBounds(150, 54, 30, 25);
-        jLayeredPane5.add(jButton7, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel40.setFont(jLabel40.getFont().deriveFont(jLabel40.getFont().getSize()+1f));
         jLabel40.setText(bundle.getString("FeedViewer.jLabel40.text")); // NOI18N
         jLabel40.setName("jLabel40"); // NOI18N
+        jLayeredPane5.add(jLabel40);
         jLabel40.setBounds(230, 170, 140, 20);
-        jLayeredPane5.add(jLabel40, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel38.setFont(jLabel38.getFont().deriveFont(jLabel38.getFont().getSize()+1f));
         jLabel38.setText(bundle.getString("FeedViewer.jLabel38.text")); // NOI18N
         jLabel38.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel38.setName("jLabel38"); // NOI18N
+        jLayeredPane5.add(jLabel38);
         jLabel38.setBounds(230, 80, 280, 30);
-        jLayeredPane5.add(jLabel38, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel37.setFont(jLabel37.getFont().deriveFont(jLabel37.getFont().getSize()+1f));
         jLabel37.setText(bundle.getString("FeedViewer.jLabel37.text")); // NOI18N
         jLabel37.setName("jLabel37"); // NOI18N
+        jLayeredPane5.add(jLabel37);
         jLabel37.setBounds(550, 290, 120, 20);
-        jLayeredPane5.add(jLabel37, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel44.setFont(jLabel44.getFont().deriveFont(jLabel44.getFont().getStyle() | java.awt.Font.BOLD, jLabel44.getFont().getSize()+1));
         jLabel44.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-        jLabel44.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/url-icon.png"))); // NOI18N
+        jLabel44.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/url-icon.png"))); // NOI18N
         jLabel44.setText(bundle.getString("FeedViewer.jLabel44.text")); // NOI18N
         jLabel44.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
         jLabel44.setName("jLabel44"); // NOI18N
@@ -1244,14 +1244,14 @@ public class FeedViewer extends javax.swing.JDialog {
                 jLabel44MouseClicked(evt);
             }
         });
+        jLayeredPane5.add(jLabel44);
         jLabel44.setBounds(550, 260, 120, 20);
-        jLayeredPane5.add(jLabel44, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel35.setFont(jLabel35.getFont().deriveFont(jLabel35.getFont().getSize()+13f));
         jLabel35.setText(bundle.getString("FeedViewer.jLabel35.text")); // NOI18N
         jLabel35.setName("jLabel35"); // NOI18N
+        jLayeredPane5.add(jLabel35);
         jLabel35.setBounds(230, 10, 280, 70);
-        jLayeredPane5.add(jLabel35, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jComboBox4.setMaximumRowCount(10);
         jComboBox4.setFocusable(false);
@@ -1261,15 +1261,15 @@ public class FeedViewer extends javax.swing.JDialog {
                 jComboBox4ActionPerformed(evt);
             }
         });
+        jLayeredPane5.add(jComboBox4);
         jComboBox4.setBounds(10, 20, 170, 22);
-        jLayeredPane5.add(jComboBox4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel43.setFont(jLabel43.getFont().deriveFont(jLabel43.getFont().getSize()+1f));
         jLabel43.setText(bundle.getString("FeedViewer.jLabel43.text")); // NOI18N
         jLabel43.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel43.setName("jLabel43"); // NOI18N
+        jLayeredPane5.add(jLabel43);
         jLabel43.setBounds(550, 310, 120, 40);
-        jLayeredPane5.add(jLabel43, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane8.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
         jScrollPane8.setName("jScrollPane8"); // NOI18N
@@ -1288,15 +1288,15 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane8.setViewportView(jTextPane4);
 
+        jLayeredPane5.add(jScrollPane8);
         jScrollPane8.setBounds(230, 200, 280, 170);
-        jLayeredPane5.add(jScrollPane8, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel39.setFont(jLabel39.getFont().deriveFont(jLabel39.getFont().getSize()+1f));
         jLabel39.setText(bundle.getString("FeedViewer.jLabel39.text")); // NOI18N
         jLabel39.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel39.setName("jLabel39"); // NOI18N
+        jLayeredPane5.add(jLabel39);
         jLabel39.setBounds(230, 140, 280, 30);
-        jLayeredPane5.add(jLabel39, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField4.setText(bundle.getString("FeedViewer.jTextField4.text")); // NOI18N
         jTextField4.setName("jTextField4"); // NOI18N
@@ -1305,22 +1305,22 @@ public class FeedViewer extends javax.swing.JDialog {
                 jTextField4KeyTyped(evt);
             }
         });
+        jLayeredPane5.add(jTextField4);
         jTextField4.setBounds(10, 55, 140, 23);
-        jLayeredPane5.add(jTextField4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel41.setFont(jLabel41.getFont().deriveFont(jLabel41.getFont().getSize()+1f));
         jLabel41.setText(bundle.getString("FeedViewer.jLabel41.text")); // NOI18N
         jLabel41.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel41.setName("jLabel41"); // NOI18N
+        jLayeredPane5.add(jLabel41);
         jLabel41.setBounds(550, 370, 130, 40);
-        jLayeredPane5.add(jLabel41, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel34.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel34.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/no-screenshot.png"))); // NOI18N
+        jLabel34.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/no-screenshot.png"))); // NOI18N
         jLabel34.setText(bundle.getString("FeedViewer.jLabel34.text")); // NOI18N
         jLabel34.setName("jLabel34"); // NOI18N
+        jLayeredPane5.add(jLabel34);
         jLabel34.setBounds(520, 10, 180, 240);
-        jLayeredPane5.add(jLabel34, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton8.setBackground(new java.awt.Color(224, 218, 218));
         jButton8.setFont(jButton8.getFont().deriveFont(jButton8.getFont().getSize()+1f));
@@ -1332,28 +1332,28 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton8ActionPerformed(evt);
             }
         });
+        jLayeredPane5.add(jButton8);
         jButton8.setBounds(370, 380, 90, 30);
-        jLayeredPane5.add(jButton8, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel42.setFont(jLabel42.getFont().deriveFont(jLabel42.getFont().getSize()+1f));
         jLabel42.setText(bundle.getString("FeedViewer.jLabel42.text")); // NOI18N
         jLabel42.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel42.setName("jLabel42"); // NOI18N
+        jLayeredPane5.add(jLabel42);
         jLabel42.setBounds(230, 110, 280, 30);
-        jLayeredPane5.add(jLabel42, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel36.setFont(jLabel36.getFont().deriveFont(jLabel36.getFont().getSize()+1f));
         jLabel36.setText(bundle.getString("FeedViewer.jLabel36.text")); // NOI18N
         jLabel36.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel36.setName("jLabel36"); // NOI18N
+        jLayeredPane5.add(jLabel36);
         jLabel36.setBounds(550, 350, 120, 20);
-        jLayeredPane5.add(jLabel36, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTabbedPane2.addTab(bundle.getString("FeedViewer.jLayeredPane5.TabConstraints.tabTitle"), jLayeredPane5); // NOI18N
 
         jLayeredPane9.setName("jLayeredPane9"); // NOI18N
 
-        jButton17.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/find.png"))); // NOI18N
+        jButton17.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/find.png"))); // NOI18N
         jButton17.setText(bundle.getString("FeedViewer.jButton17.text")); // NOI18N
         jButton17.setFocusable(false);
         jButton17.setName("jButton17"); // NOI18N
@@ -1362,8 +1362,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton17ActionPerformed(evt);
             }
         });
+        jLayeredPane9.add(jButton17);
         jButton17.setBounds(150, 54, 30, 25);
-        jLayeredPane9.add(jButton17, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton18.setBackground(new java.awt.Color(224, 218, 218));
         jButton18.setFont(jButton18.getFont().deriveFont(jButton18.getFont().getSize()+1f));
@@ -1375,21 +1375,21 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton18ActionPerformed(evt);
             }
         });
+        jLayeredPane9.add(jButton18);
         jButton18.setBounds(370, 380, 90, 30);
-        jLayeredPane9.add(jButton18, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel94.setFont(jLabel94.getFont().deriveFont(jLabel94.getFont().getSize()+1f));
         jLabel94.setText(bundle.getString("FeedViewer.jLabel94.text")); // NOI18N
         jLabel94.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel94.setName("jLabel94"); // NOI18N
+        jLayeredPane9.add(jLabel94);
         jLabel94.setBounds(230, 140, 280, 30);
-        jLayeredPane9.add(jLabel94, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel95.setFont(jLabel95.getFont().deriveFont(jLabel95.getFont().getSize()+1f));
         jLabel95.setText(bundle.getString("FeedViewer.jLabel95.text")); // NOI18N
         jLabel95.setName("jLabel95"); // NOI18N
+        jLayeredPane9.add(jLabel95);
         jLabel95.setBounds(230, 170, 140, 20);
-        jLayeredPane9.add(jLabel95, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane17.setName("jScrollPane17"); // NOI18N
 
@@ -1402,40 +1402,40 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane17.setViewportView(jList9);
 
+        jLayeredPane9.add(jScrollPane17);
         jScrollPane17.setBounds(10, 90, 170, 320);
-        jLayeredPane9.add(jScrollPane17, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel97.setFont(jLabel97.getFont().deriveFont(jLabel97.getFont().getSize()+1f));
         jLabel97.setText(bundle.getString("FeedViewer.jLabel97.text")); // NOI18N
         jLabel97.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel97.setName("jLabel97"); // NOI18N
+        jLayeredPane9.add(jLabel97);
         jLabel97.setBounds(230, 110, 280, 30);
-        jLayeredPane9.add(jLabel97, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel93.setFont(jLabel93.getFont().deriveFont(jLabel93.getFont().getSize()+1f));
         jLabel93.setText(bundle.getString("FeedViewer.jLabel93.text")); // NOI18N
         jLabel93.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel93.setName("jLabel93"); // NOI18N
+        jLayeredPane9.add(jLabel93);
         jLabel93.setBounds(230, 80, 280, 30);
-        jLayeredPane9.add(jLabel93, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jSeparator9.setOrientation(javax.swing.SwingConstants.VERTICAL);
         jSeparator9.setName("jSeparator9"); // NOI18N
+        jLayeredPane9.add(jSeparator9);
         jSeparator9.setBounds(200, 20, 10, 390);
-        jLayeredPane9.add(jSeparator9, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel92.setFont(jLabel92.getFont().deriveFont(jLabel92.getFont().getSize()+1f));
         jLabel92.setText(bundle.getString("FeedViewer.jLabel92.text")); // NOI18N
         jLabel92.setName("jLabel92"); // NOI18N
+        jLayeredPane9.add(jLabel92);
         jLabel92.setBounds(550, 290, 120, 20);
-        jLayeredPane9.add(jLabel92, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel98.setFont(jLabel98.getFont().deriveFont(jLabel98.getFont().getSize()+1f));
         jLabel98.setText(bundle.getString("FeedViewer.jLabel98.text")); // NOI18N
         jLabel98.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel98.setName("jLabel98"); // NOI18N
+        jLayeredPane9.add(jLabel98);
         jLabel98.setBounds(550, 310, 120, 40);
-        jLayeredPane9.add(jLabel98, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane18.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
         jScrollPane18.setName("jScrollPane18"); // NOI18N
@@ -1454,32 +1454,32 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane18.setViewportView(jTextPane9);
 
+        jLayeredPane9.add(jScrollPane18);
         jScrollPane18.setBounds(230, 200, 280, 170);
-        jLayeredPane9.add(jScrollPane18, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel91.setFont(jLabel91.getFont().deriveFont(jLabel91.getFont().getSize()+1f));
         jLabel91.setText(bundle.getString("FeedViewer.jLabel91.text")); // NOI18N
         jLabel91.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel91.setName("jLabel91"); // NOI18N
+        jLayeredPane9.add(jLabel91);
         jLabel91.setBounds(550, 350, 120, 20);
-        jLayeredPane9.add(jLabel91, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel96.setFont(jLabel96.getFont().deriveFont(jLabel96.getFont().getSize()+1f));
         jLabel96.setText(bundle.getString("FeedViewer.jLabel96.text")); // NOI18N
         jLabel96.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel96.setName("jLabel96"); // NOI18N
+        jLayeredPane9.add(jLabel96);
         jLabel96.setBounds(550, 370, 120, 40);
-        jLayeredPane9.add(jLabel96, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel90.setFont(jLabel90.getFont().deriveFont(jLabel90.getFont().getSize()+13f));
         jLabel90.setText(bundle.getString("FeedViewer.jLabel90.text")); // NOI18N
         jLabel90.setName("jLabel90"); // NOI18N
+        jLayeredPane9.add(jLabel90);
         jLabel90.setBounds(230, 10, 280, 70);
-        jLayeredPane9.add(jLabel90, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel99.setFont(jLabel99.getFont().deriveFont(jLabel99.getFont().getStyle() | java.awt.Font.BOLD, jLabel99.getFont().getSize()+1));
         jLabel99.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-        jLabel99.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/url-icon.png"))); // NOI18N
+        jLabel99.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/url-icon.png"))); // NOI18N
         jLabel99.setText(bundle.getString("FeedViewer.jLabel99.text")); // NOI18N
         jLabel99.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
         jLabel99.setName("jLabel99"); // NOI18N
@@ -1488,8 +1488,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jLabel99MouseClicked(evt);
             }
         });
+        jLayeredPane9.add(jLabel99);
         jLabel99.setBounds(550, 260, 120, 20);
-        jLayeredPane9.add(jLabel99, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jComboBox9.setMaximumRowCount(10);
         jComboBox9.setFocusable(false);
@@ -1499,15 +1499,15 @@ public class FeedViewer extends javax.swing.JDialog {
                 jComboBox9ActionPerformed(evt);
             }
         });
+        jLayeredPane9.add(jComboBox9);
         jComboBox9.setBounds(10, 20, 170, 22);
-        jLayeredPane9.add(jComboBox9, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel89.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel89.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/no-screenshot.png"))); // NOI18N
+        jLabel89.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/no-screenshot.png"))); // NOI18N
         jLabel89.setText(bundle.getString("FeedViewer.jLabel89.text")); // NOI18N
         jLabel89.setName("jLabel89"); // NOI18N
+        jLayeredPane9.add(jLabel89);
         jLabel89.setBounds(520, 10, 180, 240);
-        jLayeredPane9.add(jLabel89, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField9.setText(bundle.getString("FeedViewer.jTextField9.text")); // NOI18N
         jTextField9.setName("jTextField9"); // NOI18N
@@ -1516,45 +1516,45 @@ public class FeedViewer extends javax.swing.JDialog {
                 jTextField9KeyTyped(evt);
             }
         });
+        jLayeredPane9.add(jTextField9);
         jTextField9.setBounds(10, 55, 140, 23);
-        jLayeredPane9.add(jTextField9, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTabbedPane2.addTab(bundle.getString("FeedViewer.jLayeredPane9.TabConstraints.tabTitle"), jLayeredPane9); // NOI18N
 
         jLayeredPane6.setName("jLayeredPane6"); // NOI18N
 
         jLabel45.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel45.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/no-screenshot.png"))); // NOI18N
+        jLabel45.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/no-screenshot.png"))); // NOI18N
         jLabel45.setText(bundle.getString("FeedViewer.jLabel45.text")); // NOI18N
         jLabel45.setName("jLabel45"); // NOI18N
+        jLayeredPane6.add(jLabel45);
         jLabel45.setBounds(520, 10, 180, 240);
-        jLayeredPane6.add(jLabel45, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel51.setFont(jLabel51.getFont().deriveFont(jLabel51.getFont().getSize()+1f));
         jLabel51.setText(bundle.getString("FeedViewer.jLabel51.text")); // NOI18N
         jLabel51.setName("jLabel51"); // NOI18N
+        jLayeredPane6.add(jLabel51);
         jLabel51.setBounds(230, 170, 140, 20);
-        jLayeredPane6.add(jLabel51, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel48.setFont(jLabel48.getFont().deriveFont(jLabel48.getFont().getSize()+1f));
         jLabel48.setText(bundle.getString("FeedViewer.jLabel48.text")); // NOI18N
         jLabel48.setName("jLabel48"); // NOI18N
+        jLayeredPane6.add(jLabel48);
         jLabel48.setBounds(550, 290, 120, 20);
-        jLayeredPane6.add(jLabel48, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jSeparator5.setOrientation(javax.swing.SwingConstants.VERTICAL);
         jSeparator5.setName("jSeparator5"); // NOI18N
+        jLayeredPane6.add(jSeparator5);
         jSeparator5.setBounds(200, 20, 10, 390);
-        jLayeredPane6.add(jSeparator5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel49.setFont(jLabel49.getFont().deriveFont(jLabel49.getFont().getSize()+1f));
         jLabel49.setText(bundle.getString("FeedViewer.jLabel49.text")); // NOI18N
         jLabel49.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel49.setName("jLabel49"); // NOI18N
+        jLayeredPane6.add(jLabel49);
         jLabel49.setBounds(230, 80, 280, 30);
-        jLayeredPane6.add(jLabel49, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        jButton9.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/find.png"))); // NOI18N
+        jButton9.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/find.png"))); // NOI18N
         jButton9.setText(bundle.getString("FeedViewer.jButton9.text")); // NOI18N
         jButton9.setFocusable(false);
         jButton9.setName("jButton9"); // NOI18N
@@ -1563,15 +1563,15 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton9ActionPerformed(evt);
             }
         });
+        jLayeredPane6.add(jButton9);
         jButton9.setBounds(150, 54, 30, 25);
-        jLayeredPane6.add(jButton9, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel52.setFont(jLabel52.getFont().deriveFont(jLabel52.getFont().getSize()+1f));
         jLabel52.setText(bundle.getString("FeedViewer.jLabel52.text")); // NOI18N
         jLabel52.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel52.setName("jLabel52"); // NOI18N
+        jLayeredPane6.add(jLabel52);
         jLabel52.setBounds(550, 370, 120, 40);
-        jLayeredPane6.add(jLabel52, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane10.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
         jScrollPane10.setName("jScrollPane10"); // NOI18N
@@ -1590,8 +1590,8 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane10.setViewportView(jTextPane5);
 
+        jLayeredPane6.add(jScrollPane10);
         jScrollPane10.setBounds(230, 200, 280, 170);
-        jLayeredPane6.add(jScrollPane10, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField5.setText(bundle.getString("FeedViewer.jTextField5.text")); // NOI18N
         jTextField5.setName("jTextField5"); // NOI18N
@@ -1600,33 +1600,33 @@ public class FeedViewer extends javax.swing.JDialog {
                 jTextField5KeyTyped(evt);
             }
         });
+        jLayeredPane6.add(jTextField5);
         jTextField5.setBounds(10, 55, 140, 23);
-        jLayeredPane6.add(jTextField5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel47.setFont(jLabel47.getFont().deriveFont(jLabel47.getFont().getSize()+1f));
         jLabel47.setText(bundle.getString("FeedViewer.jLabel47.text")); // NOI18N
         jLabel47.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel47.setName("jLabel47"); // NOI18N
+        jLayeredPane6.add(jLabel47);
         jLabel47.setBounds(550, 350, 120, 20);
-        jLayeredPane6.add(jLabel47, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel50.setFont(jLabel50.getFont().deriveFont(jLabel50.getFont().getSize()+1f));
         jLabel50.setText(bundle.getString("FeedViewer.jLabel50.text")); // NOI18N
         jLabel50.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel50.setName("jLabel50"); // NOI18N
+        jLayeredPane6.add(jLabel50);
         jLabel50.setBounds(230, 140, 280, 30);
-        jLayeredPane6.add(jLabel50, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel53.setFont(jLabel53.getFont().deriveFont(jLabel53.getFont().getSize()+1f));
         jLabel53.setText(bundle.getString("FeedViewer.jLabel53.text")); // NOI18N
         jLabel53.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel53.setName("jLabel53"); // NOI18N
+        jLayeredPane6.add(jLabel53);
         jLabel53.setBounds(230, 110, 280, 30);
-        jLayeredPane6.add(jLabel53, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel55.setFont(jLabel55.getFont().deriveFont(jLabel55.getFont().getStyle() | java.awt.Font.BOLD, jLabel55.getFont().getSize()+1));
         jLabel55.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-        jLabel55.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/url-icon.png"))); // NOI18N
+        jLabel55.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/url-icon.png"))); // NOI18N
         jLabel55.setText(bundle.getString("FeedViewer.jLabel55.text")); // NOI18N
         jLabel55.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
         jLabel55.setName("jLabel55"); // NOI18N
@@ -1635,14 +1635,14 @@ public class FeedViewer extends javax.swing.JDialog {
                 jLabel55MouseClicked(evt);
             }
         });
+        jLayeredPane6.add(jLabel55);
         jLabel55.setBounds(550, 260, 120, 20);
-        jLayeredPane6.add(jLabel55, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel46.setFont(jLabel46.getFont().deriveFont(jLabel46.getFont().getSize()+13f));
         jLabel46.setText(bundle.getString("FeedViewer.jLabel46.text")); // NOI18N
         jLabel46.setName("jLabel46"); // NOI18N
+        jLayeredPane6.add(jLabel46);
         jLabel46.setBounds(230, 10, 280, 70);
-        jLayeredPane6.add(jLabel46, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane9.setName("jScrollPane9"); // NOI18N
 
@@ -1655,15 +1655,15 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane9.setViewportView(jList5);
 
+        jLayeredPane6.add(jScrollPane9);
         jScrollPane9.setBounds(10, 90, 170, 320);
-        jLayeredPane6.add(jScrollPane9, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel54.setFont(jLabel54.getFont().deriveFont(jLabel54.getFont().getSize()+1f));
         jLabel54.setText(bundle.getString("FeedViewer.jLabel54.text")); // NOI18N
         jLabel54.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel54.setName("jLabel54"); // NOI18N
+        jLayeredPane6.add(jLabel54);
         jLabel54.setBounds(550, 310, 120, 40);
-        jLayeredPane6.add(jLabel54, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton10.setBackground(new java.awt.Color(224, 218, 218));
         jButton10.setFont(jButton10.getFont().deriveFont(jButton10.getFont().getSize()+1f));
@@ -1675,8 +1675,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton10ActionPerformed(evt);
             }
         });
+        jLayeredPane6.add(jButton10);
         jButton10.setBounds(370, 380, 90, 30);
-        jLayeredPane6.add(jButton10, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jComboBox5.setMaximumRowCount(10);
         jComboBox5.setFocusable(false);
@@ -1686,8 +1686,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jComboBox5ActionPerformed(evt);
             }
         });
+        jLayeredPane6.add(jComboBox5);
         jComboBox5.setBounds(10, 20, 170, 22);
-        jLayeredPane6.add(jComboBox5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTabbedPane2.addTab(bundle.getString("FeedViewer.jLayeredPane6.TabConstraints.tabTitle"), jLayeredPane6); // NOI18N
 
@@ -1703,15 +1703,15 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton12ActionPerformed(evt);
             }
         });
+        jLayeredPane7.add(jButton12);
         jButton12.setBounds(370, 380, 90, 30);
-        jLayeredPane7.add(jButton12, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel64.setFont(jLabel64.getFont().deriveFont(jLabel64.getFont().getSize()+1f));
         jLabel64.setText(bundle.getString("FeedViewer.jLabel64.text")); // NOI18N
         jLabel64.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel64.setName("jLabel64"); // NOI18N
+        jLayeredPane7.add(jLabel64);
         jLabel64.setBounds(230, 110, 280, 30);
-        jLayeredPane7.add(jLabel64, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField6.setText(bundle.getString("FeedViewer.jTextField6.text")); // NOI18N
         jTextField6.setName("jTextField6"); // NOI18N
@@ -1720,8 +1720,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jTextField6KeyTyped(evt);
             }
         });
+        jLayeredPane7.add(jTextField6);
         jTextField6.setBounds(10, 55, 140, 23);
-        jLayeredPane7.add(jTextField6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane12.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
         jScrollPane12.setName("jScrollPane12"); // NOI18N
@@ -1740,34 +1740,34 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane12.setViewportView(jTextPane6);
 
+        jLayeredPane7.add(jScrollPane12);
         jScrollPane12.setBounds(230, 200, 280, 170);
-        jLayeredPane7.add(jScrollPane12, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel63.setFont(jLabel63.getFont().deriveFont(jLabel63.getFont().getSize()+1f));
         jLabel63.setText(bundle.getString("FeedViewer.jLabel63.text")); // NOI18N
         jLabel63.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel63.setName("jLabel63"); // NOI18N
+        jLayeredPane7.add(jLabel63);
         jLabel63.setBounds(550, 370, 120, 40);
-        jLayeredPane7.add(jLabel63, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel58.setFont(jLabel58.getFont().deriveFont(jLabel58.getFont().getSize()+1f));
         jLabel58.setText(bundle.getString("FeedViewer.jLabel58.text")); // NOI18N
         jLabel58.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel58.setName("jLabel58"); // NOI18N
+        jLayeredPane7.add(jLabel58);
         jLabel58.setBounds(550, 350, 120, 20);
-        jLayeredPane7.add(jLabel58, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel57.setFont(jLabel57.getFont().deriveFont(jLabel57.getFont().getSize()+13f));
         jLabel57.setText(bundle.getString("FeedViewer.jLabel57.text")); // NOI18N
         jLabel57.setName("jLabel57"); // NOI18N
+        jLayeredPane7.add(jLabel57);
         jLabel57.setBounds(230, 10, 280, 70);
-        jLayeredPane7.add(jLabel57, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel59.setFont(jLabel59.getFont().deriveFont(jLabel59.getFont().getSize()+1f));
         jLabel59.setText(bundle.getString("FeedViewer.jLabel59.text")); // NOI18N
         jLabel59.setName("jLabel59"); // NOI18N
+        jLayeredPane7.add(jLabel59);
         jLabel59.setBounds(550, 290, 120, 20);
-        jLayeredPane7.add(jLabel59, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane11.setName("jScrollPane11"); // NOI18N
 
@@ -1780,33 +1780,33 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane11.setViewportView(jList6);
 
+        jLayeredPane7.add(jScrollPane11);
         jScrollPane11.setBounds(10, 90, 170, 320);
-        jLayeredPane7.add(jScrollPane11, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel65.setFont(jLabel65.getFont().deriveFont(jLabel65.getFont().getSize()+1f));
         jLabel65.setText(bundle.getString("FeedViewer.jLabel65.text")); // NOI18N
         jLabel65.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel65.setName("jLabel65"); // NOI18N
+        jLayeredPane7.add(jLabel65);
         jLabel65.setBounds(550, 310, 120, 40);
-        jLayeredPane7.add(jLabel65, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel61.setFont(jLabel61.getFont().deriveFont(jLabel61.getFont().getSize()+1f));
         jLabel61.setText(bundle.getString("FeedViewer.jLabel61.text")); // NOI18N
         jLabel61.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel61.setName("jLabel61"); // NOI18N
+        jLayeredPane7.add(jLabel61);
         jLabel61.setBounds(230, 140, 280, 30);
-        jLayeredPane7.add(jLabel61, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel56.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel56.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/no-screenshot.png"))); // NOI18N
+        jLabel56.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/no-screenshot.png"))); // NOI18N
         jLabel56.setText(bundle.getString("FeedViewer.jLabel56.text")); // NOI18N
         jLabel56.setName("jLabel56"); // NOI18N
+        jLayeredPane7.add(jLabel56);
         jLabel56.setBounds(520, 10, 180, 240);
-        jLayeredPane7.add(jLabel56, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel66.setFont(jLabel66.getFont().deriveFont(jLabel66.getFont().getStyle() | java.awt.Font.BOLD, jLabel66.getFont().getSize()+1));
         jLabel66.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-        jLabel66.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/url-icon.png"))); // NOI18N
+        jLabel66.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/url-icon.png"))); // NOI18N
         jLabel66.setText(bundle.getString("FeedViewer.jLabel66.text")); // NOI18N
         jLabel66.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
         jLabel66.setName("jLabel66"); // NOI18N
@@ -1815,10 +1815,10 @@ public class FeedViewer extends javax.swing.JDialog {
                 jLabel66MouseClicked(evt);
             }
         });
+        jLayeredPane7.add(jLabel66);
         jLabel66.setBounds(550, 260, 120, 20);
-        jLayeredPane7.add(jLabel66, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        jButton11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/find.png"))); // NOI18N
+        jButton11.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/find.png"))); // NOI18N
         jButton11.setText(bundle.getString("FeedViewer.jButton11.text")); // NOI18N
         jButton11.setFocusable(false);
         jButton11.setName("jButton11"); // NOI18N
@@ -1827,26 +1827,26 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton11ActionPerformed(evt);
             }
         });
+        jLayeredPane7.add(jButton11);
         jButton11.setBounds(150, 54, 30, 25);
-        jLayeredPane7.add(jButton11, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jSeparator6.setOrientation(javax.swing.SwingConstants.VERTICAL);
         jSeparator6.setName("jSeparator6"); // NOI18N
+        jLayeredPane7.add(jSeparator6);
         jSeparator6.setBounds(200, 20, 10, 390);
-        jLayeredPane7.add(jSeparator6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel62.setFont(jLabel62.getFont().deriveFont(jLabel62.getFont().getSize()+1f));
         jLabel62.setText(bundle.getString("FeedViewer.jLabel62.text")); // NOI18N
         jLabel62.setName("jLabel62"); // NOI18N
+        jLayeredPane7.add(jLabel62);
         jLabel62.setBounds(230, 170, 140, 20);
-        jLayeredPane7.add(jLabel62, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel60.setFont(jLabel60.getFont().deriveFont(jLabel60.getFont().getSize()+1f));
         jLabel60.setText(bundle.getString("FeedViewer.jLabel60.text")); // NOI18N
         jLabel60.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel60.setName("jLabel60"); // NOI18N
+        jLayeredPane7.add(jLabel60);
         jLabel60.setBounds(230, 80, 280, 30);
-        jLayeredPane7.add(jLabel60, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jComboBox6.setMaximumRowCount(10);
         jComboBox6.setFocusable(false);
@@ -1856,14 +1856,14 @@ public class FeedViewer extends javax.swing.JDialog {
                 jComboBox6ActionPerformed(evt);
             }
         });
+        jLayeredPane7.add(jComboBox6);
         jComboBox6.setBounds(10, 20, 170, 22);
-        jLayeredPane7.add(jComboBox6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTabbedPane2.addTab(bundle.getString("FeedViewer.jLayeredPane7.TabConstraints.tabTitle"), jLayeredPane7); // NOI18N
 
         jLayeredPane8.setName("jLayeredPane8"); // NOI18N
 
-        jButton13.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/find.png"))); // NOI18N
+        jButton13.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/find.png"))); // NOI18N
         jButton13.setText(bundle.getString("FeedViewer.jButton13.text")); // NOI18N
         jButton13.setFocusable(false);
         jButton13.setName("jButton13"); // NOI18N
@@ -1872,15 +1872,15 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton13ActionPerformed(evt);
             }
         });
+        jLayeredPane8.add(jButton13);
         jButton13.setBounds(150, 54, 30, 25);
-        jLayeredPane8.add(jButton13, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel72.setFont(jLabel72.getFont().deriveFont(jLabel72.getFont().getSize()+1f));
         jLabel72.setText(bundle.getString("FeedViewer.jLabel72.text")); // NOI18N
         jLabel72.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel72.setName("jLabel72"); // NOI18N
+        jLayeredPane8.add(jLabel72);
         jLabel72.setBounds(230, 140, 280, 30);
-        jLayeredPane8.add(jLabel72, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane13.setName("jScrollPane13"); // NOI18N
 
@@ -1893,21 +1893,21 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane13.setViewportView(jList7);
 
+        jLayeredPane8.add(jScrollPane13);
         jScrollPane13.setBounds(10, 90, 170, 320);
-        jLayeredPane8.add(jScrollPane13, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel73.setFont(jLabel73.getFont().deriveFont(jLabel73.getFont().getSize()+1f));
         jLabel73.setText(bundle.getString("FeedViewer.jLabel73.text")); // NOI18N
         jLabel73.setName("jLabel73"); // NOI18N
+        jLayeredPane8.add(jLabel73);
         jLabel73.setBounds(230, 170, 140, 20);
-        jLayeredPane8.add(jLabel73, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel75.setFont(jLabel75.getFont().deriveFont(jLabel75.getFont().getSize()+1f));
         jLabel75.setText(bundle.getString("FeedViewer.jLabel75.text")); // NOI18N
         jLabel75.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel75.setName("jLabel75"); // NOI18N
+        jLayeredPane8.add(jLabel75);
         jLabel75.setBounds(230, 110, 280, 30);
-        jLayeredPane8.add(jLabel75, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jComboBox7.setMaximumRowCount(10);
         jComboBox7.setFocusable(false);
@@ -1917,22 +1917,22 @@ public class FeedViewer extends javax.swing.JDialog {
                 jComboBox7ActionPerformed(evt);
             }
         });
+        jLayeredPane8.add(jComboBox7);
         jComboBox7.setBounds(10, 20, 170, 22);
-        jLayeredPane8.add(jComboBox7, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel76.setFont(jLabel76.getFont().deriveFont(jLabel76.getFont().getSize()+1f));
         jLabel76.setText(bundle.getString("FeedViewer.jLabel76.text")); // NOI18N
         jLabel76.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel76.setName("jLabel76"); // NOI18N
+        jLayeredPane8.add(jLabel76);
         jLabel76.setBounds(550, 310, 120, 40);
-        jLayeredPane8.add(jLabel76, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel71.setFont(jLabel71.getFont().deriveFont(jLabel71.getFont().getSize()+1f));
         jLabel71.setText(bundle.getString("FeedViewer.jLabel71.text")); // NOI18N
         jLabel71.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel71.setName("jLabel71"); // NOI18N
+        jLayeredPane8.add(jLabel71);
         jLabel71.setBounds(230, 80, 280, 30);
-        jLayeredPane8.add(jLabel71, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton14.setBackground(new java.awt.Color(224, 218, 218));
         jButton14.setFont(jButton14.getFont().deriveFont(jButton14.getFont().getSize()+1f));
@@ -1944,26 +1944,26 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton14ActionPerformed(evt);
             }
         });
+        jLayeredPane8.add(jButton14);
         jButton14.setBounds(370, 380, 90, 30);
-        jLayeredPane8.add(jButton14, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jSeparator7.setOrientation(javax.swing.SwingConstants.VERTICAL);
         jSeparator7.setName("jSeparator7"); // NOI18N
+        jLayeredPane8.add(jSeparator7);
         jSeparator7.setBounds(200, 20, 10, 390);
-        jLayeredPane8.add(jSeparator7, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel68.setFont(jLabel68.getFont().deriveFont(jLabel68.getFont().getSize()+13f));
         jLabel68.setText(bundle.getString("FeedViewer.jLabel68.text")); // NOI18N
         jLabel68.setName("jLabel68"); // NOI18N
+        jLayeredPane8.add(jLabel68);
         jLabel68.setBounds(230, 10, 280, 70);
-        jLayeredPane8.add(jLabel68, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel69.setFont(jLabel69.getFont().deriveFont(jLabel69.getFont().getSize()+1f));
         jLabel69.setText(bundle.getString("FeedViewer.jLabel69.text")); // NOI18N
         jLabel69.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel69.setName("jLabel69"); // NOI18N
+        jLayeredPane8.add(jLabel69);
         jLabel69.setBounds(550, 350, 120, 20);
-        jLayeredPane8.add(jLabel69, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField7.setText(bundle.getString("FeedViewer.jTextField7.text")); // NOI18N
         jTextField7.setName("jTextField7"); // NOI18N
@@ -1972,19 +1972,19 @@ public class FeedViewer extends javax.swing.JDialog {
                 jTextField7KeyTyped(evt);
             }
         });
+        jLayeredPane8.add(jTextField7);
         jTextField7.setBounds(10, 55, 140, 23);
-        jLayeredPane8.add(jTextField7, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel74.setFont(jLabel74.getFont().deriveFont(jLabel74.getFont().getSize()+1f));
         jLabel74.setText(bundle.getString("FeedViewer.jLabel74.text")); // NOI18N
         jLabel74.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel74.setName("jLabel74"); // NOI18N
+        jLayeredPane8.add(jLabel74);
         jLabel74.setBounds(550, 370, 120, 40);
-        jLayeredPane8.add(jLabel74, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel77.setFont(jLabel77.getFont().deriveFont(jLabel77.getFont().getStyle() | java.awt.Font.BOLD, jLabel77.getFont().getSize()+1));
         jLabel77.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-        jLabel77.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/url-icon.png"))); // NOI18N
+        jLabel77.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/url-icon.png"))); // NOI18N
         jLabel77.setText(bundle.getString("FeedViewer.jLabel77.text")); // NOI18N
         jLabel77.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
         jLabel77.setName("jLabel77"); // NOI18N
@@ -1993,14 +1993,14 @@ public class FeedViewer extends javax.swing.JDialog {
                 jLabel77MouseClicked(evt);
             }
         });
+        jLayeredPane8.add(jLabel77);
         jLabel77.setBounds(550, 260, 120, 20);
-        jLayeredPane8.add(jLabel77, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel70.setFont(jLabel70.getFont().deriveFont(jLabel70.getFont().getSize()+1f));
         jLabel70.setText(bundle.getString("FeedViewer.jLabel70.text")); // NOI18N
         jLabel70.setName("jLabel70"); // NOI18N
+        jLayeredPane8.add(jLabel70);
         jLabel70.setBounds(550, 290, 120, 20);
-        jLayeredPane8.add(jLabel70, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane14.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
         jScrollPane14.setName("jScrollPane14"); // NOI18N
@@ -2019,15 +2019,15 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane14.setViewportView(jTextPane7);
 
+        jLayeredPane8.add(jScrollPane14);
         jScrollPane14.setBounds(230, 200, 280, 170);
-        jLayeredPane8.add(jScrollPane14, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel67.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel67.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/no-screenshot.png"))); // NOI18N
+        jLabel67.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/no-screenshot.png"))); // NOI18N
         jLabel67.setText(bundle.getString("FeedViewer.jLabel67.text")); // NOI18N
         jLabel67.setName("jLabel67"); // NOI18N
+        jLayeredPane8.add(jLabel67);
         jLabel67.setBounds(520, 10, 180, 240);
-        jLayeredPane8.add(jLabel67, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTabbedPane2.addTab(bundle.getString("FeedViewer.jLayeredPane8.TabConstraints.tabTitle"), jLayeredPane8); // NOI18N
 
@@ -2037,7 +2037,7 @@ public class FeedViewer extends javax.swing.JDialog {
 
         jLabel88.setFont(jLabel88.getFont().deriveFont(jLabel88.getFont().getStyle() | java.awt.Font.BOLD, jLabel88.getFont().getSize()+1));
         jLabel88.setHorizontalAlignment(javax.swing.SwingConstants.LEFT);
-        jLabel88.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/url-icon.png"))); // NOI18N
+        jLabel88.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/url-icon.png"))); // NOI18N
         jLabel88.setText(bundle.getString("FeedViewer.jLabel88.text")); // NOI18N
         jLabel88.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT);
         jLabel88.setName("jLabel88"); // NOI18N
@@ -2046,14 +2046,14 @@ public class FeedViewer extends javax.swing.JDialog {
                 jLabel88MouseClicked(evt);
             }
         });
+        jLayeredPane1.add(jLabel88);
         jLabel88.setBounds(550, 280, 120, 20);
-        jLayeredPane1.add(jLabel88, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel84.setFont(jLabel84.getFont().deriveFont(jLabel84.getFont().getSize()+1f));
         jLabel84.setText(bundle.getString("FeedViewer.jLabel84.text")); // NOI18N
         jLabel84.setName("jLabel84"); // NOI18N
+        jLayeredPane1.add(jLabel84);
         jLabel84.setBounds(230, 170, 140, 20);
-        jLayeredPane1.add(jLabel84, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton15.setBackground(new java.awt.Color(224, 218, 218));
         jButton15.setFont(jButton15.getFont().deriveFont(jButton15.getFont().getSize()+1f));
@@ -2064,8 +2064,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton15ActionPerformed(evt);
             }
         });
+        jLayeredPane1.add(jButton15);
         jButton15.setBounds(29, 390, 130, 30);
-        jLayeredPane1.add(jButton15, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton16.setBackground(new java.awt.Color(224, 218, 218));
         jButton16.setFont(jButton16.getFont().deriveFont(jButton16.getFont().getSize()+1f));
@@ -2076,8 +2076,8 @@ public class FeedViewer extends javax.swing.JDialog {
                 jButton16ActionPerformed(evt);
             }
         });
+        jLayeredPane1.add(jButton16);
         jButton16.setBounds(370, 400, 90, 30);
-        jLayeredPane1.add(jButton16, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane15.setName("jScrollPane15"); // NOI18N
 
@@ -2090,48 +2090,48 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane15.setViewportView(jList8);
 
+        jLayeredPane1.add(jScrollPane15);
         jScrollPane15.setBounds(10, 20, 170, 360);
-        jLayeredPane1.add(jScrollPane15, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel81.setFont(jLabel81.getFont().deriveFont(jLabel81.getFont().getSize()+1f));
         jLabel81.setText(bundle.getString("FeedViewer.jLabel81.text")); // NOI18N
         jLabel81.setName("jLabel81"); // NOI18N
+        jLayeredPane1.add(jLabel81);
         jLabel81.setBounds(550, 310, 120, 20);
-        jLayeredPane1.add(jLabel81, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel83.setFont(jLabel83.getFont().deriveFont(jLabel83.getFont().getSize()+1f));
         jLabel83.setText(bundle.getString("FeedViewer.jLabel83.text")); // NOI18N
         jLabel83.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel83.setName("jLabel83"); // NOI18N
+        jLayeredPane1.add(jLabel83);
         jLabel83.setBounds(230, 140, 280, 30);
-        jLayeredPane1.add(jLabel83, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel85.setFont(jLabel85.getFont().deriveFont(jLabel85.getFont().getSize()+1f));
         jLabel85.setText(bundle.getString("FeedViewer.jLabel85.text")); // NOI18N
         jLabel85.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel85.setName("jLabel85"); // NOI18N
+        jLayeredPane1.add(jLabel85);
         jLabel85.setBounds(550, 390, 120, 40);
-        jLayeredPane1.add(jLabel85, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel82.setFont(jLabel82.getFont().deriveFont(jLabel82.getFont().getSize()+1f));
         jLabel82.setText(bundle.getString("FeedViewer.jLabel82.text")); // NOI18N
         jLabel82.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel82.setName("jLabel82"); // NOI18N
+        jLayeredPane1.add(jLabel82);
         jLabel82.setBounds(230, 80, 280, 30);
-        jLayeredPane1.add(jLabel82, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel79.setFont(jLabel79.getFont().deriveFont(jLabel79.getFont().getSize()+13f));
         jLabel79.setText(bundle.getString("FeedViewer.jLabel79.text")); // NOI18N
         jLabel79.setName("jLabel79"); // NOI18N
+        jLayeredPane1.add(jLabel79);
         jLabel79.setBounds(230, 10, 280, 70);
-        jLayeredPane1.add(jLabel79, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel80.setFont(jLabel80.getFont().deriveFont(jLabel80.getFont().getSize()+1f));
         jLabel80.setText(bundle.getString("FeedViewer.jLabel80.text")); // NOI18N
         jLabel80.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel80.setName("jLabel80"); // NOI18N
+        jLayeredPane1.add(jLabel80);
         jLabel80.setBounds(550, 370, 120, 20);
-        jLayeredPane1.add(jLabel80, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane16.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
         jScrollPane16.setName("jScrollPane16"); // NOI18N
@@ -2150,34 +2150,34 @@ public class FeedViewer extends javax.swing.JDialog {
         });
         jScrollPane16.setViewportView(jTextPane8);
 
+        jLayeredPane1.add(jScrollPane16);
         jScrollPane16.setBounds(230, 200, 280, 190);
-        jLayeredPane1.add(jScrollPane16, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jSeparator8.setOrientation(javax.swing.SwingConstants.VERTICAL);
         jSeparator8.setName("jSeparator8"); // NOI18N
+        jLayeredPane1.add(jSeparator8);
         jSeparator8.setBounds(200, 20, 10, 420);
-        jLayeredPane1.add(jSeparator8, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel87.setFont(jLabel87.getFont().deriveFont(jLabel87.getFont().getSize()+1f));
         jLabel87.setText(bundle.getString("FeedViewer.jLabel87.text")); // NOI18N
         jLabel87.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel87.setName("jLabel87"); // NOI18N
+        jLayeredPane1.add(jLabel87);
         jLabel87.setBounds(550, 330, 120, 40);
-        jLayeredPane1.add(jLabel87, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel78.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel78.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/no-screenshot.png"))); // NOI18N
+        jLabel78.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/no-screenshot.png"))); // NOI18N
         jLabel78.setText(bundle.getString("FeedViewer.jLabel78.text")); // NOI18N
         jLabel78.setName("jLabel78"); // NOI18N
+        jLayeredPane1.add(jLabel78);
         jLabel78.setBounds(520, 20, 180, 240);
-        jLayeredPane1.add(jLabel78, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel86.setFont(jLabel86.getFont().deriveFont(jLabel86.getFont().getSize()+1f));
         jLabel86.setText(bundle.getString("FeedViewer.jLabel86.text")); // NOI18N
         jLabel86.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel86.setName("jLabel86"); // NOI18N
+        jLayeredPane1.add(jLabel86);
         jLabel86.setBounds(230, 110, 280, 30);
-        jLayeredPane1.add(jLabel86, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTabbedPane1.addTab(bundle.getString("FeedViewer.jLayeredPane1.TabConstraints.tabTitle"), jLayeredPane1); // NOI18N
 
diff --git a/src/ca/canucksoftware/wosqi/InstalledPatchInfo.form b/src/ca/canuckcoding/wosqi/InstalledPatchInfo.form
similarity index 77%
rename from src/ca/canucksoftware/wosqi/InstalledPatchInfo.form
rename to src/ca/canuckcoding/wosqi/InstalledPatchInfo.form
index 1f195e5..9a7b2be 100644
--- a/src/ca/canucksoftware/wosqi/InstalledPatchInfo.form
+++ b/src/ca/canuckcoding/wosqi/InstalledPatchInfo.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <NonVisualComponents>
     <Component class="javax.swing.ButtonGroup" name="buttonGroup1">
     </Component>
@@ -8,7 +8,7 @@
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPatchInfo.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPatchInfo.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
     </Property>
     <Property name="iconImage" type="java.awt.Image" editor="org.netbeans.modules.form.ComponentChooserEditor">
       <ComponentRef name="null"/>
@@ -18,6 +18,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="windowActivated" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowActivated"/>
@@ -58,7 +59,9 @@
         <Property name="opaque" type="boolean" value="true"/>
       </Properties>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Container class="javax.swing.JLayeredPane" name="jLayeredPane2">
           <Properties>
@@ -71,17 +74,19 @@
             <Property name="opaque" type="boolean" value="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="10" width="250" height="330" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="10" width="250" height="330"/>
             </Constraint>
           </Constraints>
 
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
           <SubComponents>
             <Component class="javax.swing.JButton" name="jButton1">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPatchInfo.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPatchInfo.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
               </Properties>
@@ -89,8 +94,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="90" y="298" width="70" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="298" width="70" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -106,8 +111,8 @@
                 <Property name="verticalTextPosition" type="int" value="1"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="90" y="10" width="150" height="40" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="10" width="150" height="40"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -121,8 +126,8 @@
                 <Property name="name" type="java.lang.String" value="jLabel6" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="90" y="50" width="150" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="50" width="150" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -134,15 +139,15 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPatchInfo.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPatchInfo.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
                 <Property name="verticalTextPosition" type="int" value="1"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="10" width="60" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="10" width="60" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -157,8 +162,8 @@
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="220" width="220" height="70" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="220" width="220" height="70"/>
                 </Constraint>
               </Constraints>
 
@@ -196,8 +201,8 @@
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="90" y="90" width="150" height="40" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="90" width="150" height="40"/>
                 </Constraint>
               </Constraints>
 
@@ -235,13 +240,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPatchInfo.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPatchInfo.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="50" width="70" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="50" width="70" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -256,8 +261,8 @@
                 <Property name="name" type="java.lang.String" value="jLabel10" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="90" y="140" width="150" height="50" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="140" width="150" height="50"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -269,13 +274,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPatchInfo.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPatchInfo.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel5" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="190" width="80" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="190" width="80" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -287,15 +292,15 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPatchInfo.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPatchInfo.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel4" noResource="true"/>
                 <Property name="verticalTextPosition" type="int" value="1"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="90" width="40" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="90" width="40" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -307,15 +312,15 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPatchInfo.jLabel11.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPatchInfo.jLabel11.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel11" noResource="true"/>
                 <Property name="verticalTextPosition" type="int" value="1"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="140" width="70" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="140" width="70" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
diff --git a/src/ca/canucksoftware/wosqi/InstalledPatchInfo.java b/src/ca/canuckcoding/wosqi/InstalledPatchInfo.java
similarity index 90%
rename from src/ca/canucksoftware/wosqi/InstalledPatchInfo.java
rename to src/ca/canuckcoding/wosqi/InstalledPatchInfo.java
index e037fd1..22cd1e3 100644
--- a/src/ca/canucksoftware/wosqi/InstalledPatchInfo.java
+++ b/src/ca/canuckcoding/wosqi/InstalledPatchInfo.java
@@ -2,10 +2,10 @@
  * WebOSQuickInstallAboutBox.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.webos.InstalledEntry;
-import ca.canucksoftware.webos.WebOSConnection;
+import ca.canuckcoding.webos.InstalledEntry;
+import ca.canuckcoding.webos.WebOSConnection;
 import java.util.ResourceBundle;
 import java.util.TimerTask;
 import java.util.Timer;
@@ -117,28 +117,28 @@ public class InstalledPatchInfo extends javax.swing.JDialog {
                 jButton1ActionPerformed(evt);
             }
         });
-        jButton1.setBounds(90, 298, 70, 23);
-        jLayeredPane2.add(jButton1, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        jLayeredPane2.add(jButton1);
+        jButton1.setBounds(90, 298, 70, 25);
 
         jLabel7.setFont(jLabel7.getFont().deriveFont(jLabel7.getFont().getSize()+1f));
         jLabel7.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel7.setName("jLabel7"); // NOI18N
         jLabel7.setVerticalTextPosition(javax.swing.SwingConstants.TOP);
+        jLayeredPane2.add(jLabel7);
         jLabel7.setBounds(90, 10, 150, 40);
-        jLayeredPane2.add(jLabel7, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel6.setFont(jLabel6.getFont().deriveFont(jLabel6.getFont().getSize()+1f));
         jLabel6.setName("jLabel6"); // NOI18N
+        jLayeredPane2.add(jLabel6);
         jLabel6.setBounds(90, 50, 150, 20);
-        jLayeredPane2.add(jLabel6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getSize()+1f));
         jLabel1.setText(bundle.getString("InstalledPatchInfo.jLabel1.text")); // NOI18N
         jLabel1.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel1.setName("jLabel1"); // NOI18N
         jLabel1.setVerticalTextPosition(javax.swing.SwingConstants.TOP);
+        jLayeredPane2.add(jLabel1);
         jLabel1.setBounds(20, 10, 60, 20);
-        jLayeredPane2.add(jLabel1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane1.setBorder(null);
         jScrollPane1.setName("jScrollPane1"); // NOI18N
@@ -154,8 +154,8 @@ public class InstalledPatchInfo extends javax.swing.JDialog {
         jTextArea1.setName("jTextArea1"); // NOI18N
         jScrollPane1.setViewportView(jTextArea1);
 
+        jLayeredPane2.add(jScrollPane1);
         jScrollPane1.setBounds(20, 220, 220, 70);
-        jLayeredPane2.add(jScrollPane1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane2.setBorder(null);
         jScrollPane2.setName("jScrollPane2"); // NOI18N
@@ -170,45 +170,45 @@ public class InstalledPatchInfo extends javax.swing.JDialog {
         jTextArea2.setName("jTextArea2"); // NOI18N
         jScrollPane2.setViewportView(jTextArea2);
 
+        jLayeredPane2.add(jScrollPane2);
         jScrollPane2.setBounds(90, 90, 150, 40);
-        jLayeredPane2.add(jScrollPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getSize()+1f));
         jLabel2.setText(bundle.getString("InstalledPatchInfo.jLabel2.text")); // NOI18N
         jLabel2.setName("jLabel2"); // NOI18N
+        jLayeredPane2.add(jLabel2);
         jLabel2.setBounds(20, 50, 70, 20);
-        jLayeredPane2.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel10.setFont(jLabel10.getFont().deriveFont(jLabel10.getFont().getSize()+1f));
         jLabel10.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel10.setName("jLabel10"); // NOI18N
+        jLayeredPane2.add(jLabel10);
         jLabel10.setBounds(90, 140, 150, 50);
-        jLayeredPane2.add(jLabel10, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel5.setFont(jLabel5.getFont().deriveFont(jLabel5.getFont().getSize()+1f));
         jLabel5.setText(bundle.getString("InstalledPatchInfo.jLabel5.text")); // NOI18N
         jLabel5.setName("jLabel5"); // NOI18N
+        jLayeredPane2.add(jLabel5);
         jLabel5.setBounds(20, 190, 80, 20);
-        jLayeredPane2.add(jLabel5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel4.setFont(jLabel4.getFont().deriveFont(jLabel4.getFont().getSize()+1f));
         jLabel4.setText(bundle.getString("InstalledPatchInfo.jLabel4.text")); // NOI18N
         jLabel4.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel4.setName("jLabel4"); // NOI18N
         jLabel4.setVerticalTextPosition(javax.swing.SwingConstants.TOP);
+        jLayeredPane2.add(jLabel4);
         jLabel4.setBounds(20, 90, 40, 20);
-        jLayeredPane2.add(jLabel4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel11.setFont(jLabel11.getFont().deriveFont(jLabel11.getFont().getSize()+1f));
         jLabel11.setText(bundle.getString("InstalledPatchInfo.jLabel11.text")); // NOI18N
         jLabel11.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel11.setName("jLabel11"); // NOI18N
         jLabel11.setVerticalTextPosition(javax.swing.SwingConstants.TOP);
+        jLayeredPane2.add(jLabel11);
         jLabel11.setBounds(20, 140, 70, 20);
-        jLayeredPane2.add(jLabel11, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
+        jLayeredPane1.add(jLayeredPane2);
         jLayeredPane2.setBounds(10, 10, 250, 330);
-        jLayeredPane1.add(jLayeredPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
diff --git a/src/ca/canucksoftware/wosqi/InstalledPkgInfo.form b/src/ca/canuckcoding/wosqi/InstalledPkgInfo.form
similarity index 77%
rename from src/ca/canucksoftware/wosqi/InstalledPkgInfo.form
rename to src/ca/canuckcoding/wosqi/InstalledPkgInfo.form
index f920d50..53d00f4 100644
--- a/src/ca/canucksoftware/wosqi/InstalledPkgInfo.form
+++ b/src/ca/canuckcoding/wosqi/InstalledPkgInfo.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <NonVisualComponents>
     <Component class="javax.swing.ButtonGroup" name="buttonGroup1">
     </Component>
@@ -8,7 +8,7 @@
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPkgInfo.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPkgInfo.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
     </Property>
     <Property name="iconImage" type="java.awt.Image" editor="org.netbeans.modules.form.ComponentChooserEditor">
       <ComponentRef name="null"/>
@@ -18,6 +18,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="windowActivated" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowActivated"/>
@@ -55,7 +56,9 @@
         <Property name="opaque" type="boolean" value="true"/>
       </Properties>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Container class="javax.swing.JLayeredPane" name="jLayeredPane2">
           <Properties>
@@ -68,12 +71,14 @@
             <Property name="opaque" type="boolean" value="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="10" width="250" height="220" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="10" width="250" height="220"/>
             </Constraint>
           </Constraints>
 
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
           <SubComponents>
             <Container class="javax.swing.JScrollPane" name="jScrollPane2">
               <Properties>
@@ -86,8 +91,8 @@
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="90" y="90" width="150" height="40" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="90" width="150" height="40"/>
                 </Constraint>
               </Constraints>
 
@@ -125,15 +130,15 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPkgInfo.jLabel11.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPkgInfo.jLabel11.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel11" noResource="true"/>
                 <Property name="verticalTextPosition" type="int" value="1"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="140" width="70" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="140" width="70" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -148,8 +153,8 @@
                 <Property name="name" type="java.lang.String" value="jLabel10" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="90" y="140" width="150" height="40" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="140" width="150" height="40"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -163,8 +168,8 @@
                 <Property name="name" type="java.lang.String" value="jLabel6" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="90" y="50" width="150" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="50" width="150" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -176,15 +181,15 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPkgInfo.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPkgInfo.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
                 <Property name="verticalTextPosition" type="int" value="1"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="10" width="60" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="10" width="60" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -196,15 +201,15 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPkgInfo.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPkgInfo.jLabel4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel4" noResource="true"/>
                 <Property name="verticalTextPosition" type="int" value="1"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="90" width="40" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="90" width="40" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -216,13 +221,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPkgInfo.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPkgInfo.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="50" width="70" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="50" width="70" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -234,7 +239,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="InstalledPkgInfo.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="InstalledPkgInfo.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
               </Properties>
@@ -242,8 +247,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="90" y="190" width="70" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="190" width="70" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -259,8 +264,8 @@
                 <Property name="verticalTextPosition" type="int" value="1"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="90" y="10" width="150" height="40" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="90" y="10" width="150" height="40"/>
                 </Constraint>
               </Constraints>
             </Component>
diff --git a/src/ca/canucksoftware/wosqi/InstalledPkgInfo.java b/src/ca/canuckcoding/wosqi/InstalledPkgInfo.java
similarity index 91%
rename from src/ca/canucksoftware/wosqi/InstalledPkgInfo.java
rename to src/ca/canuckcoding/wosqi/InstalledPkgInfo.java
index a5821c4..1fa63c1 100644
--- a/src/ca/canucksoftware/wosqi/InstalledPkgInfo.java
+++ b/src/ca/canuckcoding/wosqi/InstalledPkgInfo.java
@@ -2,10 +2,10 @@
  * WebOSQuickInstallAboutBox.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.webos.InstalledEntry;
-import ca.canucksoftware.webos.WebOSConnection;
+import ca.canuckcoding.webos.InstalledEntry;
+import ca.canuckcoding.webos.WebOSConnection;
 import java.util.ResourceBundle;
 import java.util.TimerTask;
 import java.util.Timer;
@@ -120,49 +120,49 @@ public class InstalledPkgInfo extends javax.swing.JDialog {
         jTextArea2.setName("jTextArea2"); // NOI18N
         jScrollPane2.setViewportView(jTextArea2);
 
+        jLayeredPane2.add(jScrollPane2);
         jScrollPane2.setBounds(90, 90, 150, 40);
-        jLayeredPane2.add(jScrollPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel11.setFont(jLabel11.getFont().deriveFont(jLabel11.getFont().getSize()+1f));
         jLabel11.setText(bundle.getString("InstalledPkgInfo.jLabel11.text")); // NOI18N
         jLabel11.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel11.setName("jLabel11"); // NOI18N
         jLabel11.setVerticalTextPosition(javax.swing.SwingConstants.TOP);
+        jLayeredPane2.add(jLabel11);
         jLabel11.setBounds(20, 140, 70, 20);
-        jLayeredPane2.add(jLabel11, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel10.setFont(jLabel10.getFont().deriveFont(jLabel10.getFont().getSize()+1f));
         jLabel10.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel10.setName("jLabel10"); // NOI18N
+        jLayeredPane2.add(jLabel10);
         jLabel10.setBounds(90, 140, 150, 40);
-        jLayeredPane2.add(jLabel10, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel6.setFont(jLabel6.getFont().deriveFont(jLabel6.getFont().getSize()+1f));
         jLabel6.setName("jLabel6"); // NOI18N
+        jLayeredPane2.add(jLabel6);
         jLabel6.setBounds(90, 50, 150, 20);
-        jLayeredPane2.add(jLabel6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getSize()+1f));
         jLabel1.setText(bundle.getString("InstalledPkgInfo.jLabel1.text")); // NOI18N
         jLabel1.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel1.setName("jLabel1"); // NOI18N
         jLabel1.setVerticalTextPosition(javax.swing.SwingConstants.TOP);
+        jLayeredPane2.add(jLabel1);
         jLabel1.setBounds(20, 10, 60, 20);
-        jLayeredPane2.add(jLabel1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel4.setFont(jLabel4.getFont().deriveFont(jLabel4.getFont().getSize()+1f));
         jLabel4.setText(bundle.getString("InstalledPkgInfo.jLabel4.text")); // NOI18N
         jLabel4.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel4.setName("jLabel4"); // NOI18N
         jLabel4.setVerticalTextPosition(javax.swing.SwingConstants.TOP);
+        jLayeredPane2.add(jLabel4);
         jLabel4.setBounds(20, 90, 40, 20);
-        jLayeredPane2.add(jLabel4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getSize()+1f));
         jLabel2.setText(bundle.getString("InstalledPkgInfo.jLabel2.text")); // NOI18N
         jLabel2.setName("jLabel2"); // NOI18N
+        jLayeredPane2.add(jLabel2);
         jLabel2.setBounds(20, 50, 70, 20);
-        jLayeredPane2.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton1.setFont(jButton1.getFont());
         jButton1.setText(bundle.getString("InstalledPkgInfo.jButton1.text")); // NOI18N
@@ -172,18 +172,18 @@ public class InstalledPkgInfo extends javax.swing.JDialog {
                 jButton1ActionPerformed(evt);
             }
         });
-        jButton1.setBounds(90, 190, 70, 23);
-        jLayeredPane2.add(jButton1, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        jLayeredPane2.add(jButton1);
+        jButton1.setBounds(90, 190, 70, 25);
 
         jLabel7.setFont(jLabel7.getFont().deriveFont(jLabel7.getFont().getSize()+1f));
         jLabel7.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel7.setName("jLabel7"); // NOI18N
         jLabel7.setVerticalTextPosition(javax.swing.SwingConstants.TOP);
+        jLayeredPane2.add(jLabel7);
         jLabel7.setBounds(90, 10, 150, 40);
-        jLayeredPane2.add(jLabel7, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
+        jLayeredPane1.add(jLayeredPane2);
         jLayeredPane2.setBounds(10, 10, 250, 220);
-        jLayeredPane1.add(jLayeredPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
diff --git a/src/ca/canucksoftware/wosqi/Installer.form b/src/ca/canuckcoding/wosqi/Installer.form
similarity index 79%
rename from src/ca/canucksoftware/wosqi/Installer.form
rename to src/ca/canuckcoding/wosqi/Installer.form
index 2c9500c..d263b74 100644
--- a/src/ca/canucksoftware/wosqi/Installer.form
+++ b/src/ca/canuckcoding/wosqi/Installer.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="0"/>
     <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
@@ -21,6 +21,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="windowActivated" listener="java.awt.event.WindowListener" parameters="java.awt.event.WindowEvent" handler="formWindowActivated"/>
@@ -64,7 +65,9 @@
         <Property name="opaque" type="boolean" value="true"/>
       </Properties>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Component class="javax.swing.JLabel" name="jLabel5">
           <Properties>
@@ -75,13 +78,13 @@
             </Property>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Installer.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Installer.jLabel5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel5" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="30" y="70" width="240" height="20" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="30" y="70" width="240" height="20"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -94,14 +97,14 @@
               <Color blue="db" green="db" red="db" type="rgb"/>
             </Property>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/busy_icon.gif"/>
+              <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/busy_icon.gif"/>
             </Property>
             <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
             <Property name="opaque" type="boolean" value="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="120" y="10" width="60" height="50" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="120" y="10" width="60" height="50"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -109,28 +112,28 @@
           <Properties>
             <Property name="horizontalAlignment" type="int" value="0"/>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/Pre-48x48.png"/>
+              <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/Pre-48x48.png"/>
             </Property>
             <Property name="verticalAlignment" type="int" value="3"/>
             <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="170" y="10" width="60" height="50" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="170" y="10" width="60" height="50"/>
             </Constraint>
           </Constraints>
         </Component>
         <Component class="javax.swing.JLabel" name="jLabel4">
           <Properties>
             <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-              <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/Computer-48x48.png"/>
+              <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/Computer-48x48.png"/>
             </Property>
             <Property name="verticalAlignment" type="int" value="1"/>
             <Property name="name" type="java.lang.String" value="jLabel4" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="70" y="10" width="50" height="50" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="70" y="10" width="50" height="50"/>
             </Constraint>
           </Constraints>
         </Component>
@@ -146,8 +149,8 @@
             <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="30" y="90" width="240" height="30" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="30" y="90" width="240" height="30"/>
             </Constraint>
           </Constraints>
         </Component>
diff --git a/src/ca/canucksoftware/wosqi/Installer.java b/src/ca/canuckcoding/wosqi/Installer.java
similarity index 91%
rename from src/ca/canucksoftware/wosqi/Installer.java
rename to src/ca/canuckcoding/wosqi/Installer.java
index 479fd81..f723514 100644
--- a/src/ca/canucksoftware/wosqi/Installer.java
+++ b/src/ca/canuckcoding/wosqi/Installer.java
@@ -2,15 +2,15 @@
  * WebOSQuickInstallAboutBox.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.ipkg.PackageFeed;
-import ca.canucksoftware.utils.FileUtils;
-import ca.canucksoftware.utils.OnlineFile;
-import ca.canucksoftware.webos.DeviceInfo;
-import ca.canucksoftware.webos.Patcher;
-import ca.canucksoftware.webos.ScriptType;
-import ca.canucksoftware.webos.WebOSConnection;
+import ca.canuckcoding.ipkg.PackageFeed;
+import ca.canuckcoding.utils.FileUtils;
+import ca.canuckcoding.utils.OnlineFile;
+import ca.canuckcoding.webos.DeviceInfo;
+import ca.canuckcoding.webos.Patcher;
+import ca.canuckcoding.webos.ScriptType;
+import ca.canuckcoding.webos.WebOSConnection;
 import java.io.File;
 import java.text.MessageFormat;
 import java.util.ArrayList;
@@ -64,7 +64,7 @@ public class Installer extends javax.swing.JDialog {
         webOS.mkdir("/media/internal/.developer/");
         patcher = new Patcher(webOS);
         webOS.sendScript(ScriptType.ScanID);
-        webOS.configIpkg();
+        webOS.configPkgMgr();
 
         for(int i=0; i<items.size(); i++) {
             Object curr = items.get(i);
@@ -181,36 +181,36 @@ public class Installer extends javax.swing.JDialog {
         jLabel5.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         jLabel5.setText(bundle.getString("Installer.jLabel5.text")); // NOI18N
         jLabel5.setName("jLabel5"); // NOI18N
+        jLayeredPane1.add(jLabel5);
         jLabel5.setBounds(30, 70, 240, 20);
-        jLayeredPane1.add(jLabel5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel1.setBackground(new java.awt.Color(219, 219, 219));
         jLabel1.setForeground(new java.awt.Color(219, 219, 219));
-        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/busy_icon.gif"))); // NOI18N
+        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/busy_icon.gif"))); // NOI18N
         jLabel1.setName("jLabel1"); // NOI18N
         jLabel1.setOpaque(true);
+        jLayeredPane1.add(jLabel1);
         jLabel1.setBounds(120, 10, 60, 50);
-        jLayeredPane1.add(jLabel1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel3.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
-        jLabel3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/Pre-48x48.png"))); // NOI18N
+        jLabel3.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/Pre-48x48.png"))); // NOI18N
         jLabel3.setVerticalAlignment(javax.swing.SwingConstants.BOTTOM);
         jLabel3.setName("jLabel3"); // NOI18N
+        jLayeredPane1.add(jLabel3);
         jLabel3.setBounds(170, 10, 60, 50);
-        jLayeredPane1.add(jLabel3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        jLabel4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/Computer-48x48.png"))); // NOI18N
+        jLabel4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/Computer-48x48.png"))); // NOI18N
         jLabel4.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel4.setName("jLabel4"); // NOI18N
+        jLayeredPane1.add(jLabel4);
         jLabel4.setBounds(70, 10, 50, 50);
-        jLayeredPane1.add(jLabel4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel2.setFont(jLabel2.getFont());
         jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
         jLabel2.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel2.setName("jLabel2"); // NOI18N
+        jLayeredPane1.add(jLabel2);
         jLabel2.setBounds(30, 90, 240, 30);
-        jLayeredPane1.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
diff --git a/src/ca/canucksoftware/wosqi/MainView.form b/src/ca/canuckcoding/wosqi/MainView.form
similarity index 78%
rename from src/ca/canucksoftware/wosqi/MainView.form
rename to src/ca/canuckcoding/wosqi/MainView.form
index 1387d3c..16d602c 100644
--- a/src/ca/canucksoftware/wosqi/MainView.form
+++ b/src/ca/canuckcoding/wosqi/MainView.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7">
+<Form version="1.9" maxVersion="1.9">
   <NonVisualComponents>
     <Container class="javax.swing.JPanel" name="mainPanel">
       <Properties>
@@ -25,30 +25,34 @@
       <SubComponents>
         <Container class="javax.swing.JLayeredPane" name="jLayeredPane1">
 
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
           <SubComponents>
             <Container class="javax.swing.JLayeredPane" name="jLayeredPane3">
               <Properties>
                 <Property name="focusable" type="boolean" value="false"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="460" y="160" width="170" height="210" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="460" y="160" width="170" height="210"/>
                 </Constraint>
               </Constraints>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+                <Property name="useNullLayout" type="boolean" value="true"/>
+              </Layout>
               <SubComponents>
                 <Component class="javax.swing.JLabel" name="jLabel1">
                   <Properties>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/pre_shadow.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/pre_shadow.png"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                   </Properties>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="10" y="30" width="150" height="160" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="10" y="30" width="150" height="160"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -64,18 +68,20 @@
                           <Color PropertyName="color" blue="80" green="80" red="80" type="rgb"/>
                         </LineBorder>
                       </Border>
-                      <ResourceString PropertyName="titleX" bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jLayeredPane7.border.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString PropertyName="titleX" bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jLayeredPane7.border.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </TitledBorder>
                   </Border>
                 </Property>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="10" y="25" width="590" height="240" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="10" y="25" width="590" height="240"/>
                 </Constraint>
               </Constraints>
 
-              <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+              <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+                <Property name="useNullLayout" type="boolean" value="true"/>
+              </Layout>
               <SubComponents>
                 <Component class="javax.swing.JButton" name="jButton4">
                   <Properties>
@@ -83,7 +89,7 @@
                       <Color blue="cb" green="cb" red="cb" type="rgb"/>
                     </Property>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/remove.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/remove.png"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="iconTextGap" type="int" value="0"/>
@@ -104,8 +110,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton4ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="70" width="40" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="70" width="40" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -117,6 +123,9 @@
                     <Property name="background" type="java.awt.Color" editor="org.netbeans.beaninfo.editors.ColorEditor">
                       <Color blue="cb" green="cb" red="cb" type="rgb"/>
                     </Property>
+                    <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/online.png"/>
+                    </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="iconTextGap" type="int" value="0"/>
                     <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
@@ -136,8 +145,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton5ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="120" width="40" height="40" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="120" width="40" height="40"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -152,8 +161,8 @@
                     <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
                   </AuxValues>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="20" y="30" width="-1" height="-1" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="20" y="30" width="-1" height="-1"/>
                     </Constraint>
                   </Constraints>
 
@@ -175,21 +184,21 @@
                           <TableColumnModel selectionModel="0">
                             <Column maxWidth="-1" minWidth="-1" prefWidth="350" resizable="false">
                               <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                                <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title0" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                                <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title0" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                               </Title>
                               <Editor/>
                               <Renderer/>
                             </Column>
                             <Column maxWidth="-1" minWidth="-1" prefWidth="125" resizable="false">
                               <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                                <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title1" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                                <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title1" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                               </Title>
                               <Editor/>
                               <Renderer/>
                             </Column>
                             <Column maxWidth="-1" minWidth="-1" prefWidth="250" resizable="false">
                               <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                                <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title2" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                                <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.installTable.columnModel.title2" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                               </Title>
                               <Editor/>
                               <Renderer/>
@@ -219,7 +228,7 @@
                       <Color blue="dc" green="dc" red="dc" type="rgb"/>
                     </Property>
                     <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                      <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/add.png"/>
+                      <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/add.png"/>
                     </Property>
                     <Property name="focusable" type="boolean" value="false"/>
                     <Property name="iconTextGap" type="int" value="0"/>
@@ -240,8 +249,8 @@
                     <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
                   </Events>
                   <Constraints>
-                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                      <JLayeredPaneConstraints x="520" y="30" width="40" height="30" layer="0" position="-1"/>
+                    <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                      <AbsoluteConstraints x="520" y="30" width="40" height="30"/>
                     </Constraint>
                   </Constraints>
                 </Component>
@@ -251,20 +260,20 @@
               <Properties>
                 <Property name="horizontalAlignment" type="int" value="4"/>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="focusable" type="boolean" value="false"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="350" y="5" width="100" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="350" y="5" width="100" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JButton" name="jButton2">
               <Properties>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/find-apps-precentralnet.png"/>
+                  <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/find-apps-precentralnet.png"/>
                 </Property>
                 <Property name="borderPainted" type="boolean" value="false"/>
                 <Property name="contentAreaFilled" type="boolean" value="false"/>
@@ -274,8 +283,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="280" width="130" height="60" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="280" width="130" height="60"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -290,7 +299,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jButton3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jButton3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="focusable" type="boolean" value="false"/>
                 <Property name="horizontalTextPosition" type="int" value="0"/>
@@ -299,8 +308,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton3ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="240" y="290" width="140" height="33" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="240" y="290" width="140" height="33"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -320,8 +329,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox1ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="460" y="5" width="140" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="460" y="5" width="140" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -338,7 +347,7 @@
         <Menu class="javax.swing.JMenu" name="fileMenu">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.fileMenu.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.fileMenu.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <AuxValues>
@@ -349,7 +358,7 @@
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem1">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jMenuItem1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -361,7 +370,7 @@
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem8">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jMenuItem8.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem8.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -371,7 +380,7 @@
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem2">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jMenuItem2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -386,7 +395,7 @@
                   <action class="org.jdesktop.application.Application" id="quit" methodName="quit"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="EXIT" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="EXIT" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <AuxValues>
@@ -399,14 +408,14 @@
         <Menu class="javax.swing.JMenu" name="toolMenu">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.toolMenu.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.toolMenu.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <SubComponents>
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem3">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jMenuItem3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -416,7 +425,7 @@
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem4">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jMenuItem4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem4.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -426,7 +435,7 @@
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem5">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jMenuItem5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem5.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -438,7 +447,7 @@
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem9">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jMenuItem9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem9.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -450,7 +459,7 @@
         <Menu class="javax.swing.JMenu" name="helpMenu">
           <Properties>
             <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-              <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.helpMenu.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+              <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.helpMenu.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
             </Property>
           </Properties>
           <AuxValues>
@@ -461,7 +470,7 @@
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem6">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jMenuItem6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem6.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
@@ -471,20 +480,33 @@
             <MenuItem class="javax.swing.JMenuItem" name="jMenuItem7">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.jMenuItem7.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem7.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem7ActionPerformed"/>
               </Events>
             </MenuItem>
+            <MenuItem class="javax.swing.JMenuItem" name="jMenuItem10">
+              <Properties>
+                <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem10.text" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+                </Property>
+                <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.jMenuItem10.toolTipText" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
+                </Property>
+              </Properties>
+              <Events>
+                <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jMenuItem10ActionPerformed"/>
+              </Events>
+            </MenuItem>
             <MenuItem class="javax.swing.JMenuItem" name="aboutMenuItem">
               <Properties>
                 <Property name="action" type="javax.swing.Action" editor="org.netbeans.modules.swingapp.ActionEditor">
-                  <action class="ca.canucksoftware.wosqi.WebOSQuickInstallView" id="showAboutBox" methodName="showAboutBox"/>
+                  <action class="ca.canuckcoding.wosqi.WebOSQuickInstallView" id="showAboutBox" methodName="showAboutBox"/>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="MainView.aboutMenuItem.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="MainView.aboutMenuItem.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
               </Properties>
               <Events>
diff --git a/src/ca/canucksoftware/wosqi/MainView.java b/src/ca/canuckcoding/wosqi/MainView.java
similarity index 89%
rename from src/ca/canucksoftware/wosqi/MainView.java
rename to src/ca/canuckcoding/wosqi/MainView.java
index a74dfda..3d42163 100644
--- a/src/ca/canucksoftware/wosqi/MainView.java
+++ b/src/ca/canuckcoding/wosqi/MainView.java
@@ -1,15 +1,15 @@
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.ipkg.PackageManager;
-import ca.canucksoftware.novacom.Novacom;
-import ca.canucksoftware.novacom.DriverInstaller;
-import ca.canucksoftware.utils.FileUtils;
-import ca.canucksoftware.webos.DeviceInfo;
-import ca.canucksoftware.webos.WebOS;
-import ca.canucksoftware.webos.WebOSConnection;
-import ca.canucksoftware.webos.WebOSDevice;
-import ca.canucksoftware.webos.WebOSException;
+import ca.canuckcoding.ipkg.PackageManager;
+import ca.canuckcoding.novacom.Novacom;
+import ca.canuckcoding.novacom.NovacomDrivers;
+import ca.canuckcoding.utils.FileUtils;
+import ca.canuckcoding.webos.DeviceInfo;
+import ca.canuckcoding.webos.WebOS;
+import ca.canuckcoding.webos.WebOSConnection;
+import ca.canuckcoding.webos.WebOSDevice;
+import ca.canuckcoding.webos.WebOSException;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Container;
@@ -83,13 +83,13 @@ public class MainView extends FrameView {
         webOS = new WebOSConnection[0];
         loadList();
         timer = new Timer();
-        if(Novacom.isInstalled()) {
-            reloadDeviceCache();
-            if(jComboBox1.getItemCount()==0) {
+        reloadDeviceCache();
+        if(jComboBox1.getItemCount()==0) {
+            if(Novacom.isInstalled()) {
                 timer.schedule(new FirstCheckConnection(), 100);
+            } else {
+                timer.schedule(new DoInstallDrivers(), 100);
             }
-        } else {
-            timer.schedule(new DoInstallDrivers(), 100);
         }
     }
 
@@ -289,10 +289,12 @@ public class MainView extends FrameView {
     }
 
     private void installDrivers(boolean exitOnFail) {
-        JFrame mainFrame = WebOSQuickInstallApp.getApplication().getMainFrame();
-        DriverInstaller downloader = new DriverInstaller(mainFrame);
-        downloader.setLocationRelativeTo(mainFrame);
-        WebOSQuickInstallApp.getApplication().show(downloader);
+        NovacomDrivers driver = new NovacomDrivers();
+        if(driver.install()) {
+            JOptionPane.showMessageDialog(mainPanel, bundle.getString("DRIVER_INSTALLED_SUCCESSFULLY."));
+        } else {
+            JOptionPane.showMessageDialog(mainPanel, bundle.getString("ERROR\\:_DRIVER_INSTALLATION_FAILED"));
+        }
         reloadDeviceCache();
     }
 
@@ -336,24 +338,25 @@ public class MainView extends FrameView {
         javax.swing.JMenu helpMenu = new javax.swing.JMenu();
         jMenuItem6 = new javax.swing.JMenuItem();
         jMenuItem7 = new javax.swing.JMenuItem();
+        jMenuItem10 = new javax.swing.JMenuItem();
         javax.swing.JMenuItem aboutMenuItem = new javax.swing.JMenuItem();
 
         mainPanel.setName("mainView"); // NOI18N
 
         jLayeredPane3.setFocusable(false);
 
-        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/pre_shadow.png"))); // NOI18N
+        jLabel1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/pre_shadow.png"))); // NOI18N
         jLabel1.setFocusable(false);
+        jLayeredPane3.add(jLabel1);
         jLabel1.setBounds(10, 30, 150, 160);
-        jLayeredPane3.add(jLabel1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
+        jLayeredPane1.add(jLayeredPane3);
         jLayeredPane3.setBounds(460, 160, 170, 210);
-        jLayeredPane1.add(jLayeredPane3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLayeredPane7.setBorder(javax.swing.BorderFactory.createTitledBorder(new javax.swing.border.LineBorder(new java.awt.Color(128, 128, 128), 1, true), bundle.getString("MainView.jLayeredPane7.border.title"))); // NOI18N
 
         jButton4.setBackground(new java.awt.Color(203, 203, 203));
-        jButton4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/remove.png"))); // NOI18N
+        jButton4.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/remove.png"))); // NOI18N
         jButton4.setFocusable(false);
         jButton4.setIconTextGap(0);
         jButton4.setMargin(new java.awt.Insets(0, 0, 0, 0));
@@ -365,13 +368,13 @@ public class MainView extends FrameView {
                 jButton4ActionPerformed(evt);
             }
         });
+        jLayeredPane7.add(jButton4);
         jButton4.setBounds(520, 70, 40, 30);
-        jLayeredPane7.add(jButton4, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(ca.canucksoftware.wosqi.WebOSQuickInstallApp.class).getContext().getActionMap(MainView.class, this);
+        javax.swing.ActionMap actionMap = org.jdesktop.application.Application.getInstance(ca.canuckcoding.wosqi.WebOSQuickInstallApp.class).getContext().getActionMap(MainView.class, this);
         jButton5.setAction(actionMap.get("openRepository")); // NOI18N
         jButton5.setBackground(new java.awt.Color(203, 203, 203));
-        jButton5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/online.png"))); // NOI18N
+        jButton5.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/online.png"))); // NOI18N
         jButton5.setFocusable(false);
         jButton5.setIconTextGap(0);
         jButton5.setMargin(new java.awt.Insets(0, 0, 0, 0));
@@ -383,13 +386,13 @@ public class MainView extends FrameView {
                 jButton5ActionPerformed(evt);
             }
         });
+        jLayeredPane7.add(jButton5);
         jButton5.setBounds(520, 120, 40, 40);
-        jLayeredPane7.add(jButton5, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane2.setAutoscrolls(true);
         jScrollPane2.setPreferredSize(new java.awt.Dimension(485, 191));
 
-        jTable1.setFont(new java.awt.Font("Tahoma", 0, 12));
+        jTable1.setFont(new java.awt.Font("Tahoma", 0, 12)); // NOI18N
         jTable1.setModel(new javax.swing.table.DefaultTableModel(
             new Object [][] {
 
@@ -421,21 +424,23 @@ public class MainView extends FrameView {
         jTable1.setRowHeight(20);
         jTable1.getTableHeader().setReorderingAllowed(false);
         jScrollPane2.setViewportView(jTable1);
-        jTable1.getColumnModel().getColumn(0).setResizable(false);
-        jTable1.getColumnModel().getColumn(0).setPreferredWidth(350);
-        jTable1.getColumnModel().getColumn(0).setHeaderValue(bundle.getString("MainView.installTable.columnModel.title0")); // NOI18N
-        jTable1.getColumnModel().getColumn(1).setResizable(false);
-        jTable1.getColumnModel().getColumn(1).setPreferredWidth(125);
-        jTable1.getColumnModel().getColumn(1).setHeaderValue(bundle.getString("MainView.installTable.columnModel.title1")); // NOI18N
-        jTable1.getColumnModel().getColumn(2).setResizable(false);
-        jTable1.getColumnModel().getColumn(2).setPreferredWidth(250);
-        jTable1.getColumnModel().getColumn(2).setHeaderValue(bundle.getString("MainView.installTable.columnModel.title2")); // NOI18N
+        if (jTable1.getColumnModel().getColumnCount() > 0) {
+            jTable1.getColumnModel().getColumn(0).setResizable(false);
+            jTable1.getColumnModel().getColumn(0).setPreferredWidth(350);
+            jTable1.getColumnModel().getColumn(0).setHeaderValue(bundle.getString("MainView.installTable.columnModel.title0")); // NOI18N
+            jTable1.getColumnModel().getColumn(1).setResizable(false);
+            jTable1.getColumnModel().getColumn(1).setPreferredWidth(125);
+            jTable1.getColumnModel().getColumn(1).setHeaderValue(bundle.getString("MainView.installTable.columnModel.title1")); // NOI18N
+            jTable1.getColumnModel().getColumn(2).setResizable(false);
+            jTable1.getColumnModel().getColumn(2).setPreferredWidth(250);
+            jTable1.getColumnModel().getColumn(2).setHeaderValue(bundle.getString("MainView.installTable.columnModel.title2")); // NOI18N
+        }
 
+        jLayeredPane7.add(jScrollPane2);
         jScrollPane2.setBounds(20, 30, 485, 191);
-        jLayeredPane7.add(jScrollPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton1.setBackground(new java.awt.Color(220, 220, 220));
-        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/add.png"))); // NOI18N
+        jButton1.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/add.png"))); // NOI18N
         jButton1.setFocusable(false);
         jButton1.setIconTextGap(0);
         jButton1.setMargin(new java.awt.Insets(0, 0, 0, 0));
@@ -447,19 +452,19 @@ public class MainView extends FrameView {
                 jButton1ActionPerformed(evt);
             }
         });
+        jLayeredPane7.add(jButton1);
         jButton1.setBounds(520, 30, 40, 30);
-        jLayeredPane7.add(jButton1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
+        jLayeredPane1.add(jLayeredPane7);
         jLayeredPane7.setBounds(10, 25, 590, 240);
-        jLayeredPane1.add(jLayeredPane7, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel2.setHorizontalAlignment(javax.swing.SwingConstants.RIGHT);
         jLabel2.setText(bundle.getString("MainView.jLabel2.text")); // NOI18N
         jLabel2.setFocusable(false);
+        jLayeredPane1.add(jLabel2);
         jLabel2.setBounds(350, 5, 100, 20);
-        jLayeredPane1.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        jButton2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/find-apps-precentralnet.png"))); // NOI18N
+        jButton2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/find-apps-precentralnet.png"))); // NOI18N
         jButton2.setBorderPainted(false);
         jButton2.setContentAreaFilled(false);
         jButton2.setFocusable(false);
@@ -468,8 +473,8 @@ public class MainView extends FrameView {
                 jButton2ActionPerformed(evt);
             }
         });
+        jLayeredPane1.add(jButton2);
         jButton2.setBounds(20, 280, 130, 60);
-        jLayeredPane1.add(jButton2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton3.setBackground(new java.awt.Color(165, 165, 165));
         jButton3.setFont(jButton3.getFont().deriveFont(jButton3.getFont().getSize()+3f));
@@ -481,8 +486,8 @@ public class MainView extends FrameView {
                 jButton3ActionPerformed(evt);
             }
         });
+        jLayeredPane1.add(jButton3);
         jButton3.setBounds(240, 290, 140, 33);
-        jLayeredPane1.add(jButton3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jComboBox1.setBackground(new java.awt.Color(220, 220, 220));
         jComboBox1.setFocusable(false);
@@ -501,8 +506,8 @@ public class MainView extends FrameView {
                 jComboBox1ActionPerformed(evt);
             }
         });
+        jLayeredPane1.add(jComboBox1);
         jComboBox1.setBounds(460, 5, 140, 20);
-        jLayeredPane1.add(jComboBox1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         org.jdesktop.layout.GroupLayout mainPanelLayout = new org.jdesktop.layout.GroupLayout(mainPanel);
         mainPanel.setLayout(mainPanelLayout);
@@ -512,7 +517,7 @@ public class MainView extends FrameView {
         );
         mainPanelLayout.setVerticalGroup(
             mainPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(jLayeredPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 354, Short.MAX_VALUE)
+            .add(jLayeredPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 345, Short.MAX_VALUE)
         );
 
         fileMenu.setText(bundle.getString("MainView.fileMenu.text")); // NOI18N
@@ -604,6 +609,16 @@ public class MainView extends FrameView {
         });
         helpMenu.add(jMenuItem7);
 
+        java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("ca/canuckcoding/wosqi/Bundle"); // NOI18N
+        jMenuItem10.setText(bundle.getString("MainView.jMenuItem10.text")); // NOI18N
+        jMenuItem10.setToolTipText(bundle.getString("MainView.jMenuItem10.toolTipText")); // NOI18N
+        jMenuItem10.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                jMenuItem10ActionPerformed(evt);
+            }
+        });
+        helpMenu.add(jMenuItem10);
+
         aboutMenuItem.setAction(actionMap.get("showAboutBox")); // NOI18N
         aboutMenuItem.setText(bundle.getString("MainView.aboutMenuItem.text")); // NOI18N
         aboutMenuItem.addActionListener(new java.awt.event.ActionListener() {
@@ -769,6 +784,16 @@ public class MainView extends FrameView {
         }
     }//GEN-LAST:event_jMenuItem9ActionPerformed
 
+    private void jMenuItem10ActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jMenuItem10ActionPerformed
+        JOptionPane.showMessageDialog(mainPanel, "<html><body width=\"400px\">" +
+                "WebOS Quick Install is opensource under the Apache License 2.0.<br>" +
+                "Contains the Novacom driver, also under the Apache License 2.0.<br><br>" + 
+                "The full license is included within the source code and this " + 
+                "java archive. It can also be read at:<br>" + 
+                "<br>http://www.apache.org/licenses/LICENSE-2.0.txt</body>",
+                "License Info",JOptionPane.INFORMATION_MESSAGE);
+    }//GEN-LAST:event_jMenuItem10ActionPerformed
+
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JButton jButton1;
     private javax.swing.JButton jButton2;
@@ -782,6 +807,7 @@ public class MainView extends FrameView {
     private javax.swing.JLayeredPane jLayeredPane3;
     private javax.swing.JLayeredPane jLayeredPane7;
     private javax.swing.JMenuItem jMenuItem1;
+    private javax.swing.JMenuItem jMenuItem10;
     private javax.swing.JMenuItem jMenuItem2;
     private javax.swing.JMenuItem jMenuItem3;
     private javax.swing.JMenuItem jMenuItem4;
diff --git a/src/ca/canucksoftware/wosqi/SendFile.form b/src/ca/canuckcoding/wosqi/ReceiveFile.form
similarity index 74%
rename from src/ca/canucksoftware/wosqi/SendFile.form
rename to src/ca/canuckcoding/wosqi/ReceiveFile.form
index 84cf137..241c5a2 100644
--- a/src/ca/canucksoftware/wosqi/SendFile.form
+++ b/src/ca/canuckcoding/wosqi/ReceiveFile.form
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="SendFile.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="ReceiveFile.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
     </Property>
     <Property name="iconImage" type="java.awt.Image" editor="org.netbeans.modules.form.ComponentChooserEditor">
       <ComponentRef name="null"/>
@@ -15,6 +15,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
@@ -25,7 +26,7 @@
     <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="0"/>
   </AuxValues>
 
   <Layout>
@@ -46,7 +47,9 @@
         <Property name="name" type="java.lang.String" value="jLayeredPane1" noResource="true"/>
       </Properties>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Container class="javax.swing.JLayeredPane" name="jLayeredPane2">
           <Properties>
@@ -60,12 +63,14 @@
             <Property name="name" type="java.lang.String" value="jLayeredPane2" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="10" width="450" height="140" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="10" width="450" height="140"/>
             </Constraint>
           </Constraints>
 
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
           <SubComponents>
             <Component class="javax.swing.JButton" name="jButton3">
               <Properties>
@@ -75,7 +80,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="SendFile.jButton3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="ReceiveFile.jButton3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton3" noResource="true"/>
               </Properties>
@@ -83,8 +88,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton3ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="260" y="100" width="79" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="260" y="100" width="79" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -96,7 +101,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="SendFile.jButton2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="ReceiveFile.jButton2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton2" noResource="true"/>
               </Properties>
@@ -104,27 +109,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="110" y="100" width="140" height="25" layer="0" position="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="jTextField1">
-              <Properties>
-                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
-                  <FontInfo relative="true">
-                    <Font component="jTextField1" property="font" relativeSize="true" size="0"/>
-                  </FontInfo>
-                </Property>
-                <Property name="enabled" type="boolean" value="false"/>
-                <Property name="name" type="java.lang.String" value="jTextField1" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jTextField1MouseClicked"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="80" y="20" width="297" height="24" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="110" y="100" width="140" height="25"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -136,7 +122,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="SendFile.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="ReceiveFile.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
               </Properties>
@@ -144,8 +130,27 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="380" y="20" width="-1" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="400" y="58" width="-1" height="-1"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JTextField" name="jTextField2">
+              <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font component="jTextField2" property="font" relativeSize="true" size="0"/>
+                  </FontInfo>
+                </Property>
+                <Property name="enabled" type="boolean" value="false"/>
+                <Property name="name" type="java.lang.String" value="jTextField2" noResource="true"/>
+              </Properties>
+              <Events>
+                <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jTextField2MouseClicked"/>
+              </Events>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="120" y="60" width="270" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -157,13 +162,28 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="SendFile.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="ReveiveFile.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="10" y="60" width="140" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="10" y="60" width="140" height="20"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JTextField" name="jTextField1">
+              <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font component="jTextField1" property="font" relativeSize="true" size="0"/>
+                  </FontInfo>
+                </Property>
+                <Property name="name" type="java.lang.String" value="jTextField1" noResource="true"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="80" y="20" width="360" height="24"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -175,28 +195,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="SendFile.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="ReveiveFile.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="10" y="20" width="70" height="20" layer="0" position="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="jTextField2">
-              <Properties>
-                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
-                  <FontInfo relative="true">
-                    <Font component="jTextField2" property="font" relativeSize="true" size="0"/>
-                  </FontInfo>
-                </Property>
-                <Property name="name" type="java.lang.String" value="jTextField2" noResource="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="130" y="60" width="290" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="10" y="20" width="70" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
diff --git a/src/ca/canucksoftware/wosqi/ReceiveFile.java b/src/ca/canuckcoding/wosqi/ReceiveFile.java
similarity index 91%
rename from src/ca/canucksoftware/wosqi/ReceiveFile.java
rename to src/ca/canuckcoding/wosqi/ReceiveFile.java
index da61f79..d614433 100644
--- a/src/ca/canucksoftware/wosqi/ReceiveFile.java
+++ b/src/ca/canuckcoding/wosqi/ReceiveFile.java
@@ -2,11 +2,11 @@
  * WebOSQuickInstallAboutBox.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.utils.FileUtils;
-import ca.canucksoftware.webos.DeviceInfo;
-import ca.canucksoftware.webos.WebOSConnection;
+import ca.canuckcoding.utils.FileUtils;
+import ca.canuckcoding.webos.DeviceInfo;
+import ca.canuckcoding.webos.WebOSConnection;
 import javax.swing.JFileChooser;
 import javax.swing.Icon;
 import java.awt.Component;
@@ -143,8 +143,8 @@ public class ReceiveFile extends javax.swing.JDialog {
                 jButton3ActionPerformed(evt);
             }
         });
-        jButton3.setBounds(260, 100, 79, 23);
-        jLayeredPane2.add(jButton3, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        jLayeredPane2.add(jButton3);
+        jButton3.setBounds(260, 100, 79, 25);
 
         jButton2.setFont(jButton2.getFont().deriveFont(jButton2.getFont().getSize()+1f));
         jButton2.setText(bundle.getString("ReceiveFile.jButton2.text")); // NOI18N
@@ -154,8 +154,8 @@ public class ReceiveFile extends javax.swing.JDialog {
                 jButton2ActionPerformed(evt);
             }
         });
+        jLayeredPane2.add(jButton2);
         jButton2.setBounds(110, 100, 140, 25);
-        jLayeredPane2.add(jButton2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton1.setFont(jButton1.getFont());
         jButton1.setText(bundle.getString("ReceiveFile.jButton1.text")); // NOI18N
@@ -165,8 +165,8 @@ public class ReceiveFile extends javax.swing.JDialog {
                 jButton1ActionPerformed(evt);
             }
         });
-        jButton1.setBounds(400, 58, 45, 23);
-        jLayeredPane2.add(jButton1, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        jLayeredPane2.add(jButton1);
+        jButton1.setBounds(400, 58, 45, 25);
 
         jTextField2.setFont(jTextField2.getFont());
         jTextField2.setEnabled(false);
@@ -176,28 +176,28 @@ public class ReceiveFile extends javax.swing.JDialog {
                 jTextField2MouseClicked(evt);
             }
         });
-        jTextField2.setBounds(120, 60, 270, 20);
-        jLayeredPane2.add(jTextField2, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        jLayeredPane2.add(jTextField2);
+        jTextField2.setBounds(120, 60, 270, 22);
 
         jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getSize()+3f));
         jLabel1.setText(bundle.getString("ReveiveFile.jLabel1.text")); // NOI18N
         jLabel1.setName("jLabel1"); // NOI18N
+        jLayeredPane2.add(jLabel1);
         jLabel1.setBounds(10, 60, 140, 20);
-        jLayeredPane2.add(jLabel1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField1.setFont(jTextField1.getFont());
         jTextField1.setName("jTextField1"); // NOI18N
+        jLayeredPane2.add(jTextField1);
         jTextField1.setBounds(80, 20, 360, 24);
-        jLayeredPane2.add(jTextField1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getSize()+3f));
         jLabel2.setText(bundle.getString("ReveiveFile.jLabel2.text")); // NOI18N
         jLabel2.setName("jLabel2"); // NOI18N
+        jLayeredPane2.add(jLabel2);
         jLabel2.setBounds(10, 20, 70, 20);
-        jLayeredPane2.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
+        jLayeredPane1.add(jLayeredPane2);
         jLayeredPane2.setBounds(10, 10, 450, 140);
-        jLayeredPane1.add(jLayeredPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
diff --git a/src/ca/canucksoftware/wosqi/ReceiveFile.form b/src/ca/canuckcoding/wosqi/SendFile.form
similarity index 73%
rename from src/ca/canucksoftware/wosqi/ReceiveFile.form
rename to src/ca/canuckcoding/wosqi/SendFile.form
index c7c0cbf..0f9c034 100644
--- a/src/ca/canucksoftware/wosqi/ReceiveFile.form
+++ b/src/ca/canuckcoding/wosqi/SendFile.form
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="ReceiveFile.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="SendFile.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
     </Property>
     <Property name="iconImage" type="java.awt.Image" editor="org.netbeans.modules.form.ComponentChooserEditor">
       <ComponentRef name="null"/>
@@ -15,6 +15,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
@@ -25,7 +26,7 @@
     <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
-    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="0"/>
+    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
   </AuxValues>
 
   <Layout>
@@ -46,7 +47,9 @@
         <Property name="name" type="java.lang.String" value="jLayeredPane1" noResource="true"/>
       </Properties>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Container class="javax.swing.JLayeredPane" name="jLayeredPane2">
           <Properties>
@@ -60,12 +63,14 @@
             <Property name="name" type="java.lang.String" value="jLayeredPane2" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="10" width="450" height="140" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="10" width="450" height="140"/>
             </Constraint>
           </Constraints>
 
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
           <SubComponents>
             <Component class="javax.swing.JButton" name="jButton3">
               <Properties>
@@ -75,7 +80,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="ReceiveFile.jButton3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="SendFile.jButton3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton3" noResource="true"/>
               </Properties>
@@ -83,8 +88,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton3ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="260" y="100" width="79" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="260" y="100" width="79" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -96,7 +101,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="ReceiveFile.jButton2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="SendFile.jButton2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton2" noResource="true"/>
               </Properties>
@@ -104,8 +109,27 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton2ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="110" y="100" width="140" height="25" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="110" y="100" width="140" height="25"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JTextField" name="jTextField1">
+              <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font component="jTextField1" property="font" relativeSize="true" size="0"/>
+                  </FontInfo>
+                </Property>
+                <Property name="enabled" type="boolean" value="false"/>
+                <Property name="name" type="java.lang.String" value="jTextField1" noResource="true"/>
+              </Properties>
+              <Events>
+                <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jTextField1MouseClicked"/>
+              </Events>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="80" y="20" width="297" height="24"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -117,7 +141,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="ReceiveFile.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="SendFile.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
               </Properties>
@@ -125,27 +149,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="400" y="58" width="-1" height="-1" layer="0" position="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="jTextField2">
-              <Properties>
-                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
-                  <FontInfo relative="true">
-                    <Font component="jTextField2" property="font" relativeSize="true" size="0"/>
-                  </FontInfo>
-                </Property>
-                <Property name="enabled" type="boolean" value="false"/>
-                <Property name="name" type="java.lang.String" value="jTextField2" noResource="true"/>
-              </Properties>
-              <Events>
-                <EventHandler event="mouseClicked" listener="java.awt.event.MouseListener" parameters="java.awt.event.MouseEvent" handler="jTextField2MouseClicked"/>
-              </Events>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="120" y="60" width="270" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="380" y="20" width="-1" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -157,28 +162,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="ReveiveFile.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="SendFile.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="10" y="60" width="140" height="20" layer="0" position="-1"/>
-                </Constraint>
-              </Constraints>
-            </Component>
-            <Component class="javax.swing.JTextField" name="jTextField1">
-              <Properties>
-                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
-                  <FontInfo relative="true">
-                    <Font component="jTextField1" property="font" relativeSize="true" size="0"/>
-                  </FontInfo>
-                </Property>
-                <Property name="name" type="java.lang.String" value="jTextField1" noResource="true"/>
-              </Properties>
-              <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="80" y="20" width="360" height="24" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="10" y="60" width="140" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -190,13 +180,28 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="ReveiveFile.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="SendFile.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="10" y="20" width="70" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="10" y="20" width="70" height="20"/>
+                </Constraint>
+              </Constraints>
+            </Component>
+            <Component class="javax.swing.JTextField" name="jTextField2">
+              <Properties>
+                <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
+                  <FontInfo relative="true">
+                    <Font component="jTextField2" property="font" relativeSize="true" size="0"/>
+                  </FontInfo>
+                </Property>
+                <Property name="name" type="java.lang.String" value="jTextField2" noResource="true"/>
+              </Properties>
+              <Constraints>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="130" y="60" width="290" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
diff --git a/src/ca/canucksoftware/wosqi/SendFile.java b/src/ca/canuckcoding/wosqi/SendFile.java
similarity index 91%
rename from src/ca/canucksoftware/wosqi/SendFile.java
rename to src/ca/canuckcoding/wosqi/SendFile.java
index d04c915..c22f905 100644
--- a/src/ca/canucksoftware/wosqi/SendFile.java
+++ b/src/ca/canuckcoding/wosqi/SendFile.java
@@ -2,11 +2,11 @@
  * WebOSQuickInstallAboutBox.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.utils.FileUtils;
-import ca.canucksoftware.webos.DeviceInfo;
-import ca.canucksoftware.webos.WebOSConnection;
+import ca.canuckcoding.utils.FileUtils;
+import ca.canuckcoding.webos.DeviceInfo;
+import ca.canuckcoding.webos.WebOSConnection;
 import javax.swing.JFileChooser;
 import javax.swing.Icon;
 import java.awt.Component;
@@ -159,8 +159,8 @@ public class SendFile extends javax.swing.JDialog {
                 jButton3ActionPerformed(evt);
             }
         });
-        jButton3.setBounds(260, 100, 79, 23);
-        jLayeredPane2.add(jButton3, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        jLayeredPane2.add(jButton3);
+        jButton3.setBounds(260, 100, 79, 25);
 
         jButton2.setFont(jButton2.getFont().deriveFont(jButton2.getFont().getSize()+1f));
         jButton2.setText(bundle.getString("SendFile.jButton2.text")); // NOI18N
@@ -170,8 +170,8 @@ public class SendFile extends javax.swing.JDialog {
                 jButton2ActionPerformed(evt);
             }
         });
+        jLayeredPane2.add(jButton2);
         jButton2.setBounds(110, 100, 140, 25);
-        jLayeredPane2.add(jButton2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField1.setFont(jTextField1.getFont());
         jTextField1.setEnabled(false);
@@ -181,8 +181,8 @@ public class SendFile extends javax.swing.JDialog {
                 jTextField1MouseClicked(evt);
             }
         });
+        jLayeredPane2.add(jTextField1);
         jTextField1.setBounds(80, 20, 297, 24);
-        jLayeredPane2.add(jTextField1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton1.setFont(jButton1.getFont());
         jButton1.setText(bundle.getString("SendFile.jButton1.text")); // NOI18N
@@ -192,28 +192,28 @@ public class SendFile extends javax.swing.JDialog {
                 jButton1ActionPerformed(evt);
             }
         });
-        jButton1.setBounds(380, 20, 45, 23);
-        jLayeredPane2.add(jButton1, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        jLayeredPane2.add(jButton1);
+        jButton1.setBounds(380, 20, 45, 25);
 
         jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getSize()+3f));
         jLabel1.setText(bundle.getString("SendFile.jLabel1.text")); // NOI18N
         jLabel1.setName("jLabel1"); // NOI18N
+        jLayeredPane2.add(jLabel1);
         jLabel1.setBounds(10, 60, 140, 20);
-        jLayeredPane2.add(jLabel1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getSize()+3f));
         jLabel2.setText(bundle.getString("SendFile.jLabel2.text")); // NOI18N
         jLabel2.setName("jLabel2"); // NOI18N
+        jLayeredPane2.add(jLabel2);
         jLabel2.setBounds(10, 20, 70, 20);
-        jLayeredPane2.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jTextField2.setFont(jTextField2.getFont());
         jTextField2.setName("jTextField2"); // NOI18N
-        jTextField2.setBounds(130, 60, 290, 20);
-        jLayeredPane2.add(jTextField2, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        jLayeredPane2.add(jTextField2);
+        jTextField2.setBounds(130, 60, 290, 22);
 
+        jLayeredPane1.add(jLayeredPane2);
         jLayeredPane2.setBounds(10, 10, 450, 140);
-        jLayeredPane1.add(jLayeredPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
diff --git a/src/ca/canucksoftware/wosqi/Settings.form b/src/ca/canuckcoding/wosqi/Settings.form
similarity index 78%
rename from src/ca/canucksoftware/wosqi/Settings.form
rename to src/ca/canuckcoding/wosqi/Settings.form
index b324b21..5b67bcb 100644
--- a/src/ca/canucksoftware/wosqi/Settings.form
+++ b/src/ca/canuckcoding/wosqi/Settings.form
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.6" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Settings.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
     </Property>
     <Property name="iconImage" type="java.awt.Image" editor="org.netbeans.modules.form.ComponentChooserEditor">
       <ComponentRef name="null"/>
@@ -15,6 +15,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
@@ -46,7 +47,9 @@
         <Property name="name" type="java.lang.String" value="jLayeredPane1" noResource="true"/>
       </Properties>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Container class="javax.swing.JLayeredPane" name="jLayeredPane2">
           <Properties>
@@ -58,12 +61,14 @@
             <Property name="name" type="java.lang.String" value="jLayeredPane2" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="10" width="450" height="480" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="10" width="450" height="480"/>
             </Constraint>
           </Constraints>
 
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
           <SubComponents>
             <Component class="javax.swing.JLabel" name="jLabel2">
               <Properties>
@@ -73,13 +78,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Settings.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jLabel2.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="90" width="230" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="90" width="230" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -91,8 +96,8 @@
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="280" width="380" height="120" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="280" width="380" height="120"/>
                 </Constraint>
               </Constraints>
 
@@ -110,14 +115,14 @@
                       <TableColumnModel selectionModel="0">
                         <Column maxWidth="-1" minWidth="-1" prefWidth="350" resizable="false">
                           <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                            <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title1" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                            <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title1" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                           </Title>
                           <Editor/>
                           <Renderer/>
                         </Column>
                         <Column maxWidth="-1" minWidth="-1" prefWidth="10" resizable="false">
                           <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                            <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title0" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                            <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title0" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                           </Title>
                           <Editor/>
                           <Renderer/>
@@ -144,7 +149,7 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Settings.jCheckBox1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jCheckBox1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jCheckBox1" noResource="true"/>
                 <Property name="verticalAlignment" type="int" value="1"/>
@@ -154,8 +159,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jCheckBox1ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="50" width="410" height="40" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="50" width="410" height="40"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -178,15 +183,15 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton6ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="410" y="280" width="30" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="410" y="280" width="30" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
             <Component class="javax.swing.JButton" name="jButton1">
               <Properties>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Settings.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jButton1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jButton1" noResource="true"/>
               </Properties>
@@ -194,8 +199,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton1ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="30" y="420" width="360" height="40" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="30" y="420" width="360" height="40"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -207,8 +212,8 @@
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="120" width="410" height="130" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="120" width="410" height="130"/>
                 </Constraint>
               </Constraints>
 
@@ -233,14 +238,14 @@
                       <TableColumnModel selectionModel="0">
                         <Column maxWidth="-1" minWidth="-1" prefWidth="350" resizable="false">
                           <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                            <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title1" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                            <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title1" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                           </Title>
                           <Editor/>
                           <Renderer/>
                         </Column>
                         <Column maxWidth="-1" minWidth="-1" prefWidth="10" resizable="false">
                           <Title editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                            <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title0" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                            <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jTable1.columnModel.title0" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                           </Title>
                           <Editor/>
                           <Renderer/>
@@ -274,8 +279,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jComboBox1ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="130" y="10" width="170" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="130" y="10" width="170" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -298,8 +303,8 @@
                 <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jButton7ActionPerformed"/>
               </Events>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="410" y="310" width="30" height="-1" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="410" y="310" width="30" height="-1"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -311,13 +316,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Settings.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jLabel1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel1" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="10" width="110" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="10" width="110" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
@@ -329,13 +334,13 @@
                   </FontInfo>
                 </Property>
                 <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                  <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Settings.jLabel3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Settings.jLabel3.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </Property>
                 <Property name="name" type="java.lang.String" value="jLabel3" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="20" y="250" width="230" height="20" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="20" y="250" width="230" height="20"/>
                 </Constraint>
               </Constraints>
             </Component>
diff --git a/src/ca/canucksoftware/wosqi/Settings.java b/src/ca/canuckcoding/wosqi/Settings.java
similarity index 90%
rename from src/ca/canucksoftware/wosqi/Settings.java
rename to src/ca/canuckcoding/wosqi/Settings.java
index 774222b..ff58838 100644
--- a/src/ca/canucksoftware/wosqi/Settings.java
+++ b/src/ca/canuckcoding/wosqi/Settings.java
@@ -2,10 +2,10 @@
  * WebOSQuickInstallAboutBox.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.utils.OnlineFile;
-import ca.canucksoftware.webos.DeviceInfo;
+import ca.canuckcoding.utils.OnlineFile;
+import ca.canuckcoding.webos.DeviceInfo;
 import java.util.ArrayList;
 import java.util.ResourceBundle;
 import java.util.Timer;
@@ -213,8 +213,8 @@ public class Settings extends javax.swing.JDialog {
         jLabel2.setFont(jLabel2.getFont().deriveFont(jLabel2.getFont().getSize()+1f));
         jLabel2.setText(bundle.getString("Settings.jLabel2.text")); // NOI18N
         jLabel2.setName("jLabel2"); // NOI18N
+        jLayeredPane2.add(jLabel2);
         jLabel2.setBounds(20, 90, 230, 20);
-        jLayeredPane2.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane3.setName("jScrollPane3"); // NOI18N
 
@@ -246,15 +246,17 @@ public class Settings extends javax.swing.JDialog {
         jTable2.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);
         jTable2.setTableHeader(null);
         jScrollPane3.setViewportView(jTable2);
-        jTable2.getColumnModel().getColumn(0).setResizable(false);
-        jTable2.getColumnModel().getColumn(0).setPreferredWidth(350);
-        jTable2.getColumnModel().getColumn(0).setHeaderValue(bundle.getString("Settings.jTable1.columnModel.title1")); // NOI18N
-        jTable2.getColumnModel().getColumn(1).setResizable(false);
-        jTable2.getColumnModel().getColumn(1).setPreferredWidth(10);
-        jTable2.getColumnModel().getColumn(1).setHeaderValue(bundle.getString("Settings.jTable1.columnModel.title0")); // NOI18N
+        if (jTable2.getColumnModel().getColumnCount() > 0) {
+            jTable2.getColumnModel().getColumn(0).setResizable(false);
+            jTable2.getColumnModel().getColumn(0).setPreferredWidth(350);
+            jTable2.getColumnModel().getColumn(0).setHeaderValue(bundle.getString("Settings.jTable1.columnModel.title1")); // NOI18N
+            jTable2.getColumnModel().getColumn(1).setResizable(false);
+            jTable2.getColumnModel().getColumn(1).setPreferredWidth(10);
+            jTable2.getColumnModel().getColumn(1).setHeaderValue(bundle.getString("Settings.jTable1.columnModel.title0")); // NOI18N
+        }
 
+        jLayeredPane2.add(jScrollPane3);
         jScrollPane3.setBounds(20, 280, 380, 120);
-        jLayeredPane2.add(jScrollPane3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jCheckBox1.setFont(jCheckBox1.getFont().deriveFont(jCheckBox1.getFont().getSize()+1f));
         jCheckBox1.setText(bundle.getString("Settings.jCheckBox1.text")); // NOI18N
@@ -266,8 +268,8 @@ public class Settings extends javax.swing.JDialog {
                 jCheckBox1ActionPerformed(evt);
             }
         });
+        jLayeredPane2.add(jCheckBox1);
         jCheckBox1.setBounds(20, 50, 410, 40);
-        jLayeredPane2.add(jCheckBox1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton6.setFont(jButton6.getFont().deriveFont(jButton6.getFont().getSize()+1f));
         jButton6.setText("+");
@@ -280,8 +282,8 @@ public class Settings extends javax.swing.JDialog {
                 jButton6ActionPerformed(evt);
             }
         });
+        jLayeredPane2.add(jButton6);
         jButton6.setBounds(410, 280, 30, 21);
-        jLayeredPane2.add(jButton6, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton1.setText(bundle.getString("Settings.jButton1.text")); // NOI18N
         jButton1.setName("jButton1"); // NOI18N
@@ -290,8 +292,8 @@ public class Settings extends javax.swing.JDialog {
                 jButton1ActionPerformed(evt);
             }
         });
+        jLayeredPane2.add(jButton1);
         jButton1.setBounds(30, 420, 360, 40);
-        jLayeredPane2.add(jButton1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jScrollPane2.setName("jScrollPane2"); // NOI18N
 
@@ -331,15 +333,17 @@ public class Settings extends javax.swing.JDialog {
             }
         });
         jScrollPane2.setViewportView(jTable1);
-        jTable1.getColumnModel().getColumn(0).setResizable(false);
-        jTable1.getColumnModel().getColumn(0).setPreferredWidth(350);
-        jTable1.getColumnModel().getColumn(0).setHeaderValue(bundle.getString("Settings.jTable1.columnModel.title1")); // NOI18N
-        jTable1.getColumnModel().getColumn(1).setResizable(false);
-        jTable1.getColumnModel().getColumn(1).setPreferredWidth(10);
-        jTable1.getColumnModel().getColumn(1).setHeaderValue(bundle.getString("Settings.jTable1.columnModel.title0")); // NOI18N
+        if (jTable1.getColumnModel().getColumnCount() > 0) {
+            jTable1.getColumnModel().getColumn(0).setResizable(false);
+            jTable1.getColumnModel().getColumn(0).setPreferredWidth(350);
+            jTable1.getColumnModel().getColumn(0).setHeaderValue(bundle.getString("Settings.jTable1.columnModel.title1")); // NOI18N
+            jTable1.getColumnModel().getColumn(1).setResizable(false);
+            jTable1.getColumnModel().getColumn(1).setPreferredWidth(10);
+            jTable1.getColumnModel().getColumn(1).setHeaderValue(bundle.getString("Settings.jTable1.columnModel.title0")); // NOI18N
+        }
 
+        jLayeredPane2.add(jScrollPane2);
         jScrollPane2.setBounds(20, 120, 410, 130);
-        jLayeredPane2.add(jScrollPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jComboBox1.setFocusable(false);
         jComboBox1.setName("jComboBox1"); // NOI18N
@@ -348,8 +352,8 @@ public class Settings extends javax.swing.JDialog {
                 jComboBox1ActionPerformed(evt);
             }
         });
+        jLayeredPane2.add(jComboBox1);
         jComboBox1.setBounds(130, 10, 170, 22);
-        jLayeredPane2.add(jComboBox1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jButton7.setFont(jButton7.getFont().deriveFont(jButton7.getFont().getSize()+1f));
         jButton7.setText("‒");
@@ -362,23 +366,23 @@ public class Settings extends javax.swing.JDialog {
                 jButton7ActionPerformed(evt);
             }
         });
+        jLayeredPane2.add(jButton7);
         jButton7.setBounds(410, 310, 30, 21);
-        jLayeredPane2.add(jButton7, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel1.setFont(jLabel1.getFont().deriveFont(jLabel1.getFont().getSize()+1f));
         jLabel1.setText(bundle.getString("Settings.jLabel1.text")); // NOI18N
         jLabel1.setName("jLabel1"); // NOI18N
+        jLayeredPane2.add(jLabel1);
         jLabel1.setBounds(20, 10, 110, 20);
-        jLayeredPane2.add(jLabel1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         jLabel3.setFont(jLabel3.getFont().deriveFont(jLabel3.getFont().getSize()+1f));
         jLabel3.setText(bundle.getString("Settings.jLabel3.text")); // NOI18N
         jLabel3.setName("jLabel3"); // NOI18N
+        jLayeredPane2.add(jLabel3);
         jLabel3.setBounds(20, 250, 230, 20);
-        jLayeredPane2.add(jLabel3, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
+        jLayeredPane1.add(jLayeredPane2);
         jLayeredPane2.setBounds(10, 10, 450, 480);
-        jLayeredPane1.add(jLayeredPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
diff --git a/src/ca/canucksoftware/wosqi/Usage.form b/src/ca/canuckcoding/wosqi/Usage.form
similarity index 78%
rename from src/ca/canucksoftware/wosqi/Usage.form
rename to src/ca/canuckcoding/wosqi/Usage.form
index 6e1cbec..0d37963 100644
--- a/src/ca/canucksoftware/wosqi/Usage.form
+++ b/src/ca/canuckcoding/wosqi/Usage.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
+<Form version="1.9" maxVersion="1.9" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
   <Properties>
     <Property name="defaultCloseOperation" type="int" value="2"/>
     <Property name="modal" type="boolean" value="true"/>
@@ -9,6 +9,7 @@
   </Properties>
   <SyntheticProperties>
     <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
+    <SyntheticProperty name="generateCenter" type="boolean" value="false"/>
   </SyntheticProperties>
   <Events>
     <EventHandler event="keyPressed" listener="java.awt.event.KeyListener" parameters="java.awt.event.KeyEvent" handler="formKeyPressed"/>
@@ -43,26 +44,30 @@
         <Property name="name" type="java.lang.String" value="jLayeredPane1" noResource="true"/>
       </Properties>
 
-      <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+        <Property name="useNullLayout" type="boolean" value="true"/>
+      </Layout>
       <SubComponents>
         <Container class="javax.swing.JLayeredPane" name="jLayeredPane2">
           <Properties>
             <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
               <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
                 <TitledBorder title="How To Use">
-                  <ResourceString PropertyName="titleX" bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Usage.jLayeredPane2.border.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                  <ResourceString PropertyName="titleX" bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Usage.jLayeredPane2.border.title" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                 </TitledBorder>
               </Border>
             </Property>
             <Property name="name" type="java.lang.String" value="jLayeredPane2" noResource="true"/>
           </Properties>
           <Constraints>
-            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-              <JLayeredPaneConstraints x="10" y="10" width="540" height="360" layer="0" position="-1"/>
+            <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+              <AbsoluteConstraints x="10" y="10" width="540" height="360"/>
             </Constraint>
           </Constraints>
 
-          <Layout class="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout"/>
+          <Layout class="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout">
+            <Property name="useNullLayout" type="boolean" value="true"/>
+          </Layout>
           <SubComponents>
             <Container class="javax.swing.JScrollPane" name="jScrollPane1">
               <Properties>
@@ -75,8 +80,8 @@
                 <AuxValue name="autoScrollPane" type="java.lang.Boolean" value="true"/>
               </AuxValues>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="10" y="30" width="320" height="310" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="10" y="30" width="320" height="310"/>
                 </Constraint>
               </Constraints>
 
@@ -91,7 +96,7 @@
                       <Border info="null"/>
                     </Property>
                     <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Usage.jTextPane1.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Usage.jTextPane1.contentType" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="editable" type="boolean" value="false"/>
                     <Property name="font" type="java.awt.Font" editor="org.netbeans.modules.form.editors2.FontEditor">
@@ -100,7 +105,7 @@
                       </FontInfo>
                     </Property>
                     <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
-                      <ResourceString bundle="ca/canucksoftware/wosqi/Bundle.properties" key="Usage.jTextPane1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
+                      <ResourceString bundle="ca/canuckcoding/wosqi/Bundle.properties" key="Usage.jTextPane1.text" replaceFormat="bundle.getString(&quot;{key}&quot;)"/>
                     </Property>
                     <Property name="name" type="java.lang.String" value="jTextPane1" noResource="true"/>
                   </Properties>
@@ -110,14 +115,14 @@
             <Component class="javax.swing.JLabel" name="jLabel2">
               <Properties>
                 <Property name="icon" type="javax.swing.Icon" editor="org.netbeans.modules.form.editors2.IconEditor">
-                  <Image iconType="3" name="/ca/canucksoftware/wosqi/resources/devmode.jpg"/>
+                  <Image iconType="3" name="/ca/canuckcoding/wosqi/resources/devmode.jpg"/>
                 </Property>
                 <Property name="verticalAlignment" type="int" value="1"/>
                 <Property name="name" type="java.lang.String" value="jLabel2" noResource="true"/>
               </Properties>
               <Constraints>
-                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout" value="org.netbeans.modules.form.compat2.layouts.support.JLayeredPaneSupportLayout$JLayeredPaneConstraintsDescription">
-                  <JLayeredPaneConstraints x="350" y="40" width="180" height="270" layer="0" position="-1"/>
+                <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout" value="org.netbeans.modules.form.compat2.layouts.DesignAbsoluteLayout$AbsoluteConstraintsDescription">
+                  <AbsoluteConstraints x="350" y="40" width="180" height="270"/>
                 </Constraint>
               </Constraints>
             </Component>
diff --git a/src/ca/canucksoftware/wosqi/Usage.java b/src/ca/canuckcoding/wosqi/Usage.java
similarity index 91%
rename from src/ca/canucksoftware/wosqi/Usage.java
rename to src/ca/canuckcoding/wosqi/Usage.java
index 8a42a72..88286c2 100644
--- a/src/ca/canucksoftware/wosqi/Usage.java
+++ b/src/ca/canuckcoding/wosqi/Usage.java
@@ -2,7 +2,7 @@
  * WebOSQuickInstallAboutBox.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
 import org.jdesktop.application.Action;
 import java.util.ResourceBundle;
@@ -63,17 +63,17 @@ public class Usage extends javax.swing.JDialog {
         jTextPane1.setName("jTextPane1"); // NOI18N
         jScrollPane1.setViewportView(jTextPane1);
 
+        jLayeredPane2.add(jScrollPane1);
         jScrollPane1.setBounds(10, 30, 320, 310);
-        jLayeredPane2.add(jScrollPane1, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-        jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canucksoftware/wosqi/resources/devmode.jpg"))); // NOI18N
+        jLabel2.setIcon(new javax.swing.ImageIcon(getClass().getResource("/ca/canuckcoding/wosqi/resources/devmode.jpg"))); // NOI18N
         jLabel2.setVerticalAlignment(javax.swing.SwingConstants.TOP);
         jLabel2.setName("jLabel2"); // NOI18N
+        jLayeredPane2.add(jLabel2);
         jLabel2.setBounds(350, 40, 180, 270);
-        jLayeredPane2.add(jLabel2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
+        jLayeredPane1.add(jLayeredPane2);
         jLayeredPane2.setBounds(10, 10, 540, 360);
-        jLayeredPane1.add(jLayeredPane2, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
         javax.swing.GroupLayout layout = new javax.swing.GroupLayout(getContentPane());
         getContentPane().setLayout(layout);
diff --git a/src/ca/canucksoftware/wosqi/WebOSQuickInstallApp.java b/src/ca/canuckcoding/wosqi/WebOSQuickInstallApp.java
similarity index 95%
rename from src/ca/canucksoftware/wosqi/WebOSQuickInstallApp.java
rename to src/ca/canuckcoding/wosqi/WebOSQuickInstallApp.java
index 5166144..368c36a 100644
--- a/src/ca/canucksoftware/wosqi/WebOSQuickInstallApp.java
+++ b/src/ca/canuckcoding/wosqi/WebOSQuickInstallApp.java
@@ -2,9 +2,9 @@
  * WebOSQuickInstallApp.java
  */
 
-package ca.canucksoftware.wosqi;
+package ca.canuckcoding.wosqi;
 
-import ca.canucksoftware.utils.FileUtils;
+import ca.canuckcoding.utils.FileUtils;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
@@ -70,7 +70,7 @@ public class WebOSQuickInstallApp extends SingleFrameApplication {
             JComponent.setDefaultLocale(specific);
             JFileChooser.setDefaultLocale(specific);
         }
-        bundle = ResourceBundle.getBundle("ca/canucksoftware/wosqi/Bundle");
+        bundle = ResourceBundle.getBundle("ca/canuckcoding/wosqi/Bundle");
         File install = new File(FileUtils.appDirectory(), bundle.getString("INSTALL"));
         if(!install.isDirectory()) {
             install.mkdirs();
diff --git a/src/ca/canucksoftware/wosqi/resources/Computer-48x48.png b/src/ca/canuckcoding/wosqi/resources/Computer-48x48.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/Computer-48x48.png
rename to src/ca/canuckcoding/wosqi/resources/Computer-48x48.png
diff --git a/src/ca/canucksoftware/wosqi/resources/Emulator 64x64.png b/src/ca/canuckcoding/wosqi/resources/Emulator 64x64.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/Emulator 64x64.png
rename to src/ca/canuckcoding/wosqi/resources/Emulator 64x64.png
diff --git a/src/ca/canucksoftware/wosqi/resources/HP Pre 3 64x64.png b/src/ca/canuckcoding/wosqi/resources/HP Pre 3 64x64.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/HP Pre 3 64x64.png
rename to src/ca/canuckcoding/wosqi/resources/HP Pre 3 64x64.png
diff --git a/src/ca/canucksoftware/wosqi/resources/HP TouchPad 64x64.png b/src/ca/canuckcoding/wosqi/resources/HP TouchPad 64x64.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/HP TouchPad 64x64.png
rename to src/ca/canuckcoding/wosqi/resources/HP TouchPad 64x64.png
diff --git a/src/ca/canucksoftware/wosqi/resources/HP Veer 64x64.png b/src/ca/canuckcoding/wosqi/resources/HP Veer 64x64.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/HP Veer 64x64.png
rename to src/ca/canuckcoding/wosqi/resources/HP Veer 64x64.png
diff --git a/src/ca/canuckcoding/wosqi/resources/LuneOS 64x64.png b/src/ca/canuckcoding/wosqi/resources/LuneOS 64x64.png
new file mode 100644
index 0000000..7c4a2f1
Binary files /dev/null and b/src/ca/canuckcoding/wosqi/resources/LuneOS 64x64.png differ
diff --git a/src/ca/canuckcoding/wosqi/resources/NewJFrame.properties b/src/ca/canuckcoding/wosqi/resources/NewJFrame.properties
new file mode 100644
index 0000000..e69de29
diff --git a/src/ca/canuckcoding/wosqi/resources/Open webOS 64x64.png b/src/ca/canuckcoding/wosqi/resources/Open webOS 64x64.png
new file mode 100644
index 0000000..a593783
Binary files /dev/null and b/src/ca/canuckcoding/wosqi/resources/Open webOS 64x64.png differ
diff --git a/src/ca/canucksoftware/wosqi/resources/Palm Pixi 64x64.png b/src/ca/canuckcoding/wosqi/resources/Palm Pixi 64x64.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/Palm Pixi 64x64.png
rename to src/ca/canuckcoding/wosqi/resources/Palm Pixi 64x64.png
diff --git a/src/ca/canucksoftware/wosqi/resources/Palm Pre 2 64x64.png b/src/ca/canuckcoding/wosqi/resources/Palm Pre 2 64x64.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/Palm Pre 2 64x64.png
rename to src/ca/canuckcoding/wosqi/resources/Palm Pre 2 64x64.png
diff --git a/src/ca/canucksoftware/wosqi/resources/Palm Pre 64x64.png b/src/ca/canuckcoding/wosqi/resources/Palm Pre 64x64.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/Palm Pre 64x64.png
rename to src/ca/canuckcoding/wosqi/resources/Palm Pre 64x64.png
diff --git a/src/ca/canucksoftware/wosqi/resources/Pre-48x48.png b/src/ca/canuckcoding/wosqi/resources/Pre-48x48.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/Pre-48x48.png
rename to src/ca/canuckcoding/wosqi/resources/Pre-48x48.png
diff --git a/src/ca/canucksoftware/wosqi/resources/WebOSQuickInstallApp.properties b/src/ca/canuckcoding/wosqi/resources/WebOSQuickInstallApp.properties
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/WebOSQuickInstallApp.properties
rename to src/ca/canuckcoding/wosqi/resources/WebOSQuickInstallApp.properties
diff --git a/src/ca/canucksoftware/wosqi/resources/activity.gif b/src/ca/canuckcoding/wosqi/resources/activity.gif
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/activity.gif
rename to src/ca/canuckcoding/wosqi/resources/activity.gif
diff --git a/src/ca/canucksoftware/wosqi/resources/add.png b/src/ca/canuckcoding/wosqi/resources/add.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/add.png
rename to src/ca/canuckcoding/wosqi/resources/add.png
diff --git a/src/ca/canucksoftware/wosqi/resources/background.jpg b/src/ca/canuckcoding/wosqi/resources/background.jpg
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/background.jpg
rename to src/ca/canuckcoding/wosqi/resources/background.jpg
diff --git a/src/ca/canucksoftware/wosqi/resources/background2.jpg b/src/ca/canuckcoding/wosqi/resources/background2.jpg
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/background2.jpg
rename to src/ca/canuckcoding/wosqi/resources/background2.jpg
diff --git a/src/ca/canucksoftware/wosqi/resources/busy_icon.gif b/src/ca/canuckcoding/wosqi/resources/busy_icon.gif
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/busy_icon.gif
rename to src/ca/canuckcoding/wosqi/resources/busy_icon.gif
diff --git a/src/ca/canucksoftware/wosqi/resources/devmode.jpg b/src/ca/canuckcoding/wosqi/resources/devmode.jpg
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/devmode.jpg
rename to src/ca/canuckcoding/wosqi/resources/devmode.jpg
diff --git a/src/ca/canucksoftware/wosqi/resources/donate.gif b/src/ca/canuckcoding/wosqi/resources/donate.gif
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/donate.gif
rename to src/ca/canuckcoding/wosqi/resources/donate.gif
diff --git a/src/ca/canucksoftware/wosqi/resources/find-apps-precentralnet.png b/src/ca/canuckcoding/wosqi/resources/find-apps-precentralnet.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/find-apps-precentralnet.png
rename to src/ca/canuckcoding/wosqi/resources/find-apps-precentralnet.png
diff --git a/src/ca/canucksoftware/wosqi/resources/find-apps-precentralnet_old.png b/src/ca/canuckcoding/wosqi/resources/find-apps-precentralnet_old.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/find-apps-precentralnet_old.png
rename to src/ca/canuckcoding/wosqi/resources/find-apps-precentralnet_old.png
diff --git a/src/ca/canucksoftware/wosqi/resources/find.png b/src/ca/canuckcoding/wosqi/resources/find.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/find.png
rename to src/ca/canuckcoding/wosqi/resources/find.png
diff --git a/src/ca/canucksoftware/wosqi/resources/icon.png b/src/ca/canuckcoding/wosqi/resources/icon.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/icon.png
rename to src/ca/canuckcoding/wosqi/resources/icon.png
diff --git a/src/ca/canucksoftware/wosqi/resources/no-screenshot.png b/src/ca/canuckcoding/wosqi/resources/no-screenshot.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/no-screenshot.png
rename to src/ca/canuckcoding/wosqi/resources/no-screenshot.png
diff --git a/src/ca/canucksoftware/wosqi/resources/online.png b/src/ca/canuckcoding/wosqi/resources/online.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/online.png
rename to src/ca/canuckcoding/wosqi/resources/online.png
diff --git a/src/ca/canucksoftware/wosqi/resources/pre_shadow.png b/src/ca/canuckcoding/wosqi/resources/pre_shadow.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/pre_shadow.png
rename to src/ca/canuckcoding/wosqi/resources/pre_shadow.png
diff --git a/src/ca/canucksoftware/wosqi/resources/remove.png b/src/ca/canuckcoding/wosqi/resources/remove.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/remove.png
rename to src/ca/canuckcoding/wosqi/resources/remove.png
diff --git a/src/ca/canucksoftware/wosqi/resources/splash.png b/src/ca/canuckcoding/wosqi/resources/splash.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/splash.png
rename to src/ca/canuckcoding/wosqi/resources/splash.png
diff --git a/src/ca/canucksoftware/wosqi/resources/title.png b/src/ca/canuckcoding/wosqi/resources/title.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/title.png
rename to src/ca/canuckcoding/wosqi/resources/title.png
diff --git a/src/ca/canucksoftware/wosqi/resources/url-icon.png b/src/ca/canuckcoding/wosqi/resources/url-icon.png
similarity index 100%
rename from src/ca/canucksoftware/wosqi/resources/url-icon.png
rename to src/ca/canuckcoding/wosqi/resources/url-icon.png
diff --git a/src/ca/canucksoftware/wosqi/Bundle_zh.properties b/src/ca/canucksoftware/wosqi/Bundle_zh.properties
deleted file mode 100644
index bdc0c8c..0000000
--- a/src/ca/canucksoftware/wosqi/Bundle_zh.properties
+++ /dev/null
@@ -1,313 +0,0 @@
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
-
-MainView.jLabel2.text=\u8BBE\u5907:
-MainView.fileMenu.text=\u6587\u4EF6
-MainView.jLayeredPane7.border.title=\u4F9B\u5B89\u88C5\u7684\u6587\u4EF6
-MainView.jButton3.text=\u5B89\u88C5
-MainView.toolMenu.text=\u5DE5\u5177
-MainView.helpMenu.text=\u5E2E\u52A9
-MainView.jMenuItem1.text=\u6DFB\u52A0\u6587\u4EF6...
-MainView.jMenuItem2.text=\u91CD\u5B89\u88C5Novacom\u9A71\u52A8
-MainView.jMenuItem3.text=\u53D1\u9001\u6587\u4EF6
-MainView.jMenuItem4.text=\u63A5\u6536\u6587\u4EF6
-MainView.jMenuItem5.text=\u8BBE\u5907\u7BA1\u7406
-MainView.jMenuItem6.text=\u4F7F\u7528
-MainView.jMenuItem7.text=\u653E\u5F03
-MainView.aboutMenuItem.text=\u5173\u4E8E
-DoctorDownloader.jLabel1.text_1=<html>Novacom\u4E0B\u8F7D\u4E2D
-Usage.jLayeredPane2.border.title=\u5982\u4F55\u4F7F\u7528
-Usage.jTextPane1.text=<html><body style="font:1em">\u672C\u7A0B\u5E8F\u6B63\u5E38\u8FD0\u884C\u524D\u63D0:<br/><ul><li/>\u5B89\u88C5Novacom\u9A71\u52A8<br/><br/>\u53EF\u70B9\u51FB\u9876\u90E8\u83DC\u5355\u9009\u62E9\u91CD\u65B0\u5B89\u88C5Novacom\u9A71\u52A8<br/><br/><li/>\u5DF2\u5F00\u542F\u5F00\u53D1\u8005\u6A21\u5F0F<br/><br/>\u4E3B\u754C\u9762\u8FDE\u7EED\u8F93\u5165"upupdowndownleftrightleftrightbastart"\u8C03\u51FA\u5F00\u53D1\u8005\u6A21\u5F0F\u9009\u9879<br/><br/><li/>\u624B\u673A\u63A5\u6570\u636E\u7EBF\u8FDE\u7535\u8111\u540E\u9009\u62E9"Just charge".</ul></body>
-Usage.jTextPane1.contentType=text/html
-ReveiveFile.jLabel2.text=\u6587\u4EF6:
-ReceiveFile.jButton1.text=...
-ReveiveFile.jLabel1.text=\u76EE\u6807:
-ReceiveFile.jButton2.text=\u53D6\u81EA\u8BBE\u5907
-ReceiveFile.jButton3.text=\u53D6\u6D88
-SendFile.jButton1.text=...
-SendFile.jLabel2.text=\u6587\u4EF6:
-SendFile.jLabel1.text=\u76EE\u6807:
-SendFile.jButton3.text=\u53D6\u6D88
-SendFile.jButton2.text=\u53D1\u5F80\u8BBE\u5907
-DeviceManagement.jLabel2.text=
-DeviceManagement.jLabel3.text=
-DeviceManagement.jLabel9.text=
-DeviceManagement.jButton1.text=\u5378\u8F7D
-DeviceManagement.jLabel8.text=
-DeviceManagement.jLayeredPane3.border.title=\u7528\u6237\u5DF2\u5B89\u88C5\u5185\u5BB9
-DeviceManagement.jLabel4.text=
-DeviceManagement.jLabel5.text=
-DeviceManagement.jTable1.columnModel.title1=
-DeviceManagement.jTable1.columnModel.title0=\u540D\u79F0
-DeviceManagement.jLayeredPane2.border.title=\u8BBE\u5907\u4FE1\u606F
-DeviceManagement.jLabel1.text=
-DeviceManagement.jLabel10.text=
-DeviceManagement.jLabel11.text=
-DeviceManagement.jLabel12.text=
-DeviceManagement.jLabel13.text=
-LOADING_LIST...=\u5217\u8868\u5BFC\u5165\u4E2D...
-{0}_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.={0} \u8FDE\u63A5\u4E2D\u65AD,\u8BF7\u91CD\u8BD5
-DEVICE_IS_DISCONNECTED._PLEASE_RECONNECT_THEN_TRY_AGAIN.=\u8FDE\u63A5\u4E2D\u65AD,\u8BF7\u91CD\u8BD5
-DEVICE\:=\u8BBE\u5907:
-OS\:=\u64CD\u4F5C\u7CFB\u7EDF:
-ARCHITECTURE\:=\u7ED3\u6784:
-BUILD_NAME\:=\u5EFA\u7ACB\u540D\u79F0:
-BUILD_TIME\:=\u5EFA\u7ACB\u65F6\u95F4:
-CPU_TYPE\:=CPU\u7C7B\u578B:
-CPU_SPEED\:=CPU\u901F\u5EA6:
-CPU_HARDWARE\:=CPU\u786C\u4EF6:
-MODEM_TYPE\:=\u732B\u7C7B\u578B:
-MODEM_FIRMWARE\:=\u732B\u56FA\u4EF6:
-DEPENDANT_PACKAGES_EXIST_WARNING=\u6CE8\u610F:\u4EE5\u4E0B\u6587\u4EF6\u4E0E\"{0}\"\u5173\u8054,\u5C06\u4F1A\u4E00\u8D77\u5220\u9664
-WARNING=\u6CE8\u610F
-PROCESSING_FINISHED_DOWNLOAD._THIS_MAY_TAKE_A_FEW_MINUTES.=\u7A0D\u7B49\u7247\u523B
-INSTALLING_DRIVER...=\u6B63\u5728\u5B89\u88C5\u9A71\u52A8...
-DRIVER_INSTALLED_SUCCESSFULLY.=\u9A71\u52A8\u5B89\u88C5\u6210\u529F.
-ERROR\:_DRIVER_INSTALLATION_FAILED=\u51FA\u9519:\u9A71\u52A8\u5B89\u88C5\u5931\u8D25
-ERROR\:=\u51FA\u9519:
-PLEASE_WAIT...=\u7A0D\u7B49...
-SELECT=\u9009\u62E9
-FILE_TRANSFERRED_SUCCESSFULLY.=\u6587\u4EF6\u4F20\u9001\u6210\u529F
-FILE_TRANSFER_FAILED.=\u6587\u4EF6\u4F20\u9001\u5931\u8D25
-SYSTEM_IS_BUSY._TRY_AGAIN_LATER.=\u7CFB\u7EDF\u5FD9,\u7A0D\u540E\u518D\u8BD5.
-CONNECTING...=\u8FDE\u63A5\u4E2D...
-DOWNLOADING\:=\u4E0B\u8F7D\u4E2D:
-TRANSFERRING_AND_APPLYING\:=\u4F20\u9001\u4E2D:
-TRANSFERRING\:=\u4F20\u9001\u4E2D:
-INSTALLING\:=\u5B89\u88C5\u4E2D:
-INSTALL=\u5B89\u88C5
-NO_DEVICES_ARE_CONNECTED._CONNECT_A_DEVICE_THEN_RELAUNCH_WEBOS_QUICK_INSTALL.=\u8BBE\u5907\u672A\u8FDE\u63A5,\u8BF7\u8FDE\u63A5\u540E\u518D\u6B21\u8FD0\u884C
-NO_DEVICES_FOUND=\u672A\u53D1\u73B0\u8BBE\u5907
-FULL_WOSQI_DISCLAIMER=\u7A0B\u5E8F\u6709\u98CE\u9669,\u540E\u679C\u9700\u81EA\u8D1F,\u8BF7\u8C28\u614E\u4F7F\u7528.
-DISCLAIMER=\u653E\u5F03
-FOR_WEBOS_QUICK_INSTALL_TO_RUN_CORRECTLY,_YOUR_COMPUTER_NEEDS_TO_HAVE_THE_NOVACOM_DRIVER_INSTALLED._WOULD_YOU_LIKE_TO_INSTALL_IT_NOW?=\u5B89\u88C5Novacom\u9A71\u52A8\u624D\u80FD\u7528,\u73B0\u5728\u5B89\u88C5\u5417?
-NOVACOM_DRIVER_MISSING=Novacom\u9A71\u52A8\u7F3A\u5931
-JAR_FILES_(*.JAR)=Jar\u6587\u4EF6(*.jar)
-WEBOS_FILES_(*.IPK,_*.PATCH,_*.DIFF)=webOS\u6587\u4EF6(*.ipk, *.patch, *.diff)
-REPEATING_CONNECTION_WARNING=\u8BF7\u8FDE\u63A5\u597D\u8BBE\u5907\u518D\u7EE7\u7EED.
-WEBOS_DOCTOR_NEEDED_FOR_DRIVERS=\u9700\u8981\u9009\u62E9webOSDoctor\u4EE5\u5B89\u88C5Novacom\u9A71\u52A8.\u6CA1\u6709\u5C31\u73B0\u5728\u4E0B\u8F7D\u4E00\u4E2A.
-WEBOSDOCTOR_REQUIRED=\u9700\u8981webOSDoctor
-DOWNLOAD=\u4E0B\u8F7D
-SELECT_FILE...=\u9009\u62E9\u6587\u4EF6...
-CANCEL=\u53D6\u6D88
-InstalledPkgInfo.jLabel1.text=\u540D\u79F0:
-InstalledPkgInfo.jLabel2.text=\u7248\u672C:
-InstalledPkgInfo.jLabel4.text=ID:
-InstalledPkgInfo.jButton1.text=\u5173\u95ED
-InstalledPkgInfo.jLabel11.text=\u4F5C\u8005:
-InstalledPkgInfo.title=\u6587\u4EF6\u4FE1\u606F
-UNKNOWN=\u672A\u77E5
-InstalledPatchInfo.title=\u6587\u4EF6\u4FE1\u606F
-InstalledPatchInfo.jButton1.text=\u5173\u95ED
-InstalledPatchInfo.jLabel4.text=ID:
-InstalledPatchInfo.jLabel2.text=\u7248\u672C:
-InstalledPatchInfo.jLabel1.text=\u540D\u79F0:
-InstalledPatchInfo.jLabel5.text=\u63CF\u8FF0:
-InstalledPatchInfo.jLabel11.text=\u4F5C\u8005:
-About.closeButton.text=\u5173\u95ED
-About.jLabel5.text=\u5E2E\u52A9
-About.appVersionLabel.text=\u7248\u672C\u53F7 4.5.0
-About.jLabel2.text=\u7B80\u4F53\u4E2D\u6587\u7FFB\u8BD1:medigi8@twitter
-About.jLabel4.text=<html>\u7248\u6743\u5F52Jason Robitaille\u6240\u6709,\u76D7\u7248\u5FC5\u7A76.
-About.jLabel6.text=<html><p align="justify">\u6B64\u4E3A\u4E2A\u4EBA\u4F5C\u54C1,\u4E0EPalm\u516C\u53F8\u65E0\u5173.Palm,Pre,Pixi,Veer,TouchPad\u548CWebOS\u6CE8\u518C\u5546\u6807\u5F52 Hewlett-Packard\u516C\u53F8\u6240\u6709.</p>
-FeedLoader.jLabel5.text=\u5206\u6790\u4E0B\u8F7D\u4E2D:
-FeedLoader.jLabel6.text=
-FeedViewer.jLayeredPane1.TabConstraints.tabTitle=\u66F4\u65B0
-FeedViewer.jLayeredPane2.TabConstraints.tabTitle=\u5E94\u7528\u8F6F\u4EF6
-FeedViewer.jLayeredPane3.TabConstraints.tabTitle=\u670D\u52A1
-FeedViewer.jLayeredPane4.TabConstraints.tabTitle=\u63D2\u4EF6
-FeedViewer.jLayeredPane5.TabConstraints.tabTitle=Linux\u8F6F\u4EF6
-FeedViewer.jLayeredPane6.TabConstraints.tabTitle=\u5185\u6838
-FeedViewer.jLayeredPane7.TabConstraints.tabTitle=\u8865\u4E01
-FeedViewer.jLayeredPane8.TabConstraints.tabTitle=\u4E3B\u9898
-FeedViewer.jTextField1.text=
-FeedViewer.jButton1.text=
-FeedViewer.jButton2.text=\u5B89\u88C5
-FeedViewer.jLabel1.text=<html>
-FeedViewer.jLabel2.text=<html>
-FeedViewer.jTextPane1.contentType=text/html
-FeedViewer.jTextPane1.text=<html>
-FeedViewer.jLabel4.text=<html><b>\u6E90:</b>
-FeedViewer.jLabel3.text=<html><b>\u8BB8\u53EF:</b>
-FeedViewer.jLabel5.text=<html><b>\u7248\u672C:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel6.text=<html><b>\u4E0A\u6B21\u4FEE\u6539:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel8.text=<html><b>\u63CF\u8FF0:</b>
-FeedViewer.jLabel7.text=<html>
-FeedViewer.jLabel9.text=<html><b>\u4F5C\u8005:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel10.text=<html>
-FeedViewer.jLabel11.text=<html><a href="#">\u4E3B\u754C\u9762</a>
-FeedViewer.jTextField2.text=
-FeedViewer.jLabel22.text=<html><a href="#">\u4E3B\u754C\u9762</a>
-FeedViewer.jLabel21.text=<html>
-FeedViewer.jLabel20.text=<html><b>\u4F5C\u8005:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel19.text=<html>
-FeedViewer.jLabel18.text=<html><b>\u63CF\u8FF0:</b>
-FeedViewer.jLabel17.text=<html><b>\u4E0A\u6B21\u4FEE\u6539:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel16.text=<html><b>\u7248\u672C:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel15.text=<html><b>\u8BB8\u53EF:</b>
-FeedViewer.jLabel14.text=<html><b>\u6E90:</b>
-FeedViewer.jTextPane2.text=<html>
-FeedViewer.jTextPane2.contentType=text/html
-FeedViewer.jLabel13.text=<html>
-FeedViewer.jLabel12.text=<html>
-FeedViewer.jButton4.text=\u5B89\u88C5
-FeedViewer.jButton3.text=
-FeedViewer.jLabel33.text=<html><a href="#">\u4E3B\u754C\u9762</a>
-FeedViewer.jLabel32.text=<html>
-FeedViewer.jLabel31.text=<html><b>\u4F5C\u8005:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel30.text=<html>
-FeedViewer.jLabel29.text=<html><b>\u63CF\u8FF0:</b>
-FeedViewer.jLabel28.text=<html><b>\u4E0A\u6B21\u4FEE\u6539:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel27.text=<html><b>\u7248\u672C:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel26.text=<html><b>\u8BB8\u53EF:</b>
-FeedViewer.jLabel25.text=<html><b>\u6E90:</b>
-FeedViewer.jTextPane3.text=<html>
-FeedViewer.jTextPane3.contentType=text/html
-FeedViewer.jLabel24.text=<html>
-FeedViewer.jLabel23.text=<html>
-FeedViewer.jButton6.text=\u5B89\u88C5
-FeedViewer.jButton5.text=
-FeedViewer.jTextField3.text=
-FeedViewer.jLabel44.text=<html><a href="#">\u4E3B\u754C\u9762</a>
-FeedViewer.jLabel43.text=<html>
-FeedViewer.jLabel42.text=<html><b>\u4F5C\u8005:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel41.text=<html>
-FeedViewer.jLabel40.text=<html><b>\u63CF\u8FF0:</b>
-FeedViewer.jLabel39.text=<html><b>\u4E0A\u6B21\u4FEE\u6539:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel38.text=<html><b>\u7248\u672C:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel37.text=<html><b>\u8BB8\u53EF:</b>
-FeedViewer.jLabel36.text=<html><b>\u6E90:</b>
-FeedViewer.jTextPane4.text=<html>
-FeedViewer.jTextPane4.contentType=text/html
-FeedViewer.jLabel35.text=<html>
-FeedViewer.jLabel34.text=<html>
-FeedViewer.jButton8.text=\u5B89\u88C5
-FeedViewer.jButton7.text=
-FeedViewer.jTextField4.text=
-FeedViewer.jTextField5.text=
-FeedViewer.jLabel55.text=<html><a href="#">\u4E3B\u754C\u9762</a>
-FeedViewer.jLabel54.text=<html>
-FeedViewer.jLabel53.text=<html><b>\u4F5C\u8005:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel52.text=<html>
-FeedViewer.jLabel51.text=<html><b>\u63CF\u8FF0:</b>
-FeedViewer.jLabel50.text=<html><b>\u4E0A\u6B21\u4FEE\u6539:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel49.text=<html><b>\u7248\u672C:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel48.text=<html><b>\u8BB8\u53EF:</b>
-FeedViewer.jLabel47.text=<html><b>\u6E90:</b>
-FeedViewer.jTextPane5.text=<html>
-FeedViewer.jTextPane5.contentType=text/html
-FeedViewer.jLabel46.text=<html>
-FeedViewer.jLabel45.text=<html>
-FeedViewer.jButton10.text=\u5B89\u88C5
-FeedViewer.jButton9.text=
-FeedViewer.jLabel66.text=<html><a href="#">\u4E3B\u754C\u9762</a>
-FeedViewer.jLabel65.text=<html>
-FeedViewer.jLabel64.text=<html><b>\u4F5C\u8005:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel63.text=<html>
-FeedViewer.jLabel62.text=<html><b>\u63CF\u8FF0:</b>
-FeedViewer.jLabel61.text=<html><b>\u4E0A\u6B21\u4FEE\u6539:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel60.text=<html><b>\u7248\u672C:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel59.text=<html><b>\u8BB8\u53EF:</b>
-FeedViewer.jLabel58.text=<html><b>\u6E90:</b>
-FeedViewer.jTextPane6.text=<html>
-FeedViewer.jTextPane6.contentType=text/html
-FeedViewer.jLabel57.text=<html>
-FeedViewer.jLabel56.text=<html>
-FeedViewer.jButton12.text=\u5B89\u88C5
-FeedViewer.jButton11.text=
-FeedViewer.jTextField6.text=
-FeedViewer.jLabel77.text=<html><a href="#">\u4E3B\u754C\u9762</a>
-FeedViewer.jLabel76.text=<html>
-FeedViewer.jLabel75.text=<html><b>\u4F5C\u8005:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel74.text=<html>
-FeedViewer.jLabel73.text=<html><b>\u63CF\u8FF0:</b>
-FeedViewer.jLabel72.text=<html><b>\u4E0A\u6B21\u4FEE\u6539:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel71.text=<html><b>\u7248\u672C:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel70.text=<html><b>\u8BB8\u53EF:</b>
-FeedViewer.jLabel69.text=<html><b>\u6E90:</b>
-FeedViewer.jTextPane7.text=<html>
-FeedViewer.jTextPane7.contentType=text/html
-FeedViewer.jLabel68.text=<html>
-FeedViewer.jLabel67.text=<html>
-FeedViewer.jButton14.text=\u5B89\u88C5
-FeedViewer.jButton13.text=
-FeedViewer.jTextField7.text=
-FeedViewer.jLabel88.text=<html><a href="#">\u4E3B\u754C\u9762</a>
-FeedViewer.jLabel87.text=<html>
-FeedViewer.jLabel86.text=<html><b>\u4F5C\u8005:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel85.text=<html>
-FeedViewer.jLabel84.text=<html><b>\u63CF\u8FF0:</b>
-FeedViewer.jLabel83.text=<html><b>\u4E0A\u6B21\u4FEE\u6539:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel82.text=<html><b>\u7248\u672C:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel81.text=<html><b>\u8BB8\u53EF:</b>
-FeedViewer.jLabel80.text=<html><b>\u6E90:</b>
-FeedViewer.jTextPane8.text=<html>
-FeedViewer.jTextPane8.contentType=text/html
-FeedViewer.jLabel79.text=<html>
-FeedViewer.jLabel78.text=
-FeedViewer.jButton16.text=\u66F4\u65B0
-FeedViewer.jLayeredPane9.TabConstraints.tabTitle=Linux\u540E\u53F0\u7A0B\u5E8F
-FeedViewer.jLabel99.text=<html><a href="#">\u4E3B\u754C\u9762</a>
-FeedViewer.jLabel98.text=<html>
-FeedViewer.jLabel97.text=<html><b>\u4F5C\u8005:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel96.text=<html>
-FeedViewer.jLabel95.text=<html><b>\u63CF\u8FF0:</b>
-FeedViewer.jLabel94.text=<html><b>\u4E0A\u6B21\u4FEE\u6539:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel93.text=<html><b>\u7248\u672C:</b> &nbsp;&nbsp;&nbsp;
-FeedViewer.jLabel92.text=<html><b>\u8BB8\u53EF:</b>
-FeedViewer.jLabel91.text=<html><b>\u6E90:</b>
-FeedViewer.jTextPane9.text=<html>
-FeedViewer.jTextPane9.contentType=text/html
-FeedViewer.jLabel90.text=<html>
-FeedViewer.jLabel89.text=<html>
-FeedViewer.jButton18.text=\u5B89\u88C5
-FeedViewer.jButton17.text=
-FeedViewer.jTextField9.text=
-SendFile.title=\u53D1\u9001\u6587\u4EF6
-ReceiveFile.title=\u63A5\u6536\u6587\u4EF6
-FeedViewer.availablePackagesTabs.TabConstraints.tabTitle=\u53EF\u7528\u8F6F\u4EF6\u5305
-Installer.jLabel5.text=
-FeedViewer.jButton15.text=\u5168\u90E8\u66F4\u65B0
-ALL=\u5168\u90E8
-WEBOS_PACKAGE_FILE=WebOS\u8F6F\u4EF6\u5305\u6587\u4EF6
-WEBOS_PATCH_FILE=WebOS\u8865\u4E01\u6587\u4EF6
-WEBOS_DIFF_FILE=WebOS Diff\u6587\u4EF6
-UNKNOWN_FILE=\u672A\u77E5\u6587\u4EF6
-ERROR\:_FEED_LOADING_FAILED=\u51FA\u9519:\u5BFC\u5165\u6E90\u65F6\u5931\u8D25
-ERROR\:_DRIVER_INSTALLATION_FAILED=\u51FA\u9519:\u9A71\u52A8\u5B89\u88C5\u5931\u8D25
-ERROR\:_UNABLE_TO_DOWNLOAD_{0}=\u51FA\u9519:\u65E0\u6CD5\u4E0B\u8F7D{0}
-VERSION\:=\u7248\u672C:
-DEVELOPER\:=\u4F5C\u8005:
-LAST_UPDATED\:=\u4E0A\u6B21\u4FEE\u6539:
-NO_PACKAGES_FOUND=\u672A\u53D1\u73B0\u8F6F\u4EF6\u5305
-DEPENDANCY_INSTALL_WARNING=\u8B66\u544A:\u4EE5\u4E0B\u6587\u4EF6\u4E0E{0}\u5173\u8054,\u5C06\u4F1A\u4E00\u5E76\u5B89\u88C5
-NO_UPDATES_FOUND=\u672A\u53D1\u73B0\u66F4\u65B0
-MainView.installTable.columnModel.title2=\u7C7B\u578B
-MainView.installTable.columnModel.title1=\u5927\u5C0F
-MainView.installTable.columnModel.title0=\u540D\u79F0
-Settings.title=\u8BBE\u7F6E
-Settings.jLabel1.text=\u8BED\u8A00:
-MainView.jMenuItem8.text=\u8BBE\u7F6E
-<SYSTEM_DEFAULT>=<\u7CFB\u7EDF\u9ED8\u8BA4>
-ENGLISH=\u82F1\u8BED
-FRENCH=\u6CD5\u8BED
-GERMAN=\u5FB7\u8BED
-SIMPLIFIED_CHINESE=\u7B80\u4F53\u4E2D\u6587
-THE_NEW_LANGUAGE_WILL_TAKE_EFFECT_THE_NEXT_TIME_WEBOS_QUICK_INSTALL_IS_LAUNCHED.=\u66F4\u6539\u8BED\u8A00\u540E\u9700\u91CD\u542F\u7A0B\u5E8F.
-LANGUAGE_CHANGED.=\u8BED\u8A00\u5DF2\u66F4\u6539
-ERROR\:_INVALID_FEED_URL=\u51FA\u9519:\u65E0\u6548\u5730\u5740
-CUSTOM_FEED_URL\:=\u9972\u6599\u5730\u5740:
-EXIT=\u9000\u51FA
-MainView.jMenuItem9.text=Linux\u547D\u4EE4\u884C
-Settings.jLabel2.text=\u9ED8\u8BA4\u6E90:
-Settings.jLabel3.text=\u81EA\u5B9A\u4E49\u6E90:
-Settings.jButton1.text=\u5220\u9664\u5DF2\u5B58\u5F00\u53D1\u8005\u6A21\u5F0F\u5BC6\u7801
-FEED_PRECENTRAL=webOS Nation
-FEED_WEBOSINTERNALS=WebOS-Internals
-FEED_PATCHES=WebOS\u8865\u4E01
-FEED_KERNELS=WebOS\u5185\u6838
-FEED_PRETHEMER=\u4E3B\u9898
-FEED_PCTHEMES=webOS Nation \u4E3B\u9898
-FEED_CLOCK=\u65F6\u949F\u4E3B\u9898
-Settings.jCheckBox1.text=<html>\u5C3D\u53EF\u80FD\u4F7F\u7528\u8BBE\u5907\u540D\u79F0
-OK=\u597D
\ No newline at end of file