diff --git a/ui/src/components/comment-node.tsx b/ui/src/components/comment-node.tsx
index 0e62e6e..9b476c7 100644
--- a/ui/src/components/comment-node.tsx
+++ b/ui/src/components/comment-node.tsx
@@ -129,14 +129,19 @@ export class CommentNode extends Component<CommentNodeProps, CommentNodeState> {
           }`}
           style={
             !this.props.noIndent &&
+            this.props.node.comment.parent_id &&
             `border-left: 1px solid; border-color: ${this.state.borderColor} !important`
           }
         >
-          <div class={`${!this.props.noIndent && 'ml-2'}`}>
+          <div
+            class={`${!this.props.noIndent &&
+              this.props.node.comment.parent_id &&
+              'ml-2'}`}
+          >
             <ul class="list-inline mb-1 text-muted small">
               <li className="list-inline-item">
                 <Link
-                  className="text-info"
+                  className="text-body font-weight-bold"
                   to={`/u/${node.comment.creator_name}`}
                 >
                   {node.comment.creator_avatar && showAvatars() && (
diff --git a/ui/src/components/main.tsx b/ui/src/components/main.tsx
index ee02815..b772bd8 100644
--- a/ui/src/components/main.tsx
+++ b/ui/src/components/main.tsx
@@ -184,7 +184,7 @@ export class Main extends Component<any, MainState> {
                       <h5>
                         <T i18nKey="subscribed_to_communities">
                           #
-                          <Link class="text-white" to="/communities">
+                          <Link class="text-body" to="/communities">
                             #
                           </Link>
                         </T>
@@ -222,7 +222,7 @@ export class Main extends Component<any, MainState> {
         <h5>
           <T i18nKey="trending_communities">
             #
-            <Link class="text-white" to="/communities">
+            <Link class="text-body" to="/communities">
               #
             </Link>
           </T>
@@ -317,7 +317,10 @@ export class Main extends Component<any, MainState> {
               <li class="list-inline-item">{i18n.t('admins')}:</li>
               {this.state.siteRes.admins.map(admin => (
                 <li class="list-inline-item">
-                  <Link class="text-info" to={`/u/${admin.name}`}>
+                  <Link
+                    class="text-body font-weight-bold"
+                    to={`/u/${admin.name}`}
+                  >
                     {admin.avatar && showAvatars() && (
                       <img
                         height="32"
diff --git a/ui/src/components/modlog.tsx b/ui/src/components/modlog.tsx
index f57e1c6..04628eb 100644
--- a/ui/src/components/modlog.tsx
+++ b/ui/src/components/modlog.tsx
@@ -354,7 +354,7 @@ export class Modlog extends Component<any, ModlogState> {
             <h5>
               {this.state.communityName && (
                 <Link
-                  className="text-white"
+                  className="text-body"
                   to={`/c/${this.state.communityName}`}
                 >
                   /c/{this.state.communityName}{' '}
diff --git a/ui/src/components/post-listing.tsx b/ui/src/components/post-listing.tsx
index f8f1944..0441bab 100644
--- a/ui/src/components/post-listing.tsx
+++ b/ui/src/components/post-listing.tsx
@@ -425,7 +425,10 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
               <ul class="list-inline mb-0 text-muted small">
                 <li className="list-inline-item">
                   <span>{i18n.t('by')} </span>
-                  <Link className="text-info" to={`/u/${post.creator_name}`}>
+                  <Link
+                    className="text-body font-weight-bold"
+                    to={`/u/${post.creator_name}`}
+                  >
                     {post.creator_avatar && showAvatars() && (
                       <img
                         height="32"
diff --git a/ui/src/components/sidebar.tsx b/ui/src/components/sidebar.tsx
index 042b67d..0f4a0e1 100644
--- a/ui/src/components/sidebar.tsx
+++ b/ui/src/components/sidebar.tsx
@@ -204,7 +204,10 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
               <li class="list-inline-item">{i18n.t('mods')}: </li>
               {this.props.moderators.map(mod => (
                 <li class="list-inline-item">
-                  <Link class="text-info" to={`/u/${mod.user_name}`}>
+                  <Link
+                    class="text-body font-weight-bold"
+                    to={`/u/${mod.user_name}`}
+                  >
                     {mod.avatar && showAvatars() && (
                       <img
                         height="32"