diff --git a/help/C/adv-keyboard-shortcuts.page b/help/C/adv-keyboard-shortcuts.page
index 5824837e..bde201c1 100644
--- a/help/C/adv-keyboard-shortcuts.page
+++ b/help/C/adv-keyboard-shortcuts.page
@@ -6,7 +6,7 @@
   <info>
     <revision version="0.1" date="2013-02-17" status="candidate"/>
     <link type="guide" xref="index#advanced"/>
-    <link type="guide" xref="pref"/>
+    <link type="guide" xref="pref#global"/>
     <link type="seealso" xref="pref-keyboard-access" />
 
     <credit type="author copyright">
@@ -44,6 +44,9 @@
       <gui style="menuitem">Preferences</gui>
       <gui style="tab">Shortcuts</gui></guiseq>.</p>
     </item>
+    <item>
+      <p>Make sure <gui style="checkbox">Enable shortcuts</gui> is selected.</p>
+    </item>
     <item>
       <p>Select the shortcut that you wish to edit by clicking on it.</p>
     </item>
diff --git a/help/C/app-colors.page b/help/C/app-colors.page
index a044a1c4..5c65e35a 100644
--- a/help/C/app-colors.page
+++ b/help/C/app-colors.page
@@ -5,7 +5,7 @@
   <info>
     <revision version="0.1" date="2013-03-02" status="candidate"/>
     <link type="guide" xref="index#appearance"/>
-    <link type="guide" xref="profile"/>
+    <link type="guide" xref="pref#profile"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -40,11 +40,17 @@
 
     <p>To use colors from the system theme:</p>
 
-    <steps>
+      <steps>
+      <item>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
       <item>
-        <p>Select <guiseq><gui style="menu">Edit</gui>
-        <gui style="menuitem">Profile Preferences</gui>
-        <gui style="tab">Colors</gui></guiseq>.</p>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Colors</gui>.</p>
       </item>
       <item>
         <p>Check <gui style="checkbox">Use colors from system theme</gui>. The
@@ -65,9 +71,15 @@
 
     <steps>
       <item>
-        <p>Select <guiseq><gui style="menu">Edit</gui>
-        <gui style="menuitem">Profile Preferences</gui>
-        <gui style="tab">Colors</gui></guiseq>.</p>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Colors</gui>.</p>
       </item>
       <item>
         <p>Make sure that <gui style="checkbox">Use colors from system
@@ -91,9 +103,15 @@
 
     <steps>
       <item>
-        <p>Select <guiseq><gui style="menu">Edit</gui>
-        <gui style="menuitem">Profile Preferences</gui>
-        <gui style="tab">Colors</gui></guiseq>.</p>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Colors</gui>.</p>
       </item>
       <item>
         <p>Make sure that <gui style="checkbox">Use colors from system
diff --git a/help/C/app-cursor.page b/help/C/app-cursor.page
index 50b8519d..99319699 100644
--- a/help/C/app-cursor.page
+++ b/help/C/app-cursor.page
@@ -6,7 +6,7 @@
   <info>
     <revision version="0.1" date="2013-02-17" status="candidate"/>
     <link type="guide" xref="index#appearance"/>
-    <link type="guide" xref="profile"/>
+    <link type="guide" xref="pref#profile"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -37,9 +37,15 @@
 
   <steps>
     <item>
-      <p>Select <guiseq><gui style="menu">Edit</gui>
-      <gui style="menuitem">Profile Preferences</gui>
-      <gui style="tab">General</gui></guiseq>.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
+    </item>
+    <item>
+      <p>Select <gui style="tab">General</gui>.</p>
     </item>
     <item>
       <p>Choose your desired cursor shape from the drop down list next to
