diff --git a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfilePresenceView.swift b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfilePresenceView.swift
index b2fa46a84..fa76efdd6 100644
--- a/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfilePresenceView.swift
+++ b/RiotSwiftUI/Modules/Template/SimpleUserProfileExample/View/TemplateUserProfilePresenceView.swift
@@ -47,7 +47,7 @@ struct TemplateUserProfilePresenceView: View {
 }
 
 @available(iOS 14.0, *)
-struct TemplatePresenceView_Previews: PreviewProvider {
+struct TemplateUserProfilePresenceView_Previews: PreviewProvider {
     static var previews: some View {
         VStack(alignment:.leading){
             Text("Presence")
diff --git a/Tools/Templates/createSwiftUISingleScreen.sh b/Tools/Templates/createSwiftUISingleScreen.sh
new file mode 100755
index 000000000..52729ead1
--- /dev/null
+++ b/Tools/Templates/createSwiftUISingleScreen.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+if [ ! $# -eq 2 ]; then
+    echo "Usage: ./createSwiftUISingleScreen.sh Folder MyScreenName"
+    exit 1
+fi
+
+MODULE_DIR="../../RiotSwiftUI/Modules"
+OUTPUT_DIR=$MODULE_DIR/$1
+SCREEN_NAME=$2
+SCREEN_VAR_NAME=`echo $SCREEN_NAME | awk '{ print tolower(substr($0, 1, 1)) substr($0, 2) }'`
+TEMPLATE_DIR=$MODULE_DIR/Template/SimpleUserProfileExample/
+if [ -e $OUTPUT_DIR ]; then
+    echo "Error: Folder ${OUTPUT_DIR} already exists"
+    exit 1
+fi
+
+echo "Create folder ${OUTPUT_DIR}"
+
+mkdir -p $OUTPUT_DIR
+cp -R $TEMPLATE_DIR $OUTPUT_DIR/
+
+cd $OUTPUT_DIR
+for file in $(find * -type f -print)
+do
+  echo "Building ${file/TemplateUserProfile/$SCREEN_NAME}..."
+  perl -p -i -e "s/TemplateUserProfile/"$SCREEN_NAME"/g" $file
+  perl -p -i -e "s/templateUserProfile/"$SCREEN_VAR_NAME"/g" $file
+
+  echo "// $ createScreen.sh $@" | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+  echo '// File created from SimpleUserProfileExample' | cat - ${file} > /tmp/$$ && mv /tmp/$$ ${file}
+
+  mv ${file} ${file/TemplateUserProfile/$SCREEN_NAME}
+done