diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua
index 096ae114..33387c6d 100644
--- a/.config/awesome/rc.lua
+++ b/.config/awesome/rc.lua
@@ -602,17 +602,19 @@ awful.rules.rules = {
 
    -- Only works for terminal with WM_COMMAND property?
    -- Does not work with LXTerminal.
-   { rule = { name = "cmus"},
+   { rule = { name = "cmus" },
      properties = { tag = tags[1][6] } },
-   { rule = { name = "mutt"},
+   { rule = { name = "mutt" },
      properties = { tag = tags[1][7] } },
 
    -- { rule = { class = "Gimp" },
    --   properties = { floating = false } },
 
-   -- Emacs Speedbar
-   { rule = { name = "Speedbar 1.0"},
-     properties = { width = 20 },
+   -- Emacs Speedbar. This does not work when Speedbar is first launched,
+   -- because its frame is called "emacs...", not speedbar. It only works when
+   -- 'speedbar' command is issued thereafter. Use 'C-x z z' after the first
+   -- speedbar call to automate this.
+   { rule = { name = "Speedbar 1.0" },
      callback = function( c ) awful.tag.setmwfact(0.15) end },
 }
 
diff --git a/.emacs.d/main.el b/.emacs.d/main.el
index 037654b1..c47474db 100644
--- a/.emacs.d/main.el
+++ b/.emacs.d/main.el
@@ -78,8 +78,9 @@
 (define-key my-keys-minor-mode-map (kbd "C-<f5>") 'linum-mode) ;; Toggle line numbers.
 
 ;; Indentation
-;(setq standard-indent 4)
 (setq-default tab-width 4)
+(setq-default standard-indent 4)
+(setq-default c-basic-offset 4)
 (setq-default indent-tabs-mode nil) ;; Indentation cannot insert tabs
 
 ;; Line by line scrolling