diff --git a/help/C/app-fonts.page b/help/C/app-fonts.page
index 7bec25ac..e3ff6ecf 100644
--- a/help/C/app-fonts.page
+++ b/help/C/app-fonts.page
@@ -5,7 +5,7 @@
   <info>
     <revision version="0.1" date="2013-02-22" status="candidate"/>
     <link type="guide" xref="index#appearance"/>
-    <link type="guide" xref="profile"/>
+    <link type="guide" xref="pref#profile"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -42,8 +42,15 @@
 
   <steps>
     <item>
-      <p>Select <guiseq><gui style="menu">Edit</gui> <gui style="menuitem">
-      Profile Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
+    </item>
+    <item>
+      <p>Select <gui style="tab">General</gui>.</p>
     </item>
     <item>
       <p>Unselect <gui style="checkbox">Custom font</gui>.</p>
@@ -59,9 +66,15 @@
 
   <steps>
     <item>
-      <p>Select <guiseq><gui style="menu">Edit</gui>
-      <gui style="menuitem">Profile Preferences</gui>
-      <gui style="tab">General</gui></guiseq>.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
+    </item>
+    <item>
+      <p>Select <gui style="tab">General</gui>.</p>
     </item>
     <item>
       <p>Select <gui style="checkbox">Custom font</gui>.</p>
@@ -98,8 +111,15 @@
 
   <steps>
     <item>
-      <p>Go to <guiseq><gui style="menu">Edit</gui> <gui style="menuitem">
-      Profile Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
+    </item>
+    <item>
+      <p>Select <gui style="tab">General</gui>.</p>
     </item>
     <item>
       <p>To set the horizonal character spacing, adjust the multiplier number
diff --git a/help/C/app-terminal-sizes.page b/help/C/app-terminal-sizes.page
index 1ae26f33..2dbb8bed 100644
--- a/help/C/app-terminal-sizes.page
+++ b/help/C/app-terminal-sizes.page
@@ -76,14 +76,21 @@
 
   <steps>
     <item>
-      <p>Select <guiseq><gui style="menu">Edit</gui> <gui style="menuitem">
-      Profile Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
-   </item>
-   <item>
-     <p>Set <gui>Initial terminal size</gui> by typing the desired number of columns and
-     rows in the corresponding input boxes. You can also click
-     <gui style="button">+</gui> to increase or <gui style="button">-</gui> to
-     decrease the size.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
+    </item>
+    <item>
+      <p>Select <gui style="tab">General</gui>.</p>
+    </item>
+    <item>
+      <p>Set <gui>Initial terminal size</gui> by typing the desired number of columns and
+      rows in the corresponding input boxes. You can also click
+      <gui style="button">+</gui> to increase or <gui style="button">-</gui> to
+      decrease the size.</p>
     </item>
   </steps>
 
diff --git a/help/C/index.page b/help/C/index.page
index f40c26bc..6e8d753d 100644
--- a/help/C/index.page
+++ b/help/C/index.page
@@ -40,11 +40,11 @@
     <title>Getting Started</title>
   </section>
 
- <section id="textoutput" style="2column">
+  <section id="textoutput" style="2column">
     <title>Working With Text</title>
   </section>
 
- <section id="appearance" style="2column">
+  <section id="appearance" style="2column">
     <title>Customize Appearance</title>
   </section>
 
diff --git a/help/C/pref-bell.page b/help/C/pref-bell.page
index 4842354f..0db97dc4 100644
--- a/help/C/pref-bell.page
+++ b/help/C/pref-bell.page
@@ -5,7 +5,7 @@
   <info>
     <revision version="0.1" date="2013-02-17" status="candidate"/>
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="profile"/>
+    <link type="guide" xref="pref#profile"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -37,8 +37,15 @@
   <p>To be notified of these events:</p>
   <steps>
     <item>
-      <p>Select <guiseq><gui style="menu">Edit</gui> <gui style="menuitem">
-      Profile Preferences</gui> <gui style="tab">General</gui></guiseq>.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
+    </item>
+    <item>
+      <p>Select <gui style="tab">General</gui>.</p>
     </item>
     <item>
       <p>Select <gui style="checkbox">Terminal bell</gui></p>
