4 files changed, 15 insertions, 14 deletions
diff --git a/ui/styles/active-channel.css b/ui/styles/active-conversation.css
index d6a9b42..981862b 100644
--- a/ui/styles/active-channel.css
+++ b/ui/styles/active-conversation.css
@@ -1,4 +1,4 @@
-.active-channel {
+.active-conversation {
   padding-left: 1rem;
   padding-right: 1rem;
   overflow: auto;
diff --git a/ui/styles/overscroll.css b/ui/styles/overscroll.css
index 8898f9a..a54235c 100644
--- a/ui/styles/overscroll.css
+++ b/ui/styles/overscroll.css
@@ -1,8 +1,9 @@
-/* This should help minimize swipe-to-go-back behaviour, enabling our
-* swipe-to-reveal-channel-menu behaviour. It won't work in all cases; in iOS
-* Safari, when swiping from the screen edge, the OS gets th event and
-* handles it before the browser does.
-*/
+/*
+ * This should help minimize swipe-to-go-back behaviour, enabling our
+ * swipe-to-reveal-conversation-menu behaviour. It won't work in all cases; in
+ * iOS Safari, when swiping from the screen edge, the OS gets the event and
+ * handles it before the browser does.
+ */
 html,
 body {
   overscroll-behavior-x: none;
diff --git a/ui/styles/sidebar.css b/ui/styles/sidebar.css
index b825545..aa0d53b 100644
--- a/ui/styles/sidebar.css
+++ b/ui/styles/sidebar.css
@@ -1,4 +1,4 @@
-/* Sidebar and channel selector */
+/* Sidebar and conversation selector */
 #sidebar {
   background-color: var(--colour-navbar-bg);
 }
@@ -38,19 +38,19 @@
   color: var(--colour-navbar-hover-text);
 }
 
-/* create channel form */
-.create-channel {
+/* create conversation form */
+.create-conversation {
   padding-left: 0.5rem;
 }
 
-.create-channel form {
+.create-conversation form {
   display: flex;
   flex-direction: row;
   justify-content: flex-start;
   align-items: stretch;
 }
 
-.create-channel input {
+.create-conversation input {
   padding: 0.5rem;
   border-radius: 0.5rem 0 0 0.5rem;
   border: 1px solid var(--colour-input-border);
@@ -60,7 +60,7 @@
   color: var(--colour-input-text);
 }
 
-.create-channel button {
+.create-conversation button {
   border-radius: 0 0.5rem 0.5rem 0;
   border: 1px solid var(--colour-input-border);
   background-color: var(--colour-input-bg);
diff --git a/ui/styles/variables.css b/ui/styles/variables.css
index 2758aa1..99705f2 100644
--- a/ui/styles/variables.css
+++ b/ui/styles/variables.css
@@ -40,8 +40,8 @@
   --colour-input-border: color-mix(in srgb, var(--colour-input-bg) 50%, black);
   --colour-input-text: var(--dark-text);
 
-  /* Active channel */
-  --colour-active-channel-bg: color-mix(in srgb, var(--colour-base) 25%, white);
+  /* Active conversation */
+  --colour-active-conversation-bg: color-mix(in srgb, var(--colour-base) 25%, white);
 
   /* MessageRun */
   --colour-message-run-self-bg: color-mix(in srgb, var(--colour-base) 30%, white);