diff --git a/apisupport.feedreader/feedreader-suite/FeedReader/nbproject/project.xml b/apisupport.feedreader/feedreader-suite/FeedReader/nbproject/project.xml
--- a/apisupport.feedreader/feedreader-suite/FeedReader/nbproject/project.xml
+++ b/apisupport.feedreader/feedreader-suite/FeedReader/nbproject/project.xml
@@ -23,6 +23,15 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
+                    <code-name-base>org.netbeans.modules.settings</code-name-base>
+                    <build-prerequisite/>
+                    <compile-dependency/>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                        <specification-version>1.29</specification-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.openide.actions</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff --git a/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/FeedTopComponent.java b/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/FeedTopComponent.java
--- a/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/FeedTopComponent.java
+++ b/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/FeedTopComponent.java
@@ -30,8 +30,10 @@
 package org.netbeans.feedreader;
 
 import java.awt.BorderLayout;
-import java.io.Serializable;
 import javax.swing.ActionMap;
+import org.netbeans.api.settings.ConvertAsProperties;
+import org.openide.awt.ActionID;
+import org.openide.awt.ActionReference;
 import org.openide.explorer.ExplorerManager;
 import org.openide.explorer.ExplorerUtils;
 import org.openide.explorer.view.BeanTreeView;
@@ -41,13 +43,19 @@
 import org.openide.util.NbBundle;
 import org.openide.windows.TopComponent;
 