diff --git a/help/C/pref-compatibility.page.stub b/help/C/pref-compatibility.page.stub
index 2ff258c6..5b445cb9 100644
--- a/help/C/pref-compatibility.page.stub
+++ b/help/C/pref-compatibility.page.stub
@@ -6,7 +6,7 @@
   <info>
     <revision pkgversion="3.14" date="2014-12-03" status="draft"/>
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="profile"/>
+    <link type="guide" xref="pref#profile"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -42,8 +42,15 @@
 
   <steps>
     <item>
-      <p>Select <guiseq><gui style="menu">Edit</gui><gui style="menitem">Profile
-      Preferences</gui><gui style="tab">Compatibility</gui></guiseq>.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
+    </item>
+    <item>
+      <p>Select <gui style="tab">Compatibility</gui>.</p>
     </item>
     <item>
       <p>From the menu for <gui>Backspace key generates</gui>, you can select
@@ -87,9 +94,15 @@
 
     <steps>
       <item>
-        <p>Select <guiseq><gui style="menu">Edit</gui>
-        <gui style="menuitem">Profile Preferences</gui>
-        <gui style="tab">Compatibility</gui>.</guiseq>.</p>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Compatibility</gui>.</p>
       </item>
       <item>
         <p>From the menu for <gui>Backspace key generates</gui>, you can select
@@ -134,9 +147,15 @@
 
     <steps>
       <item>
-        <p>Select <guiseq><gui style="menu">Edit</gui>
-        <gui style="menuitem">Profile Preferences</gui>
-        <gui style="tab">Compatibility</gui></guiseq>.</p>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Compatibility</gui>.</p>
       </item>
       <item>
         <p>Click on <gui style="button">Reset Compatibility Options to
diff --git a/help/C/pref-custom-command.page b/help/C/pref-custom-command.page
index cc470374..b4243568 100644
--- a/help/C/pref-custom-command.page
+++ b/help/C/pref-custom-command.page
@@ -6,7 +6,7 @@
     <revision pkgversion="3.8" date="2013-03-02" status="candidate"/>
     <revision pkgversion="3.12" date="2014-09-08" status="candidate"/>
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="profile"/>
+    <link type="guide" xref="pref#profile"/>
     <link type="seealso" xref="gs-execute-commands"/>
 <!--    <link type="seealso" xref="prob-add-to-path"/>-->
 
@@ -44,9 +44,15 @@
 
   <steps>
     <item>
-      <p>Select
-      <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
-      Preferences</gui><gui style="tab">Command</gui></guiseq>.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
+    </item>
+    <item>
+      <p>Select <gui style="tab">Command</gui>.</p>
     </item>
     <item>
       <p>Check <gui>Run a custom command instead of my shell</gui>.</p>
diff --git a/help/C/pref-custom-exit.page b/help/C/pref-custom-exit.page
index ff1d6178..643d8211 100644
--- a/help/C/pref-custom-exit.page
+++ b/help/C/pref-custom-exit.page
@@ -6,7 +6,7 @@
     <revision pkgversion="3.8" date="2013-03-02" status="candidate"/>
     <revision pkgversion="3.12" date="2014-09-08" status="candidate"/>
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="profile"/>
+    <link type="guide" xref="pref#profile"/>
 <!--    <link type="seealso" xref="prob-recover-default-profile"/>-->
 
     <credit type="author copyright">
@@ -38,9 +38,15 @@
 
   <steps>
     <item>
-      <p>Select
-      <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
-      Preferences</gui><gui style="tab">Command</gui></guiseq>.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
+    </item>
+    <item>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
+    </item>
+    <item>
+      <p>Select <gui style="tab">Command</gui>.</p>
     </item>
     <item>
       <p>From the <gui>When command exits</gui> drop down list, select one of
