diff --git a/src/main/java/com/ardublock/ui/OpenblocksFrame.java b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
index b8f04e3d39956c2a78173e29d373e6ef57d05c88..953384cb15b4c6ca23dc0433dfdf5249495e84c3 100644
--- a/src/main/java/com/ardublock/ui/OpenblocksFrame.java
+++ b/src/main/java/com/ardublock/ui/OpenblocksFrame.java
@@ -970,17 +970,26 @@ public class OpenblocksFrame extends JFrame
JMenuItem whileButtonExample = new JMenuItem(uiMessageBundle.getString("ardublock.examples.whilebutton"));
whileButtonExample.addActionListener(new OpenExampleButtonListener("WhileButtonBlink.abp", this));
- JMenuItem psnBrokerExample = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnBroker"));
- psnBrokerExample.addActionListener(new OpenExampleButtonListener("Broker.abp", this));
+ JMenuItem psnBrokerAdvancedExample = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnBroker"));
+ psnBrokerAdvancedExample.addActionListener(new OpenExampleButtonListener("BrokerAdvanced.abp", this));
- JMenuItem psnClient1Example = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnClient1"));
- psnClient1Example.addActionListener(new OpenExampleButtonListener("Client1.abp", this));
+ JMenuItem psnClient1AdvancedExample = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnClient1"));
+ psnClient1AdvancedExample.addActionListener(new OpenExampleButtonListener("Client1Advanced.abp", this));
- JMenuItem psnClient2Example = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnClient2"));
- psnClient2Example.addActionListener(new OpenExampleButtonListener("Client2.abp", this));
+ JMenuItem psnClient2AdvancedExample = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnClient2"));
+ psnClient2AdvancedExample.addActionListener(new OpenExampleButtonListener("Client2Advanced.abp", this));
- JMenuItem psnChatExample = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnChat"));
- psnChatExample.addActionListener(new OpenExampleButtonListener("Chat.abp", this));
+ JMenuItem psnChatAdvancedExample = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnChat"));
+ psnChatAdvancedExample.addActionListener(new OpenExampleButtonListener("ChatAdvanced.abp", this));
+
+ JMenuItem psnClient1BasicExample = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnClient1"));
+ psnClient1BasicExample.addActionListener(new OpenExampleButtonListener("Client1Basic.abp", this));
+
+ JMenuItem psnClient2BasicExample = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnClient2"));
+ psnClient2BasicExample.addActionListener(new OpenExampleButtonListener("Client2Basic.abp", this));
+
+ JMenuItem psnChatBasicExample = new JMenuItem(uiMessageBundle.getString("ardublock.examples.psnChat"));
+ psnChatBasicExample.addActionListener(new OpenExampleButtonListener("ChatBasic.abp", this));
//************************************
@@ -1010,6 +1019,8 @@ public class OpenblocksFrame extends JFrame
JMenu digitalExamplesSubMenu = new JMenu(uiMessageBundle.getString("ardublock.ui.submenu.examples.digital"));
JMenu analogExamplesSubMenu = new JMenu(uiMessageBundle.getString("ardublock.ui.submenu.examples.analog"));
JMenu communicationExamplesSubMenu = new JMenu(uiMessageBundle.getString("ardublock.ui.submenu.examples.communication"));
+ JMenu advancedCommunicationExamplesSubMenue = new JMenu(uiMessageBundle.getString("ardublock.ui.submenu.examples.advanced_communication"));
+ JMenu basicCommunicationExamplesSubMenue = new JMenu(uiMessageBundle.getString("ardublock.ui.submenu.examples.basic_communication"));
menuBar.add(fileMenu);
menuBar.add(programMenu);
@@ -1032,6 +1043,8 @@ public class OpenblocksFrame extends JFrame
examplesSubMenu.add(digitalExamplesSubMenu);
examplesSubMenu.add(analogExamplesSubMenu);
examplesSubMenu.add(communicationExamplesSubMenu);
+ communicationExamplesSubMenu.add(advancedCommunicationExamplesSubMenue);
+ communicationExamplesSubMenu.add(basicCommunicationExamplesSubMenue);
basicExamplesSubMenu.add(blinkExample);
digitalExamplesSubMenu.add(digitalSerialExample);
@@ -1040,10 +1053,15 @@ public class OpenblocksFrame extends JFrame
digitalExamplesSubMenu.add(whileButtonExample);
analogExamplesSubMenu.add(analogSerialExample);
analogExamplesSubMenu.add(counterVariableExample);
- communicationExamplesSubMenu.add(psnBrokerExample);
- communicationExamplesSubMenu.add(psnClient1Example);
- communicationExamplesSubMenu.add(psnClient2Example);
- communicationExamplesSubMenu.add(psnChatExample);
+
+ advancedCommunicationExamplesSubMenue.add(psnBrokerAdvancedExample);
+ advancedCommunicationExamplesSubMenue.add(psnClient1AdvancedExample);
+ advancedCommunicationExamplesSubMenue.add(psnClient2AdvancedExample);
+ advancedCommunicationExamplesSubMenue.add(psnChatAdvancedExample);
+
+ basicCommunicationExamplesSubMenue.add(psnClient1BasicExample);
+ basicCommunicationExamplesSubMenue.add(psnClient2BasicExample);
+ basicCommunicationExamplesSubMenue.add(psnChatBasicExample);
programMenu.add(generateMenuItem);
programMenu.add(simulateMenuItem);
diff --git a/src/main/resources/com/ardublock/block/ardublock.properties b/src/main/resources/com/ardublock/block/ardublock.properties
index c40482c73075ba2fc815e8c0db02f2f126666819..44c0e29e907e0685e617b77fa1bbc90431166ca8 100644
--- a/src/main/resources/com/ardublock/block/ardublock.properties
+++ b/src/main/resources/com/ardublock/block/ardublock.properties
@@ -20,7 +20,9 @@ ardublock.ui.submenu.examples=Examples
ardublock.ui.submenu.examples.basic=Basic
ardublock.ui.submenu.examples.digital=Digital
ardublock.ui.submenu.examples.analog=Analog
-ardublock.ui.submenu.examples.communication=Communication
+ardublock.ui.submenu.examples.communication=PubSub Network
+ardublock.ui.submenu.examples.advanced_communication=advanced
+ardublock.ui.submenu.examples.basic_communication=basic
ardublock.ui.new=New
ardublock.ui.new.tooltip=new program
diff --git a/src/main/resources/com/ardublock/block/ardublock_de.properties b/src/main/resources/com/ardublock/block/ardublock_de.properties
index b8887a210c90303e37c1b7f20216b157295c10e0..aa55fd653c62233b8c38b8f4d3cb2e1936dbd79a 100644
--- a/src/main/resources/com/ardublock/block/ardublock_de.properties
+++ b/src/main/resources/com/ardublock/block/ardublock_de.properties
@@ -20,7 +20,9 @@ ardublock.ui.submenu.examples=Beispiele
ardublock.ui.submenu.examples.basic=Basic
ardublock.ui.submenu.examples.digital=Digital
ardublock.ui.submenu.examples.analog=Analog
-ardublock.ui.submenu.examples.communication=Kommunikation
+ardublock.ui.submenu.examples.communication=PubSub Netzwerk
+ardublock.ui.submenu.examples.advanced_communication=Advanced
+ardublock.ui.submenu.examples.basic_communication=Basic
ardublock.ui.new=Neu
ardublock.ui.new.tooltip=Neues Programm erstellen
diff --git a/src/main/resources/com/ardublock/block/ardublock_de_DE.properties b/src/main/resources/com/ardublock/block/ardublock_de_DE.properties
index 397798d683835069c45a065dd865524d7947b978..caca0a19716f5c7144214b2cfb39ef0490d72863 100644
--- a/src/main/resources/com/ardublock/block/ardublock_de_DE.properties
+++ b/src/main/resources/com/ardublock/block/ardublock_de_DE.properties
@@ -20,7 +20,9 @@ ardublock.ui.submenu.examples=Beispiele
ardublock.ui.submenu.examples.basic=Basic
ardublock.ui.submenu.examples.digital=Digital
ardublock.ui.submenu.examples.analog=Analog
-ardublock.ui.submenu.examples.communication=Kommunikation
+ardublock.ui.submenu.examples.communication=PubSub Netzwerk
+ardublock.ui.submenu.examples.advanced_communication=Advanced
+ardublock.ui.submenu.examples.basic_communication=Basic
ardublock.ui.new=Neu
ardublock.ui.new.tooltip=Neues Programm erstellen
diff --git a/src/main/resources/com/ardublock/block/ardublock_en_GB.properties b/src/main/resources/com/ardublock/block/ardublock_en_GB.properties
index 18bda340b455b295f5996373b346ea9a711f9374..870a58649f2af5d81dfd9c070065e68461eaa664 100644
--- a/src/main/resources/com/ardublock/block/ardublock_en_GB.properties
+++ b/src/main/resources/com/ardublock/block/ardublock_en_GB.properties
@@ -20,7 +20,9 @@ ardublock.ui.submenu.examples=Examples
ardublock.ui.submenu.examples.basic=Basic
ardublock.ui.submenu.examples.digital=Digital
ardublock.ui.submenu.examples.analog=Analog
-ardublock.ui.submenu.examples.communication=Communication
+ardublock.ui.submenu.examples.communication=PubSub Network
+ardublock.ui.submenu.examples.advanced_communication=advanced
+ardublock.ui.submenu.examples.basic_communication=basic
ardublock.ui.new=New
ardublock.ui.new.tooltip=new program
diff --git a/src/main/resources/com/ardublock/examples/Chat.abp b/src/main/resources/com/ardublock/examples/ChatAdvanced.abp
similarity index 100%
rename from src/main/resources/com/ardublock/examples/Chat.abp
rename to src/main/resources/com/ardublock/examples/ChatAdvanced.abp
diff --git a/src/main/resources/com/ardublock/examples/Client1.abp b/src/main/resources/com/ardublock/examples/Client1Advanced.abp
similarity index 100%
rename from src/main/resources/com/ardublock/examples/Client1.abp
rename to src/main/resources/com/ardublock/examples/Client1Advanced.abp
diff --git a/src/main/resources/com/ardublock/examples/Client2.abp b/src/main/resources/com/ardublock/examples/Client2Advanced.abp
similarity index 100%
rename from src/main/resources/com/ardublock/examples/Client2.abp
rename to src/main/resources/com/ardublock/examples/Client2Advanced.abp