-final class FeedTopComponent extends TopComponent implements ExplorerManager.Provider {
+@ConvertAsProperties(dtd = "-//org.netbeans.feedreader//FeedTopComponent//EN", autostore = false)
+@TopComponent.Description(preferredID = "FeedTopComponent", iconBase="org/netbeans/feedreader/rss16.gif", 
+persistenceType = TopComponent.PERSISTENCE_ALWAYS)
+@TopComponent.Registration(mode = "explorer", openAtStartup = true)
+@ActionID(category = "Window", id = "org.netbeans.feedreader.FeedTopComponent")
+@ActionReference(path = "Menu/Window", position=10)
+@TopComponent.OpenActionRegistration(displayName = "#CTL_FeedAction", preferredID = "FeedTopComponent")
+public final class FeedTopComponent extends TopComponent implements ExplorerManager.Provider {
 
     private static FeedTopComponent instance;
-    
     private final ExplorerManager manager = new ExplorerManager();
     private final BeanTreeView view = new BeanTreeView();
-    
+
     private FeedTopComponent() {
         setName(NbBundle.getMessage(FeedTopComponent.class, "CTL_FeedTopComponent"));
         setToolTipText(NbBundle.getMessage(FeedTopComponent.class, "HINT_FeedTopComponent"));
@@ -64,41 +72,21 @@
         map.put("delete", ExplorerUtils.actionDelete(manager, true));
         associateLookup(ExplorerUtils.createLookup(manager, map));
     }
-    
-    public static synchronized FeedTopComponent getDefault() {
-        if (instance == null) {
-            instance = new FeedTopComponent();
-        }
-        return instance;
+
+    void writeProperties(java.util.Properties p) {
+        // better to version settings since initial version as advocated at
+        // http://wiki.apidesign.org/wiki/PropertyFiles
+        p.setProperty("version", "1.0");
+        // TODO store your settings
     }
-    
-    @Override
-    public int getPersistenceType() {
-        return TopComponent.PERSISTENCE_ALWAYS;
+
+    void readProperties(java.util.Properties p) {
+        String version = p.getProperty("version");
+        // TODO read your settings according to their version
     }
-    
-    @Override
-    protected String preferredID() {
-        return "FeedTopComponent";
-    }
-    
-    @Override
-    protected Object writeReplace() {
-        return new ResolvableHelper();
-    }
-    
-    private static final class ResolvableHelper implements Serializable {
-        
-        private static final long serialVersionUID = 1L;
-        
-        public Object readResolve() {
-            return FeedTopComponent.getDefault();
-        }
-        
-    }
-    
+
     public ExplorerManager getExplorerManager() {
         return manager;
     }
-    
+
 }
diff --git a/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/FeedTopComponentSettings.xml b/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/FeedTopComponentSettings.xml
deleted file mode 100644
--- a/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/FeedTopComponentSettings.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
-<!--
-  Copyright (c) 2010, Oracle. All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
-  * Neither the name of Oracle nor the names of its contributors
-    may be used to endorse or promote products derived from this software without
-    specific prior written permission.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-  THE POSSIBILITY OF SUCH DAMAGE.
--->
-<settings version="1.0">
-    <module name="org.netbeans.feedreader" spec="1.0"/>
-    <instanceof class="org.openide.windows.TopComponent"/>
-    <instance class="org.netbeans.feedreader.FeedTopComponent" method="getDefault"/>
-</settings>
diff --git a/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/FeedTopComponentWstcref.xml b/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/FeedTopComponentWstcref.xml
deleted file mode 100644
--- a/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/FeedTopComponentWstcref.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE tc-ref PUBLIC
-          "-//NetBeans//DTD Top Component in Mode Properties 2.0//EN"
-          "http://www.netbeans.org/dtds/tc-ref2_0.dtd">
-		<!--
-		  Copyright (c) 2010, Oracle. All rights reserved.
-
-		  Redistribution and use in source and binary forms, with or without
-		  modification, are permitted provided that the following conditions are met:
-
-		  * Redistributions of source code must retain the above copyright notice,
-		    this list of conditions and the following disclaimer.
-
-		  * Redistributions in binary form must reproduce the above copyright notice,
-		    this list of conditions and the following disclaimer in the documentation
-		    and/or other materials provided with the distribution.
-
-		  * Neither the name of Oracle nor the names of its contributors
-		    may be used to endorse or promote products derived from this software without
-		    specific prior written permission.
-
-		  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-		  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-		  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-		  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-		  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-		  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-		  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-		  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-		  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-		  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-		  THE POSSIBILITY OF SUCH DAMAGE.
-		-->
-
-<tc-ref version="2.0" >
-    <module name="org.netbeans.feedreader" spec="1.0" />
-    <tc-id id="FeedTopComponent" />
-    <state opened="true" />
-</tc-ref>
diff --git a/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/layer.xml b/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/layer.xml
--- a/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/layer.xml
+++ b/apisupport.feedreader/feedreader-suite/FeedReader/src/org/netbeans/feedreader/layer.xml
@@ -30,16 +30,6 @@
   THE POSSIBILITY OF SUCH DAMAGE.
 -->
 <filesystem>
-    <folder name="Actions">
-        <folder name="Window">
-            <file name="org-netbeans-feedreader-FeedAction.instance">
-                <attr name="instanceCreate" methodvalue="org.openide.windows.TopComponent.openAction"/>
-                <attr name="component" methodvalue="org.netbeans.feedreader.FeedTopComponent.getDefault"/>
-                <attr name="displayName" bundlevalue="org.netbeans.feedreader.Bundle#CTL_FeedAction"/>
-                <attr name="iconBase" stringvalue="org/netbeans/feedreader/rss16.gif"/>
-            </file>
-        </folder>
-    </folder>
     <folder name="Menu">
         <folder name="File">
             <file name="org-openide-actions-SaveAction.shadow_hidden"/>
@@ -50,13 +40,6 @@
             <file name="org-netbeans-core-actions-HTMLViewAction.shadow_hidden"/>
             <file name="org-netbeans-core-actions-LogAction.shadow_hidden"/>
         </folder>
-        <folder name="Window">
-            <file name="FeedAction.shadow">
-                <attr name="originalFile" stringvalue="Actions/Window/org-netbeans-feedreader-FeedAction.instance"/>
-                <attr name="position" intvalue="777"/>
-            </file>
-            <file name="org-netbeans-core-windows-actions-GlobalPropertiesAction.shadow_hidden"/>
-        </folder>
     </folder>
     <folder name="RssFeeds">
         <file name="sample.instance">
@@ -67,14 +50,4 @@
         <file name="Memory_hidden"/>
         <file name="UndoRedo_hidden"/>
     </folder>
-    <folder name="Windows2">
-        <folder name="Components">
-            <file name="FeedTopComponent.settings" url="FeedTopComponentSettings.xml"/>
-        </folder>
-        <folder name="Modes">
-            <folder name="explorer">
-                <file name="FeedTopComponent.wstcref" url="FeedTopComponentWstcref.xml"/>
-            </folder>
-        </folder>
-    </folder>
 </filesystem>
diff --git a/apisupport.feedreader/feedreader-suite/nbproject/build-impl.xml b/apisupport.feedreader/feedreader-suite/nbproject/build-impl.xml
--- a/apisupport.feedreader/feedreader-suite/nbproject/build-impl.xml
+++ b/apisupport.feedreader/feedreader-suite/nbproject/build-impl.xml
@@ -38,5 +38,12 @@
             </not>
         </condition>
     </fail>
+    <fail message="Cannot find NetBeans build harness. ${line.separator}Check that nbplatform.${nbplatform.active}.netbeans.dest.dir and nbplatform.${nbplatform.active}.harness.dir are defined. ${line.separator}On a developer machine these are normally defined in ${user.properties.file}=${netbeans.user}/build.properties ${line.separator}but for automated builds you should pass these properties to Ant explicitly.">
+        <condition>
+            <not>
+                <available type="dir" file="${harness.dir}"/>
+            </not>
+        </condition>
+    </fail>
     <import file="${harness.dir}/suite.xml"/>
 </project>
diff --git a/apisupport.feedreader/feedreader-suite/nbproject/genfiles.properties b/apisupport.feedreader/feedreader-suite/nbproject/genfiles.properties
--- a/apisupport.feedreader/feedreader-suite/nbproject/genfiles.properties
+++ b/apisupport.feedreader/feedreader-suite/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
 build.xml.data.CRC32=a89c5057
 build.xml.script.CRC32=9a0e0f71
-build.xml.stylesheet.CRC32=531c622b@1.30.0.7
+build.xml.stylesheet.CRC32=eaf9f76a@1.44
 # 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=a89c5057
-nbproject/build-impl.xml.script.CRC32=7f46473b
-nbproject/build-impl.xml.stylesheet.CRC32=2f5f2db8@1.30.0.7
+nbproject/build-impl.xml.script.CRC32=6245c318
+nbproject/build-impl.xml.stylesheet.CRC32=183e6ef3@1.44