diff --git a/help/C/pref-encoding.page b/help/C/pref-encoding.page
index 9e3b832c..fa74bf59 100644
--- a/help/C/pref-encoding.page
+++ b/help/C/pref-encoding.page
@@ -3,7 +3,6 @@
       id="pref-encoding">
   <info>
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="pref"/>
     <revision version="0.1" date="2013-03-02" status="candidate"/>
 
     <credit type="author copyright">
diff --git a/help/C/pref-keyboard-access.page b/help/C/pref-keyboard-access.page
index 517f9721..2d47219b 100644
--- a/help/C/pref-keyboard-access.page
+++ b/help/C/pref-keyboard-access.page
@@ -5,7 +5,7 @@
   <info>
     <revision version="0.1" date="2013-02-25" status="candidate"/>
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="pref"/>
+    <link type="guide" xref="pref#global"/>
     <link type="seealso" xref="pref-menubar"/>
 
     <credit type="author copyright">
@@ -79,7 +79,7 @@
       <item>
         <p>Select <guiseq><gui style="menu">Edit</gui>
 	<gui style="menuitem">Preferences</gui>
-	<gui style="tab">Shortcuts</gui></guiseq>.</p>
+	<gui style="tab">General</gui></guiseq>.</p>
       </item>
       <item>
         <p>Check <gui style="checkbox">Enable the menu accelerator
diff --git a/help/C/pref-login-shell.page b/help/C/pref-login-shell.page
index c4e27e33..5e808a89 100644
--- a/help/C/pref-login-shell.page
+++ b/help/C/pref-login-shell.page
@@ -6,7 +6,7 @@
     <revision pkgversion="3.8" date="2013-03-03" status="review"/>
     <revision pkgversion="3.14" date="2014-09-08" status="review"/>
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="profile"/>
+    <link type="guide" xref="pref#profile"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -73,9 +73,15 @@
 
     <steps>
       <item>
-        <p>Select <guiseq><gui style="menu">Edit</gui>
-        <gui style="menuitem">Profile Preferences</gui>
-        <gui style="tab">General</gui></guiseq>.</p>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Command</gui>.</p>
       </item>
       <item>
         <comment>
diff --git a/help/C/pref-menubar.page b/help/C/pref-menubar.page
index 694bd401..c351fc6f 100644
--- a/help/C/pref-menubar.page
+++ b/help/C/pref-menubar.page
@@ -5,7 +5,7 @@
   <info>
     <revision version="0.1" date="2013-02-21" status="candidate"/>
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="pref"/>
+    <link type="guide" xref="pref#global"/>
     <link type="seealso" xref="pref-keyboard-access"/>
     <link type="seealso" xref="app-fullscreen"/>
 
diff --git a/help/C/pref-profile-char-width.page b/help/C/pref-profile-char-width.page
index 7480861f..6e3aa3c0 100644
--- a/help/C/pref-profile-char-width.page
+++ b/help/C/pref-profile-char-width.page
@@ -4,7 +4,7 @@
 
   <info>
     <link type="guide" xref="index#advanced"/>
-    <link type="guide" xref="pref"/>
+    <link type="guide" xref="pref#profile"/>
     <revision pkgversion="3.14" date="2014-09-08" status="review"/>
 
     <credit type="author copyright">
@@ -36,13 +36,12 @@
 
   <steps>
     <item>
-      <p>Open
-      <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Profiles</gui></guiseq>.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Select the profile that you want to edit and press
-      <gui style="button">Edit</gui> to open the profile preferences for
-      editing.</p>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
     </item>
     <item>
       <p>Open the <gui style="tab">Compatibility</gui> tab and set the
diff --git a/help/C/pref-profile-encoding.page b/help/C/pref-profile-encoding.page
index 2f38b8d5..66e513a2 100644
--- a/help/C/pref-profile-encoding.page
+++ b/help/C/pref-profile-encoding.page
@@ -4,7 +4,7 @@
 
   <info>
     <link type="guide" xref="index#advanced"/>
-    <link type="guide" xref="pref"/>
+    <link type="guide" xref="pref#profile"/>
     <revision pkgversion="3.14" date="2014-09-08" status="review"/>
 
     <credit type="author copyright">
@@ -34,13 +34,12 @@
 
   <steps>
     <item>
-      <p>Open
-      <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Preferences</gui><gui style="tab">Profiles</gui></guiseq>.</p>
+      <p>Open <guiseq><gui style="menu">Edit</gui>
+      <gui style="menuitem">Preferences</gui></guiseq>.</p>
     </item>
     <item>
-      <p>Select the profile that you want to edit and press
-      <gui style="button">Edit</gui> to open the profile preferences for
-      editing.</p>
+      <p>Your current profile is selected in the sidebar. If you wish to edit
+      a different profile, click on its name.</p>
     </item>
     <item>
       <p>Open the <gui style="tab">Compatibility</gui> tab and set the
diff --git a/help/C/pref-profiles.page b/help/C/pref-profiles.page
index 7dca41d2..31e600fd 100644
--- a/help/C/pref-profiles.page
+++ b/help/C/pref-profiles.page
@@ -6,7 +6,7 @@
     <revision pkgversion="3.8" date="2013-03-03" status="candidate"/>
     <revision pkgversion="3.12" date="2014-09-08" status="candidate"/>
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="pref"/>
+    <link type="guide" xref="pref#manage-profiles"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -26,7 +26,7 @@
 
     <include href="legal.xml" xmlns="http://www.w3.org/2001/XInclude"/>
 
-    <desc>Create, edit and delete profiles.</desc>
+    <desc>Create, rename and delete profiles.</desc>
   </info>
 
   <title>Manage profiles</title>
@@ -62,34 +62,11 @@
     </item>
   </list>
 
-  <p>The default profile is loaded when a new terminal is opened unless you
-  have selected another profile. Any changes that you make to the settings will
-  be stored in the currently used profile.</p>
-
-  <section id="set-default" style="task">
-    <title>Set a default profile</title>
-
-    <p>The default profile is a collection of profile settings applied on the
-    launch of every <app>Terminal</app> tab or window.</p>
-
-    <steps>
-      <item>
-        <p>Select <guiseq><gui style="menu">Edit</gui>
-        <gui style="menuitem">Preferences</gui>
-        <gui style="tab">Profiles</gui></guiseq>.</p>
-      </item>
-      <item>
-        <p>Select the profile to be set as default from the <gui>Profile used
-        when launching a new terminal</gui> drop down list.</p>
-      </item>
-    </steps>
-
-  </section>
-
   <section id="select-profile" style="task">
     <title>Select a profile</title>
 
-    <p>You can change the profile in your current <app>Terminal</app> tab or
+    <p>If you have two or more profiles defined, you can change the profile in
+    your current <app>Terminal</app> tab or
     window by selecting a profile from <guiseq><gui style="menu">Terminal</gui>
     <gui style="menuitem">Change Profile</gui></guiseq>.</p>
 
@@ -98,38 +75,27 @@
   <section id="new-profile" style="task">
     <title>Create a new profile</title>
 
-    <p>Any changes to a new profile are saved automatically. To create a new
-    profile:</p>
+    <p>To create a new profile with the default settings of
+    <app>Terminal</app>:</p>
 
     <steps>
       <item>
-        <p>Select <guiseq><gui style="menu">File</gui>
-        <gui style="menuitem">New Profile</gui></guiseq>.</p>
-      </item>
-      <item>
-        <p>Enter a name for the new profile next to
-        <gui style="input">Profile name</gui>.</p>
+        <p>Select <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
       </item>
       <item>
-        <p>Select <link xref="app-fonts">font</link>,
-        <link xref="app-cursor">cursor shape</link> and
-        <link xref="app-terminal-sizes">window size</link> in the
-        <gui style="tab">General</gui> tab.</p>
+        <p>In the sidebar, click on the <gui style="button">+</gui> button
+        next to the <gui>Profiles</gui> label.</p>
       </item>
       <item>
-        <p>Set your preferred behavior for the
-        <link xref="pref-custom-exit"><cmd>exit</cmd> command</link>.
-        You can also set a
-        <link xref="pref-custom-command">custom shell</link> in the
-        <gui style="tab">Command</gui> tab.</p>
+        <p>Enter a name for the new profile. You can change this name later.</p>
       </item>
       <item>
-        <p>Set your preferred <link xref="app-colors">theme and colors</link>
-        in the <gui style="tab">Colors</gui> tab.</p>
+        <p>Click <gui style="button">Create</gui> to create the new profile.</p>
       </item>
       <item>
-        <p>Set your <link xref="pref-scrolling">scrolling preference</link> in
-        the <gui style="tab">Scrolling</gui> tab.</p>
+        <p>Set your desired <link xref="#edit-profile">profile
+        preferences</link>. These will be saved automatically.</p>
       </item>
     </steps>
 
@@ -143,45 +109,28 @@
 
     <steps>
       <item>
-        <p>Select the profile that you wish to edit from
-        <guiseq><gui style="menu">Terminal</gui>
-        <gui style="menuitem">Change Profile</gui>
-        <gui style="menuitem"><var>Profile name</var></gui></guiseq> where
-        <var>Profile name</var> is the name of the profile that you wish to
-        edit. Alternatively, you can select <guiseq>
-        <gui style="menu">File</gui>
-        <gui style="menuitem">New Profile</gui></guiseq> to clone the profile
-        that you are currently using.</p>
+        <p>Select <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
       </item>
       <item>
-        <p>Set your desired <link xref="#edit-profile">profile
-        preferences</link>. These will be saved automatically. If you do not
-        update the <gui>Profile name</gui> on the tab <gui style="tab">General
-        </gui>, the new profile will not overwrite the profile that it is based
-        on.</p>
+        <p>In the sidebar select the profile on which your new profile should
+        be based.</p>
       </item>
-    </steps>
-
-    <p>Alternatively, you can create a copy of the existing profile first and
-    then edit the profile:</p>
-
-    <steps>
       <item>
-        <p>Select <guiseq><gui style="menu">Edit</gui>
-        <gui style="menuitem">Preferences</gui>
-        <gui style="tab">Profiles</gui></guiseq>.</p>
+        <p>Click on the arrow next to the profile name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="menuitem">Clone…</gui>.</p>
       </item>
       <item>
-        <p>Select your desired profile.</p>
+        <p>Enter a name for the new profile. You can change this name later.</p>
       </item>
       <item>
-        <p>Click <gui style="button">Clone</gui>.</p>
+        <p>Click <gui style="button">Clone</gui> to create the new profile.</p>
       </item>
       <item>
         <p>Set your desired <link xref="#edit-profile">profile
-        preferences</link>. These will be saved automatically. If you do not
-        update the profile name, the new profile will not overwrite the profile
-        that it is based on.</p>
+        preferences</link>. These will be saved automatically.</p>
       </item>
     </steps>
 
@@ -206,9 +155,20 @@
       default profile</link> then edit the copy to create a custom profile.</p>
     </note>
 
-    <p>You can make changes to existing profiles. To edit a profile, select
-    <guiseq><gui style="menu">Edit</gui>
-    <gui style="menuitem">Profile Preferences</gui></guiseq>.</p>
+    <p>You can make changes to existing profiles. To edit a profile:</p>
+
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+    </steps>
+
+    <p>Once the desired profile is selected, you can:</p>
 
     <steps>
       <item>
@@ -232,12 +192,6 @@
       </item>
     </steps>
 
-    <note style="important">
-      <p>To make sure you are editing the desired profile, select the profile
-      from <guiseq><gui style="menu">Terminal</gui>
-      <gui style="menuitem">Change Profile</gui></guiseq>.</p>
-    </note>
-
   </section>
 
   <section id="rename-profile" style="task">
@@ -248,46 +202,92 @@
     <steps>
       <item>
         <p>Select <guiseq><gui style="menu">Edit</gui>
-        <gui style="menuitem">Preferences</gui>
-        <gui style="tab">Profiles</gui></guiseq>.</p>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
       </item>
       <item>
         <p>Select the profile you wish to rename.</p>
       </item>
       <item>
-        <p>Click <gui style="button">Edit</gui>. This will open the
-        profile preferences dialog for the selected profile.</p>
+        <p>Click on the arrow next to the profile name.</p>
       </item>
       <item>
-        <p>In the text box for <gui>Profile name</gui>, type the new profile
-        name.</p>
+        <p>Select <gui style="menuitem">Rename…</gui>.</p>
       </item>
       <item>
-        <p>Click <gui style="button">Close</gui> to return.</p>
+        <p>Enter the new profile name.</p>
+      </item>
+      <item>
+        <p>Click <gui style="button">Rename</gui> to rename.</p>
       </item>
     </steps>
 
   </section>
 
   <section id="delete-profile" style="task">
-    <title>Delete a Profile</title>
+    <title>Delete a profile</title>
   
     <p>To delete a profile:</p>
 
     <steps>
       <item>
         <p>Select <guiseq><gui style="menu">Edit</gui>
-        <gui style="menuitem">Preferences</gui>
-        <gui style="tab">Profiles</gui></guiseq>.</p>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
       </item>
       <item>
-        <p>Select the profile you wish to delete. </p>
+        <p>Select the profile you wish to delete.</p>
       </item>
       <item>
-        <p>Click <gui style="button">Delete</gui>.</p>
+        <p>Click on the arrow next to the profile name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="menuitem">Delete…</gui>.</p>
+      </item>
+      <item>
+        <p>Click <gui style="button">Delete</gui> to confirm.</p>
       </item>
     </steps>
 
+    <note style="tip">
+      <p>The default profile cannot be deleted. If you wish to delete
+      that profile, first set another profile as <link
+      xref="#set-default">default</link>.</p>
+    </note>
+
+  </section>
+
+  <p>The default profile is loaded when a new terminal is opened unless you
+  have selected another profile. Any changes that you make to the settings will
+  be stored in the currently selected profile.</p>
+
+  <section id="set-default" style="task">
+    <title>Set a default profile</title>
+
+    <p>The default profile is used when <app>Terminal</app> could not
+    otherwise decide which profile to use. For example, <app>Terminal</app> is
+    started up freshly and opens its first terminal window. In contrast, when
+    you use a menu entry or keyboard shortcut of <app>Terminal</app> to open a
+    new terminal, the profile of the existing terminal is used.</p>
+
+    <steps>
+      <item>
+        <p>Select <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Select the profile you wish to set as the default.</p>
+      </item>
+      <item>
+        <p>Click on the arrow next to the profile name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="menuitem">Set as default</gui>.</p>
+      </item>
+    </steps>
+
+    <note>
+      <p>The default profile is marked with a check mark symbol.</p>
+    </note>
+
   </section>
 
 </page>
diff --git a/help/C/pref-scrolling.page b/help/C/pref-scrolling.page
index 29e14bab..876f267b 100644
--- a/help/C/pref-scrolling.page
+++ b/help/C/pref-scrolling.page
@@ -6,7 +6,7 @@
     <revision pkgversion="3.8" date="2013-02-25" status="draft"/>
     <revision pkgversion="3.12" date="2014-09-08" status="review"/>
     <link type="guide" xref="index#preferences"/>
-    <link type="guide" xref="profile"/>
+    <link type="guide" xref="pref#profile"/>
 
     <credit type="author copyright">
       <name>Sindhu S</name>
@@ -37,9 +37,15 @@
 
     <steps>
       <item>
-        <p>Select
-        <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
-        Preferences</gui><gui style="tab">Scrolling</gui></guiseq>.</p>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Scrolling</gui>.</p>
       </item>
       <item>
         <p>Uncheck <gui>Show scrollbar</gui>.</p>
@@ -58,9 +64,15 @@
 
     <steps>
       <item>
-        <p>Select
-        <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
-        Preferences</gui><gui style="tab">Scrolling</gui></guiseq>.</p>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Scrolling</gui>.</p>
       </item>
       <item>
         <p>Check <gui style="checkbox">Scroll on output</gui>.</p>
@@ -77,9 +89,15 @@
 
     <steps>
       <item>
-        <p>Select
-        <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
-        Preferences</gui><gui style="tab">Scrolling</gui></guiseq>.</p>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Scrolling</gui>.</p>
       </item>
       <item>
         <p>Check <gui style="checkbox">Scroll on keystroke</gui>.</p>
@@ -95,9 +113,15 @@
 
     <steps>
       <item>
-        <p>Select
-        <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
-        Preferences</gui><gui style="tab">Scrolling</gui></guiseq>.</p>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Scrolling</gui>.</p>
       </item>
       <item>
         <p>Check <gui>Limit scrollback to</gui> and enter a number of lines
@@ -113,9 +137,15 @@
 
     <steps>
       <item>
-        <p>Select
-        <guiseq><gui style="menu">Edit</gui><gui style="menuitem">Profile
-        Preferences</gui><gui style="tab">Scrolling</gui></guiseq>.</p>
+        <p>Open <guiseq><gui style="menu">Edit</gui>
+        <gui style="menuitem">Preferences</gui></guiseq>.</p>
+      </item>
+      <item>
+        <p>Your current profile is selected in the sidebar. If you wish to edit
+        a different profile, click on its name.</p>
+      </item>
+      <item>
+        <p>Select <gui style="tab">Scrolling</gui>.</p>
       </item>
       <item>
         <p>Uncheck <gui>Limit scrollback to</gui>.</p>
diff --git a/help/C/pref.page b/help/C/pref.page
index e9047954..99d90c2f 100644
--- a/help/C/pref.page
+++ b/help/C/pref.page
@@ -17,4 +17,16 @@
 
   <title><app>Terminal</app> preferences</title>
 
+  <section id="global" style="2column">
+    <title>Global Preferences</title>
+  </section>
+
+  <section id="manage-profiles" style="2column">
+    <title>Manage Profiles</title>
+  </section>
+
+  <section id="profile" style="2column">
+    <title>Profile Preferences</title>
+  </section>
+
 </page>
diff --git a/help/C/txt-select-text.page b/help/C/txt-select-text.page
index a8542dcb..2287559d 100644
--- a/help/C/txt-select-text.page
+++ b/help/C/txt-select-text.page
@@ -7,7 +7,6 @@
     <revision pkgversion="3.8" date="2013-03-03" status="review"/>
     <revision pkgversion="3.14.2" date="2015-01-28" status="review"/>
     <link type="guide" xref="index#textoutput"/>
-    <link type="guide" xref="profile"/>
     <link type="seealso" xref="txt-copy-paste"/>
 
     <credit type="author copyright">
diff --git a/help/Makefile.am b/help/Makefile.am
index 86e8f19a..26890a97 100644
--- a/help/Makefile.am
+++ b/help/Makefile.am
@@ -37,7 +37,6 @@ HELP_FILES = \
 	pref-scrolling.page \
 	pref-tab-window.page \
 	pref-user-input.page \
-	profile.page \
 	prob-reset.page \
 	txt-copy-paste.page \
 	txt-links.page \
